Hello community,
here is the log from the commit of package systemd for openSUSE:Factory
checked in at Mon Aug 9 02:23:42 CEST 2010.
--------
--- systemd/systemd.changes 2010-08-04 19:37:16.000000000 +0200
+++ /mounts/work_src_done/STABLE/systemd/systemd.changes 2010-08-06 13:11:20.000000000 +0200
@@ -1,0 +2,27 @@
+Fri Aug 6 13:07:35 CEST 2010 - kay.sievers@novell.com
+
+- version 6
+ - man page update
+
+-------------------------------------------------------------------
+Fri Aug 6 09:48:34 CEST 2010 - kay.sievers@novell.com
+
+- new snapshot
+ - downgrade a few log messages
+ - properly handle devices which are referenced before they exist
+
+-------------------------------------------------------------------
+Fri Aug 6 01:59:50 CEST 2010 - kay.sievers@novell.com
+
+- new snapshot
+ - fix dependency cycle of boot.* by splitting fsck.target
+ - sort boot.* before other sysv services
+ from sysinint.target
+ - start getty for serial console
+
+-------------------------------------------------------------------
+Thu Aug 5 23:12:32 CEST 2010 - kay.sievers@novell.com
+
+- add licence to subpackages
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
systemd-5.tar.bz2
New:
----
systemd-6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ systemd.spec ++++++
--- /var/tmp/diff_new_pack.hbKVzf/_old 2010-08-09 02:23:25.000000000 +0200
+++ /var/tmp/diff_new_pack.hbKVzf/_new 2010-08-09 02:23:25.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package systemd (Version 5)
+# spec file for package systemd (Version 6)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -20,7 +20,7 @@
Name: systemd
Url: http://www.freedesktop.org/wiki/Software/systemd
-Version: 5
+Version: 6
Release: 1
License: GPLv2+
Group: System/Base
++++++ systemd-5.tar.bz2 -> systemd-6.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/Makefile.am new/systemd-6/Makefile.am
--- old/systemd-5/Makefile.am 2010-07-24 09:46:03.000000000 +0200
+++ new/systemd-6/Makefile.am 2010-08-06 09:39:14.000000000 +0200
@@ -195,7 +195,8 @@
dist_systemunit_DATA += \
units/suse/halt.service \
units/suse/poweroff.service \
- units/suse/reboot.service
+ units/suse/reboot.service \
+ units/suse/fsck.target
endif
if TARGET_GENTOO
@@ -478,7 +479,8 @@
$(DBUS_LIBS)
systemd_cgroups_agent_SOURCES = \
- src/cgroups-agent.c
+ src/cgroups-agent.c \
+ src/dbus-common.c
systemd_cgroups_agent_CFLAGS = \
$(AM_CFLAGS) \
@@ -787,6 +789,11 @@
rm -f xdm.service && \
$(LN_S) $(systemunitdir)/xdm.service xdm.service )
endif
+if !TARGET_SUSE
+ ( cd $(DESTDIR)$(systemunitdir) && \
+ rm -f fsck.target && \
+ $(LN_S) sysinit.target fsck.target )
+endif
DISTCHECK_CONFIGURE_FLAGS = \
--with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/Makefile.in new/systemd-6/Makefile.in
--- old/systemd-5/Makefile.in 2010-08-04 18:54:29.000000000 +0200
+++ new/systemd-6/Makefile.in 2010-08-06 13:01:08.000000000 +0200
@@ -77,7 +77,8 @@
@TARGET_SUSE_TRUE@am__append_3 = \
@TARGET_SUSE_TRUE@ units/suse/halt.service \
@TARGET_SUSE_TRUE@ units/suse/poweroff.service \
-@TARGET_SUSE_TRUE@ units/suse/reboot.service
+@TARGET_SUSE_TRUE@ units/suse/reboot.service \
+@TARGET_SUSE_TRUE@ units/suse/fsck.target
@TARGET_GENTOO_TRUE@am__append_4 = \
@TARGET_GENTOO_TRUE@ units/gentoo/halt.service \
@@ -278,7 +279,8 @@
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(systemd_cgls_CFLAGS) \
$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
am_systemd_cgroups_agent_OBJECTS = \
- src/systemd_cgroups_agent-cgroups-agent.$(OBJEXT)
+ src/systemd_cgroups_agent-cgroups-agent.$(OBJEXT) \
+ src/systemd_cgroups_agent-dbus-common.$(OBJEXT)
systemd_cgroups_agent_OBJECTS = $(am_systemd_cgroups_agent_OBJECTS)
systemd_cgroups_agent_DEPENDENCIES = libsystemd-basic.la \
$(am__DEPENDENCIES_1)
@@ -427,12 +429,12 @@
units/fedora/rc-local.service units/fedora/reboot.service \
units/fedora/sysinit.service units/fedora/single.service \
units/suse/halt.service units/suse/poweroff.service \
- units/suse/reboot.service units/gentoo/halt.service \
- units/gentoo/killall.service units/gentoo/poweroff.service \
- units/gentoo/reboot.service units/gentoo/xdm.service \
- units/arch/sysinit.service units/arch/rc-local.service \
- units/arch/halt.service units/arch/poweroff.service \
- units/arch/reboot.service
+ units/suse/reboot.service units/suse/fsck.target \
+ units/gentoo/halt.service units/gentoo/killall.service \
+ units/gentoo/poweroff.service units/gentoo/reboot.service \
+ units/gentoo/xdm.service units/arch/sysinit.service \
+ units/arch/rc-local.service units/arch/halt.service \
+ units/arch/poweroff.service units/arch/reboot.service
DATA = $(dbusinterface_DATA) $(dist_dbuspolicy_DATA) \
$(dist_dbussystemservice_DATA) $(dist_doc_DATA) \
$(dist_noinst_DATA) $(dist_pkgsysconf_DATA) \
@@ -930,7 +932,8 @@
$(DBUS_LIBS)
systemd_cgroups_agent_SOURCES = \
- src/cgroups-agent.c
+ src/cgroups-agent.c \
+ src/dbus-common.c
systemd_cgroups_agent_CFLAGS = \
$(AM_CFLAGS) \
@@ -1464,6 +1467,8 @@
$(AM_V_CCLD)$(systemd_cgls_LINK) $(systemd_cgls_OBJECTS) $(systemd_cgls_LDADD) $(LIBS)
src/systemd_cgroups_agent-cgroups-agent.$(OBJEXT): \
src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+src/systemd_cgroups_agent-dbus-common.$(OBJEXT): src/$(am__dirstamp) \
+ src/$(DEPDIR)/$(am__dirstamp)
systemd-cgroups-agent$(EXEEXT): $(systemd_cgroups_agent_OBJECTS) $(systemd_cgroups_agent_DEPENDENCIES)
@rm -f systemd-cgroups-agent$(EXEEXT)
$(AM_V_CCLD)$(systemd_cgroups_agent_LINK) $(systemd_cgroups_agent_OBJECTS) $(systemd_cgroups_agent_LDADD) $(LIBS)
@@ -1660,6 +1665,7 @@
-rm -f src/systemd_cgls-cgroup-show.$(OBJEXT)
-rm -f src/systemd_cgls-cgroup-util.$(OBJEXT)
-rm -f src/systemd_cgroups_agent-cgroups-agent.$(OBJEXT)
+ -rm -f src/systemd_cgroups_agent-dbus-common.$(OBJEXT)
-rm -f src/systemd_initctl-dbus-common.$(OBJEXT)
-rm -f src/systemd_initctl-initctl.$(OBJEXT)
-rm -f src/systemd_initctl-sd-daemon.$(OBJEXT)
@@ -1751,6 +1757,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_cgls-cgroup-show.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_cgls-cgroup-util.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_cgroups_agent-cgroups-agent.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_cgroups_agent-dbus-common.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_initctl-dbus-common.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_initctl-initctl.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_initctl-sd-daemon.Po@am__quote@
@@ -2400,6 +2407,22 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_cgroups_agent_CFLAGS) $(CFLAGS) -c -o src/systemd_cgroups_agent-cgroups-agent.obj `if test -f 'src/cgroups-agent.c'; then $(CYGPATH_W) 'src/cgroups-agent.c'; else $(CYGPATH_W) '$(srcdir)/src/cgroups-agent.c'; fi`
+src/systemd_cgroups_agent-dbus-common.o: src/dbus-common.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_cgroups_agent_CFLAGS) $(CFLAGS) -MT src/systemd_cgroups_agent-dbus-common.o -MD -MP -MF src/$(DEPDIR)/systemd_cgroups_agent-dbus-common.Tpo -c -o src/systemd_cgroups_agent-dbus-common.o `test -f 'src/dbus-common.c' || echo '$(srcdir)/'`src/dbus-common.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_cgroups_agent-dbus-common.Tpo src/$(DEPDIR)/systemd_cgroups_agent-dbus-common.Po
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/dbus-common.c' object='src/systemd_cgroups_agent-dbus-common.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_cgroups_agent_CFLAGS) $(CFLAGS) -c -o src/systemd_cgroups_agent-dbus-common.o `test -f 'src/dbus-common.c' || echo '$(srcdir)/'`src/dbus-common.c
+
+src/systemd_cgroups_agent-dbus-common.obj: src/dbus-common.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_cgroups_agent_CFLAGS) $(CFLAGS) -MT src/systemd_cgroups_agent-dbus-common.obj -MD -MP -MF src/$(DEPDIR)/systemd_cgroups_agent-dbus-common.Tpo -c -o src/systemd_cgroups_agent-dbus-common.obj `if test -f 'src/dbus-common.c'; then $(CYGPATH_W) 'src/dbus-common.c'; else $(CYGPATH_W) '$(srcdir)/src/dbus-common.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_cgroups_agent-dbus-common.Tpo src/$(DEPDIR)/systemd_cgroups_agent-dbus-common.Po
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/dbus-common.c' object='src/systemd_cgroups_agent-dbus-common.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_cgroups_agent_CFLAGS) $(CFLAGS) -c -o src/systemd_cgroups_agent-dbus-common.obj `if test -f 'src/dbus-common.c'; then $(CYGPATH_W) 'src/dbus-common.c'; else $(CYGPATH_W) '$(srcdir)/src/dbus-common.c'; fi`
+
src/systemd_initctl-initctl.o: src/initctl.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_initctl_CFLAGS) $(CFLAGS) -MT src/systemd_initctl-initctl.o -MD -MP -MF src/$(DEPDIR)/systemd_initctl-initctl.Tpo -c -o src/systemd_initctl-initctl.o `test -f 'src/initctl.c' || echo '$(srcdir)/'`src/initctl.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_initctl-initctl.Tpo src/$(DEPDIR)/systemd_initctl-initctl.Po
@@ -3589,6 +3612,9 @@
@TARGET_GENTOO_TRUE@ ( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \
@TARGET_GENTOO_TRUE@ rm -f xdm.service && \
@TARGET_GENTOO_TRUE@ $(LN_S) $(systemunitdir)/xdm.service xdm.service )
+@TARGET_SUSE_FALSE@ ( cd $(DESTDIR)$(systemunitdir) && \
+@TARGET_SUSE_FALSE@ rm -f fsck.target && \
+@TARGET_SUSE_FALSE@ $(LN_S) sysinit.target fsck.target )
upload: all distcheck
cp -v systemd-$(VERSION).tar.bz2 /home/lennart/cvs.fedora/systemd/devel/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/configure new/systemd-6/configure
--- old/systemd-5/configure 2010-08-04 18:54:26.000000000 +0200
+++ new/systemd-6/configure 2010-08-06 13:01:05.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for systemd 5.
+# Generated by GNU Autoconf 2.65 for systemd 6.
#
# Report bugs to .
#
@@ -761,8 +761,8 @@
# Identity of this package.
PACKAGE_NAME='systemd'
PACKAGE_TARNAME='systemd'
-PACKAGE_VERSION='5'
-PACKAGE_STRING='systemd 5'
+PACKAGE_VERSION='6'
+PACKAGE_STRING='systemd 6'
PACKAGE_BUGREPORT='systemd-devel@lists.freedesktop.org'
PACKAGE_URL=''
@@ -1551,7 +1551,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures systemd 5 to adapt to many kinds of systems.
+\`configure' configures systemd 6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1621,7 +1621,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of systemd 5:";;
+ short | recursive ) echo "Configuration of systemd 6:";;
esac
cat <<\_ACEOF
@@ -1759,7 +1759,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-systemd configure 5
+systemd configure 6
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2130,7 +2130,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by systemd $as_me 5, which was
+It was created by systemd $as_me 6, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -2955,7 +2955,7 @@
# Define the identity of the package.
PACKAGE='systemd'
- VERSION='5'
+ VERSION='6'
cat >>confdefs.h <<_ACEOF
@@ -13258,7 +13258,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by systemd $as_me 5, which was
+This file was extended by systemd $as_me 6, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -13324,7 +13324,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-systemd config.status 5
+systemd config.status 6
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/configure.ac new/systemd-6/configure.ac
--- old/systemd-5/configure.ac 2010-08-04 12:37:39.000000000 +0200
+++ new/systemd-6/configure.ac 2010-08-06 13:00:54.000000000 +0200
@@ -17,7 +17,7 @@
AC_PREREQ(2.63)
-AC_INIT([systemd],[5],[systemd-devel@lists.freedesktop.org])
+AC_INIT([systemd],[6],[systemd-devel@lists.freedesktop.org])
AC_CONFIG_SRCDIR([src/main.c])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/man/daemon.7 new/systemd-6/man/daemon.7
--- old/systemd-5/man/daemon.7 2010-08-04 18:55:04.000000000 +0200
+++ new/systemd-6/man/daemon.7 2010-08-06 13:01:57.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: daemon
.\" Author: Lennart Poettering
.\" Generator: DocBook XSL Stylesheets v1.75.2 http://docbook.sf.net/
-.\" Date: 08/04/2010
+.\" Date: 08/06/2010
.\" Manual: daemon
.\" Source: systemd
.\" Language: English
.\"
-.TH "DAEMON" "7" "08/04/2010" "systemd" "daemon"
+.TH "DAEMON" "7" "08/06/2010" "systemd" "daemon"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
@@ -664,6 +664,10 @@
if [ $1 \-eq 1 ]; then
# Enable (but don\'t start) the units by default
/bin/systemctl enable foobar\&.service foobar\&.socket >/dev/null 2>&1 || :
+
+ # Alternatively, just call /bin/systemctl daemon\-reload here,
+ # if the daemon should not be enabled by default on package
+ # installation
fi
%preun
@@ -688,6 +692,25 @@
Depending on whether your service should or should not be started/stopped/restarted during package installation, deinstallation or upgrade, a different set of commands may be specified\&. See
\fBsystemctl\fR(1)
for details\&.
+.PP
+To facilitate upgrades from a package version that shipped only SysV init scripts to a package version that ships both a SysV init script and a native systemd service file, use a fragment like the following:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+%triggerin \-\- foobar < 0\&.47\&.11\-1
+if /sbin/chkconfig foobar ; then
+ /bin/systemctl enable foobar\&.service foobar\&.socket >/dev/null 2>&1 || :
+fi
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+Where 0\&.47\&.11\-1 is the first package version that includes the native unit file\&. This fragment will ensure that the first time the unit file is installed it will be enabled if and only if the SysV init script is enabled, thus making sure that the the enable status is not changed\&. Note that
+\fBchkconfig\fR
+is a command specific Fedora which can be used to check whether a SysV init script is enabled\&. Other operating systems will have to use different commands here\&.
.SH "PORTING EXISTING DAEMONS"
.PP
Since new\-style init systems such as systemd are compatible with traditional SysV init systems it is not strictly necessary to port existing daemons to the new style\&. However doing so offers additional functionality to the daemons as well as simplifying integration into new\-style init systems\&.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/man/daemon.html new/systemd-6/man/daemon.html
--- old/systemd-5/man/daemon.html 2010-08-04 18:55:30.000000000 +0200
+++ new/systemd-6/man/daemon.html 2010-08-06 13:02:37.000000000 +0200
@@ -591,6 +591,10 @@
if [ $1 -eq 1 ]; then
# Enable (but don't start) the units by default
/bin/systemctl enable foobar.service foobar.socket >/dev/null 2>&1 || :
+
+ # Alternatively, just call /bin/systemctl daemon-reload here,
+ # if the daemon should not be enabled by default on package
+ # installation
fi
%preun
@@ -612,7 +616,25 @@
upgrade, a different set of commands may be
specified. See
<span class="citerefentry"><span class="refentrytitle">systemctl</span>(1)</span>
- for details.</p></div></div><div class="refsect1" title="Porting Existing Daemons"><a id="id307619"/><h2>Porting Existing Daemons</h2><p>Since new-style init systems such as systemd are
+ for details.</p><p>To facilitate upgrades from a package
+ version that shipped only SysV init scripts to
+ a package version that ships both a SysV init
+ script and a native systemd service file, use
+ a fragment like the following:</p><pre class="programlisting">%triggerin -- foobar < 0.47.11-1
+if /sbin/chkconfig foobar ; then
+ /bin/systemctl enable foobar.service foobar.socket >/dev/null 2>&1 || :
+fi</pre><p>Where 0.47.11-1 is the first package
+ version that includes the native unit
+ file. This fragment will ensure that the first
+ time the unit file is installed it will be
+ enabled if and only if the SysV init script is
+ enabled, thus making sure that the the enable
+ status is not changed. Note that
+ <span class="command"><strong>chkconfig</strong></span> is a command
+ specific Fedora which can be used to check
+ whether a SysV init script is enabled. Other
+ operating systems will have to use different
+ commands here.</p></div></div><div class="refsect1" title="Porting Existing Daemons"><a id="id307652"/><h2>Porting Existing Daemons</h2><p>Since new-style init systems such as systemd are
compatible with traditional SysV init systems it is
not strictly necessary to port existing daemons to the
new style. However doing so offers additional
@@ -657,7 +679,7 @@
details.</p></li><li class="listitem"><p>If the daemon exposes
interfaces via D-Bus, write and install a
D-Bus activation file for the service, see
- above for details.</p></li></ol></div></div><div class="refsect1" title="See Also"><a id="id307694"/><h2>See Also</h2><p>
+ above for details.</p></li></ol></div></div><div class="refsect1" title="See Also"><a id="id307726"/><h2>See Also</h2><p>
<span class="citerefentry"><span class="refentrytitle">systemd</span>(1)</span>,
<span class="citerefentry"><span class="refentrytitle">sd-daemon</span>(7)</span>,
<span class="citerefentry"><span class="refentrytitle">sd_listen_fds</span>(3)</span>,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/man/daemon.xml new/systemd-6/man/daemon.xml
--- old/systemd-5/man/daemon.xml 2010-07-24 09:46:03.000000000 +0200
+++ new/systemd-6/man/daemon.xml 2010-08-06 13:00:54.000000000 +0200
@@ -828,6 +828,10 @@
if [ $1 -eq 1 ]; then
# Enable (but don't start) the units by default
/bin/systemctl enable foobar.service foobar.socket >/dev/null 2>&1 || :
+
+ # Alternatively, just call /bin/systemctl daemon-reload here,
+ # if the daemon should not be enabled by default on package
+ # installation
fi
%preun
@@ -853,6 +857,29 @@
<citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
for details.</para>
+ <para>To facilitate upgrades from a package
+ version that shipped only SysV init scripts to
+ a package version that ships both a SysV init
+ script and a native systemd service file, use
+ a fragment like the following:</para>
+
+ <programlisting>%triggerin -- foobar < 0.47.11-1
+if /sbin/chkconfig foobar ; then
+ /bin/systemctl enable foobar.service foobar.socket >/dev/null 2>&1 || :
+fi</programlisting>
+
+ <para>Where 0.47.11-1 is the first package
+ version that includes the native unit
+ file. This fragment will ensure that the first
+ time the unit file is installed it will be
+ enabled if and only if the SysV init script is
+ enabled, thus making sure that the the enable
+ status is not changed. Note that
+ <command>chkconfig</command> is a command
+ specific Fedora which can be used to check
+ whether a SysV init script is enabled. Other
+ operating systems will have to use different
+ commands here.</para>
</refsect2>
</refsect1>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/man/halt.8 new/systemd-6/man/halt.8
--- old/systemd-5/man/halt.8 2010-08-04 18:55:10.000000000 +0200
+++ new/systemd-6/man/halt.8 2010-08-06 13:02:03.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: halt
.\" Author: Lennart Poettering
.\" Generator: DocBook XSL Stylesheets v1.75.2
-.\" Date: 08/04/2010
+.\" Date: 08/06/2010
.\" Manual: halt
.\" Source: systemd
.\" Language: English
.\"
-.TH "HALT" "8" "08/04/2010" "systemd" "halt"
+.TH "HALT" "8" "08/06/2010" "systemd" "halt"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/man/pam_systemd.8 new/systemd-6/man/pam_systemd.8
--- old/systemd-5/man/pam_systemd.8 2010-08-04 18:55:10.000000000 +0200
+++ new/systemd-6/man/pam_systemd.8 2010-08-06 13:02:05.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: pam_systemd
.\" Author: Lennart Poettering
.\" Generator: DocBook XSL Stylesheets v1.75.2
-.\" Date: 08/04/2010
+.\" Date: 08/06/2010
.\" Manual: pam_systemd
.\" Source: systemd
.\" Language: English
.\"
-.TH "PAM_SYSTEMD" "8" "08/04/2010" "systemd" "pam_systemd"
+.TH "PAM_SYSTEMD" "8" "08/06/2010" "systemd" "pam_systemd"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/man/runlevel.8 new/systemd-6/man/runlevel.8
--- old/systemd-5/man/runlevel.8 2010-08-04 18:55:10.000000000 +0200
+++ new/systemd-6/man/runlevel.8 2010-08-06 13:02:00.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: runlevel
.\" Author: Lennart Poettering
.\" Generator: DocBook XSL Stylesheets v1.75.2
-.\" Date: 08/04/2010
+.\" Date: 08/06/2010
.\" Manual: runlevel
.\" Source: systemd
.\" Language: English
.\"
-.TH "RUNLEVEL" "8" "08/04/2010" "systemd" "runlevel"
+.TH "RUNLEVEL" "8" "08/06/2010" "systemd" "runlevel"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/man/sd-daemon.7 new/systemd-6/man/sd-daemon.7
--- old/systemd-5/man/sd-daemon.7 2010-08-04 18:55:05.000000000 +0200
+++ new/systemd-6/man/sd-daemon.7 2010-08-06 13:01:58.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: sd-daemon
.\" Author: Lennart Poettering
.\" Generator: DocBook XSL Stylesheets v1.75.2
-.\" Date: 08/04/2010
+.\" Date: 08/06/2010
.\" Manual: sd-daemon
.\" Source: systemd
.\" Language: English
.\"
-.TH "SD\-DAEMON" "7" "08/04/2010" "systemd" "sd-daemon"
+.TH "SD\-DAEMON" "7" "08/06/2010" "systemd" "sd-daemon"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/man/sd_booted.3 new/systemd-6/man/sd_booted.3
--- old/systemd-5/man/sd_booted.3 2010-08-04 18:54:52.000000000 +0200
+++ new/systemd-6/man/sd_booted.3 2010-08-06 13:01:37.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: sd_booted
.\" Author: Lennart Poettering
.\" Generator: DocBook XSL Stylesheets v1.75.2
-.\" Date: 08/04/2010
+.\" Date: 08/06/2010
.\" Manual: sd_booted
.\" Source: systemd
.\" Language: English
.\"
-.TH "SD_BOOTED" "3" "08/04/2010" "systemd" "sd_booted"
+.TH "SD_BOOTED" "3" "08/06/2010" "systemd" "sd_booted"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/man/sd_is_fifo.3 new/systemd-6/man/sd_is_fifo.3
--- old/systemd-5/man/sd_is_fifo.3 2010-08-04 18:54:58.000000000 +0200
+++ new/systemd-6/man/sd_is_fifo.3 2010-08-06 13:01:40.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: sd_is_fifo
.\" Author: Lennart Poettering
.\" Generator: DocBook XSL Stylesheets v1.75.2
-.\" Date: 08/04/2010
+.\" Date: 08/06/2010
.\" Manual: sd_is_fifo
.\" Source: systemd
.\" Language: English
.\"
-.TH "SD_IS_FIFO" "3" "08/04/2010" "systemd" "sd_is_fifo"
+.TH "SD_IS_FIFO" "3" "08/06/2010" "systemd" "sd_is_fifo"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/man/sd_listen_fds.3 new/systemd-6/man/sd_listen_fds.3
--- old/systemd-5/man/sd_listen_fds.3 2010-08-04 18:54:58.000000000 +0200
+++ new/systemd-6/man/sd_listen_fds.3 2010-08-06 13:01:39.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: sd_listen_fds
.\" Author: Lennart Poettering
.\" Generator: DocBook XSL Stylesheets v1.75.2
-.\" Date: 08/04/2010
+.\" Date: 08/06/2010
.\" Manual: sd_listen_fds
.\" Source: systemd
.\" Language: English
.\"
-.TH "SD_LISTEN_FDS" "3" "08/04/2010" "systemd" "sd_listen_fds"
+.TH "SD_LISTEN_FDS" "3" "08/06/2010" "systemd" "sd_listen_fds"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/man/sd_notify.3 new/systemd-6/man/sd_notify.3
--- old/systemd-5/man/sd_notify.3 2010-08-04 18:54:52.000000000 +0200
+++ new/systemd-6/man/sd_notify.3 2010-08-06 13:01:36.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: sd_notify
.\" Author: Lennart Poettering
.\" Generator: DocBook XSL Stylesheets v1.75.2
-.\" Date: 08/04/2010
+.\" Date: 08/06/2010
.\" Manual: sd_notify
.\" Source: systemd
.\" Language: English
.\"
-.TH "SD_NOTIFY" "3" "08/04/2010" "systemd" "sd_notify"
+.TH "SD_NOTIFY" "3" "08/06/2010" "systemd" "sd_notify"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/man/shutdown.8 new/systemd-6/man/shutdown.8
--- old/systemd-5/man/shutdown.8 2010-08-04 18:55:10.000000000 +0200
+++ new/systemd-6/man/shutdown.8 2010-08-06 13:02:04.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shutdown
.\" Author: Lennart Poettering
.\" Generator: DocBook XSL Stylesheets v1.75.2
-.\" Date: 08/04/2010
+.\" Date: 08/06/2010
.\" Manual: shutdown
.\" Source: systemd
.\" Language: English
.\"
-.TH "SHUTDOWN" "8" "08/04/2010" "systemd" "shutdown"
+.TH "SHUTDOWN" "8" "08/06/2010" "systemd" "shutdown"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/man/systemadm.1 new/systemd-6/man/systemadm.1
--- old/systemd-5/man/systemadm.1 2010-08-04 18:54:52.000000000 +0200
+++ new/systemd-6/man/systemadm.1 2010-08-06 13:01:32.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: systemadm
.\" Author: Lennart Poettering
.\" Generator: DocBook XSL Stylesheets v1.75.2
-.\" Date: 08/04/2010
+.\" Date: 08/06/2010
.\" Manual: systemadm
.\" Source: systemd
.\" Language: English
.\"
-.TH "SYSTEMADM" "1" "08/04/2010" "systemd" "systemadm"
+.TH "SYSTEMADM" "1" "08/06/2010" "systemd" "systemadm"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/man/systemctl.1 new/systemd-6/man/systemctl.1
--- old/systemd-5/man/systemctl.1 2010-08-04 18:54:52.000000000 +0200
+++ new/systemd-6/man/systemctl.1 2010-08-06 13:01:30.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: systemctl
.\" Author: Lennart Poettering
.\" Generator: DocBook XSL Stylesheets v1.75.2
-.\" Date: 08/04/2010
+.\" Date: 08/06/2010
.\" Manual: systemctl
.\" Source: systemd
.\" Language: English
.\"
-.TH "SYSTEMCTL" "1" "08/04/2010" "systemd" "systemctl"
+.TH "SYSTEMCTL" "1" "08/06/2010" "systemd" "systemctl"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/man/systemd-cgls.1 new/systemd-6/man/systemd-cgls.1
--- old/systemd-5/man/systemd-cgls.1 2010-08-04 18:54:52.000000000 +0200
+++ new/systemd-6/man/systemd-cgls.1 2010-08-06 13:01:33.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: systemd-cgls
.\" Author: Lennart Poettering
.\" Generator: DocBook XSL Stylesheets v1.75.2
-.\" Date: 08/04/2010
+.\" Date: 08/06/2010
.\" Manual: systemd-cgls
.\" Source: systemd
.\" Language: English
.\"
-.TH "SYSTEMD\-CGLS" "1" "08/04/2010" "systemd" "systemd-cgls"
+.TH "SYSTEMD\-CGLS" "1" "08/06/2010" "systemd" "systemd-cgls"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/man/systemd-notify.1 new/systemd-6/man/systemd-notify.1
--- old/systemd-5/man/systemd-notify.1 2010-08-04 18:54:52.000000000 +0200
+++ new/systemd-6/man/systemd-notify.1 2010-08-06 13:01:35.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: systemd-notify
.\" Author: Lennart Poettering
.\" Generator: DocBook XSL Stylesheets v1.75.2
-.\" Date: 08/04/2010
+.\" Date: 08/06/2010
.\" Manual: systemd-notify
.\" Source: systemd
.\" Language: English
.\"
-.TH "SYSTEMD\-NOTIFY" "1" "08/04/2010" "systemd" "systemd-notify"
+.TH "SYSTEMD\-NOTIFY" "1" "08/06/2010" "systemd" "systemd-notify"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/man/systemd.1 new/systemd-6/man/systemd.1
--- old/systemd-5/man/systemd.1 2010-08-04 18:54:53.000000000 +0200
+++ new/systemd-6/man/systemd.1 2010-08-06 13:01:29.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: systemd
.\" Author: Lennart Poettering
.\" Generator: DocBook XSL Stylesheets v1.75.2
-.\" Date: 08/04/2010
+.\" Date: 08/06/2010
.\" Manual: systemd
.\" Source: systemd
.\" Language: English
.\"
-.TH "SYSTEMD" "1" "08/04/2010" "systemd" "systemd"
+.TH "SYSTEMD" "1" "08/06/2010" "systemd" "systemd"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/man/systemd.automount.5 new/systemd-6/man/systemd.automount.5
--- old/systemd-5/man/systemd.automount.5 2010-08-04 18:54:58.000000000 +0200
+++ new/systemd-6/man/systemd.automount.5 2010-08-06 13:01:47.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: systemd.automount
.\" Author: Lennart Poettering
.\" Generator: DocBook XSL Stylesheets v1.75.2
-.\" Date: 08/04/2010
+.\" Date: 08/06/2010
.\" Manual: systemd.automount
.\" Source: systemd
.\" Language: English
.\"
-.TH "SYSTEMD\&.AUTOMOUNT" "5" "08/04/2010" "systemd" "systemd.automount"
+.TH "SYSTEMD\&.AUTOMOUNT" "5" "08/06/2010" "systemd" "systemd.automount"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/man/systemd.conf.5 new/systemd-6/man/systemd.conf.5
--- old/systemd-5/man/systemd.conf.5 2010-08-04 18:55:10.000000000 +0200
+++ new/systemd-6/man/systemd.conf.5 2010-08-06 13:02:07.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: systemd.conf
.\" Author: Lennart Poettering
.\" Generator: DocBook XSL Stylesheets v1.75.2
-.\" Date: 08/04/2010
+.\" Date: 08/06/2010
.\" Manual: systemd.conf
.\" Source: systemd
.\" Language: English
.\"
-.TH "SYSTEMD\&.CONF" "5" "08/04/2010" "systemd" "systemd.conf"
+.TH "SYSTEMD\&.CONF" "5" "08/06/2010" "systemd" "systemd.conf"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/man/systemd.device.5 new/systemd-6/man/systemd.device.5
--- old/systemd-5/man/systemd.device.5 2010-08-04 18:55:04.000000000 +0200
+++ new/systemd-6/man/systemd.device.5 2010-08-06 13:01:53.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: systemd.device
.\" Author: Lennart Poettering
.\" Generator: DocBook XSL Stylesheets v1.75.2
-.\" Date: 08/04/2010
+.\" Date: 08/06/2010
.\" Manual: systemd.device
.\" Source: systemd
.\" Language: English
.\"
-.TH "SYSTEMD\&.DEVICE" "5" "08/04/2010" "systemd" "systemd.device"
+.TH "SYSTEMD\&.DEVICE" "5" "08/06/2010" "systemd" "systemd.device"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/man/systemd.exec.5 new/systemd-6/man/systemd.exec.5
--- old/systemd-5/man/systemd.exec.5 2010-08-04 18:55:04.000000000 +0200
+++ new/systemd-6/man/systemd.exec.5 2010-08-06 13:01:56.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: systemd.exec
.\" Author: Lennart Poettering
.\" Generator: DocBook XSL Stylesheets v1.75.2
-.\" Date: 08/04/2010
+.\" Date: 08/06/2010
.\" Manual: systemd.exec
.\" Source: systemd
.\" Language: English
.\"
-.TH "SYSTEMD\&.EXEC" "5" "08/04/2010" "systemd" "systemd.exec"
+.TH "SYSTEMD\&.EXEC" "5" "08/06/2010" "systemd" "systemd.exec"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/man/systemd.mount.5 new/systemd-6/man/systemd.mount.5
--- old/systemd-5/man/systemd.mount.5 2010-08-04 18:54:58.000000000 +0200
+++ new/systemd-6/man/systemd.mount.5 2010-08-06 13:01:45.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: systemd.mount
.\" Author: Lennart Poettering
.\" Generator: DocBook XSL Stylesheets v1.75.2
-.\" Date: 08/04/2010
+.\" Date: 08/06/2010
.\" Manual: systemd.mount
.\" Source: systemd
.\" Language: English
.\"
-.TH "SYSTEMD\&.MOUNT" "5" "08/04/2010" "systemd" "systemd.mount"
+.TH "SYSTEMD\&.MOUNT" "5" "08/06/2010" "systemd" "systemd.mount"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/man/systemd.path.5 new/systemd-6/man/systemd.path.5
--- old/systemd-5/man/systemd.path.5 2010-08-04 18:55:04.000000000 +0200
+++ new/systemd-6/man/systemd.path.5 2010-08-06 13:01:51.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: systemd.path
.\" Author: Lennart Poettering
.\" Generator: DocBook XSL Stylesheets v1.75.2
-.\" Date: 08/04/2010
+.\" Date: 08/06/2010
.\" Manual: systemd.path
.\" Source: systemd
.\" Language: English
.\"
-.TH "SYSTEMD\&.PATH" "5" "08/04/2010" "systemd" "systemd.path"
+.TH "SYSTEMD\&.PATH" "5" "08/06/2010" "systemd" "systemd.path"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/man/systemd.service.5 new/systemd-6/man/systemd.service.5
--- old/systemd-5/man/systemd.service.5 2010-08-04 18:54:58.000000000 +0200
+++ new/systemd-6/man/systemd.service.5 2010-08-06 13:01:43.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: systemd.service
.\" Author: Lennart Poettering
.\" Generator: DocBook XSL Stylesheets v1.75.2
-.\" Date: 08/04/2010
+.\" Date: 08/06/2010
.\" Manual: systemd.service
.\" Source: systemd
.\" Language: English
.\"
-.TH "SYSTEMD\&.SERVICE" "5" "08/04/2010" "systemd" "systemd.service"
+.TH "SYSTEMD\&.SERVICE" "5" "08/06/2010" "systemd" "systemd.service"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/man/systemd.snapshot.5 new/systemd-6/man/systemd.snapshot.5
--- old/systemd-5/man/systemd.snapshot.5 2010-08-04 18:55:04.000000000 +0200
+++ new/systemd-6/man/systemd.snapshot.5 2010-08-06 13:01:54.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: systemd.snapshot
.\" Author: Lennart Poettering
.\" Generator: DocBook XSL Stylesheets v1.75.2
-.\" Date: 08/04/2010
+.\" Date: 08/06/2010
.\" Manual: systemd.snapshot
.\" Source: systemd
.\" Language: English
.\"
-.TH "SYSTEMD\&.SNAPSHOT" "5" "08/04/2010" "systemd" "systemd.snapshot"
+.TH "SYSTEMD\&.SNAPSHOT" "5" "08/06/2010" "systemd" "systemd.snapshot"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/man/systemd.socket.5 new/systemd-6/man/systemd.socket.5
--- old/systemd-5/man/systemd.socket.5 2010-08-04 18:54:58.000000000 +0200
+++ new/systemd-6/man/systemd.socket.5 2010-08-06 13:01:44.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: systemd.socket
.\" Author: Lennart Poettering
.\" Generator: DocBook XSL Stylesheets v1.75.2
-.\" Date: 08/04/2010
+.\" Date: 08/06/2010
.\" Manual: systemd.socket
.\" Source: systemd
.\" Language: English
.\"
-.TH "SYSTEMD\&.SOCKET" "5" "08/04/2010" "systemd" "systemd.socket"
+.TH "SYSTEMD\&.SOCKET" "5" "08/06/2010" "systemd" "systemd.socket"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/man/systemd.special.7.in new/systemd-6/man/systemd.special.7.in
--- old/systemd-5/man/systemd.special.7.in 2010-08-04 18:55:10.000000000 +0200
+++ new/systemd-6/man/systemd.special.7.in 2010-08-06 13:02:54.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: systemd.special
.\" Author: Lennart Poettering
.\" Generator: DocBook XSL Stylesheets v1.75.2
-.\" Date: 08/04/2010
+.\" Date: 08/06/2010
.\" Manual: systemd.special
.\" Source: systemd
.\" Language: English
.\"
-.TH "SYSTEMD\&.SPECIAL" "7" "08/04/2010" "systemd" "systemd.special"
+.TH "SYSTEMD\&.SPECIAL" "7" "08/06/2010" "systemd" "systemd.special"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/man/systemd.swap.5 new/systemd-6/man/systemd.swap.5
--- old/systemd-5/man/systemd.swap.5 2010-08-04 18:55:00.000000000 +0200
+++ new/systemd-6/man/systemd.swap.5 2010-08-06 13:01:48.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: systemd.swap
.\" Author: Lennart Poettering
.\" Generator: DocBook XSL Stylesheets v1.75.2
-.\" Date: 08/04/2010
+.\" Date: 08/06/2010
.\" Manual: systemd.swap
.\" Source: systemd
.\" Language: English
.\"
-.TH "SYSTEMD\&.SWAP" "5" "08/04/2010" "systemd" "systemd.swap"
+.TH "SYSTEMD\&.SWAP" "5" "08/06/2010" "systemd" "systemd.swap"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/man/systemd.target.5 new/systemd-6/man/systemd.target.5
--- old/systemd-5/man/systemd.target.5 2010-08-04 18:55:04.000000000 +0200
+++ new/systemd-6/man/systemd.target.5 2010-08-06 13:01:52.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: systemd.target
.\" Author: Lennart Poettering
.\" Generator: DocBook XSL Stylesheets v1.75.2
-.\" Date: 08/04/2010
+.\" Date: 08/06/2010
.\" Manual: systemd.target
.\" Source: systemd
.\" Language: English
.\"
-.TH "SYSTEMD\&.TARGET" "5" "08/04/2010" "systemd" "systemd.target"
+.TH "SYSTEMD\&.TARGET" "5" "08/06/2010" "systemd" "systemd.target"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/man/systemd.timer.5 new/systemd-6/man/systemd.timer.5
--- old/systemd-5/man/systemd.timer.5 2010-08-04 18:55:04.000000000 +0200
+++ new/systemd-6/man/systemd.timer.5 2010-08-06 13:01:49.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: systemd.timer
.\" Author: Lennart Poettering
.\" Generator: DocBook XSL Stylesheets v1.75.2
-.\" Date: 08/04/2010
+.\" Date: 08/06/2010
.\" Manual: systemd.timer
.\" Source: systemd
.\" Language: English
.\"
-.TH "SYSTEMD\&.TIMER" "5" "08/04/2010" "systemd" "systemd.timer"
+.TH "SYSTEMD\&.TIMER" "5" "08/06/2010" "systemd" "systemd.timer"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/man/systemd.unit.5 new/systemd-6/man/systemd.unit.5
--- old/systemd-5/man/systemd.unit.5 2010-08-04 18:54:58.000000000 +0200
+++ new/systemd-6/man/systemd.unit.5 2010-08-06 13:01:41.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: systemd.unit
.\" Author: Lennart Poettering
.\" Generator: DocBook XSL Stylesheets v1.75.2
-.\" Date: 08/04/2010
+.\" Date: 08/06/2010
.\" Manual: systemd.unit
.\" Source: systemd
.\" Language: English
.\"
-.TH "SYSTEMD\&.UNIT" "5" "08/04/2010" "systemd" "systemd.unit"
+.TH "SYSTEMD\&.UNIT" "5" "08/06/2010" "systemd" "systemd.unit"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/man/telinit.8 new/systemd-6/man/telinit.8
--- old/systemd-5/man/telinit.8 2010-08-04 18:55:10.000000000 +0200
+++ new/systemd-6/man/telinit.8 2010-08-06 13:02:01.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: telinit
.\" Author: Lennart Poettering
.\" Generator: DocBook XSL Stylesheets v1.75.2
-.\" Date: 08/04/2010
+.\" Date: 08/06/2010
.\" Manual: telinit
.\" Source: systemd
.\" Language: English
.\"
-.TH "TELINIT" "8" "08/04/2010" "systemd" "telinit"
+.TH "TELINIT" "8" "08/06/2010" "systemd" "telinit"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/src/automount.c new/systemd-6/src/automount.c
--- old/systemd-5/src/automount.c 2010-08-04 00:01:04.000000000 +0200
+++ new/systemd-6/src/automount.c 2010-08-06 02:31:19.000000000 +0200
@@ -153,7 +153,7 @@
if (a->meta.manager->running_as == MANAGER_SYSTEM) {
- if ((r = unit_add_dependency_by_name(UNIT(a), UNIT_AFTER, SPECIAL_SYSINIT_TARGET, NULL, true)) < 0)
+ if ((r = unit_add_dependency_by_name(UNIT(a), UNIT_AFTER, SPECIAL_FSCK_TARGET, NULL, true)) < 0)
return r;
if ((r = unit_add_two_dependencies_by_name(UNIT(a), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/src/cgroups-agent.c new/systemd-6/src/cgroups-agent.c
--- old/systemd-5/src/cgroups-agent.c 2010-07-11 11:48:13.000000000 +0200
+++ new/systemd-6/src/cgroups-agent.c 2010-08-06 09:39:14.000000000 +0200
@@ -22,6 +22,7 @@
#include
#include "log.h"
+#include "dbus-common.h"
int main(int argc, char *argv[]) {
DBusError error;
@@ -36,9 +37,25 @@
goto finish;
}
+ log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
+ log_parse_environment();
+
+ /* If possible we go via the system bus, to make sure that
+ * session instances get the messages. If not possible we talk
+ * to the system instance directly. */
if (!(bus = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error))) {
- log_error("Failed to get D-Bus connection: %s", error.message);
- goto finish;
+
+ dbus_error_free(&error);
+
+ if (!(bus = dbus_connection_open_private("unix:abstract=/org/freedesktop/systemd1/private", &error))) {
+ log_error("Failed to get D-Bus connection: %s", error.message);
+ goto finish;
+ }
+
+ if (bus_check_peercred(bus) < 0) {
+ log_error("Bus owner not root.");
+ goto finish;
+ }
}
if (!(m = dbus_message_new_signal("/org/freedesktop/systemd1/agent", "org.freedesktop.systemd1.Agent", "Released"))) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/src/dbus.c new/systemd-6/src/dbus.c
--- old/systemd-5/src/dbus.c 2010-07-11 11:48:13.000000000 +0200
+++ new/systemd-6/src/dbus.c 2010-08-06 09:39:14.000000000 +0200
@@ -474,11 +474,14 @@
static DBusHandlerResult private_bus_message_filter(DBusConnection *connection, DBusMessage *message, void *data) {
Manager *m = data;
+ DBusError error;
assert(connection);
assert(message);
assert(m);
+ dbus_error_init(&error);
+
if (dbus_message_get_type(message) == DBUS_MESSAGE_TYPE_METHOD_CALL ||
dbus_message_get_type(message) == DBUS_MESSAGE_TYPE_SIGNAL)
log_debug("Got D-Bus request: %s.%s() on %s",
@@ -488,6 +491,18 @@
if (dbus_message_is_signal(message, DBUS_INTERFACE_LOCAL, "Disconnected"))
shutdown_connection(m, connection);
+ else if (dbus_message_is_signal(message, "org.freedesktop.systemd1.Agent", "Released")) {
+ const char *cgroup;
+
+ if (!dbus_message_get_args(message, &error,
+ DBUS_TYPE_STRING, &cgroup,
+ DBUS_TYPE_INVALID))
+ log_error("Failed to parse Released message: %s", error.message);
+ else
+ cgroup_notify_empty(m, cgroup);
+ }
+
+ dbus_error_free(&error);
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/src/device.c new/systemd-6/src/device.c
--- old/systemd-5/src/device.c 2010-07-21 08:46:08.000000000 +0200
+++ new/systemd-6/src/device.c 2010-08-06 09:39:14.000000000 +0200
@@ -195,7 +195,6 @@
}
if (!u) {
- Device *first;
delete = true;
if (!(u = unit_new(m)))
@@ -204,13 +203,22 @@
if ((r = device_add_escaped_name(u, path)) < 0)
goto fail;
+ unit_add_to_load_queue(u);
+ } else
+ delete = false;
+
+ /* If this was created via some dependency and has not
+ * actually been seen yet ->sysfs will not be
+ * initialized. Hence initialize it if necessary. */
+
+ if (!DEVICE(u)->sysfs) {
+ Device *first;
+
if (!(DEVICE(u)->sysfs = strdup(sysfs))) {
r = -ENOMEM;
goto fail;
}
- unit_add_to_load_queue(u);
-
if (!m->devices_by_sysfs)
if (!(m->devices_by_sysfs = hashmap_new(string_hash_func, string_compare_func))) {
r = -ENOMEM;
@@ -222,9 +230,7 @@
if ((r = hashmap_replace(m->devices_by_sysfs, DEVICE(u)->sysfs, first)) < 0)
goto fail;
-
- } else
- delete = false;
+ }
if ((model = udev_device_get_property_value(dev, "ID_MODEL_FROM_DATABASE")) ||
(model = udev_device_get_property_value(dev, "ID_MODEL"))) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/src/main.c new/systemd-6/src/main.c
--- old/systemd-5/src/main.c 2010-08-04 00:01:04.000000000 +0200
+++ new/systemd-6/src/main.c 2010-08-06 01:30:18.000000000 +0200
@@ -55,6 +55,7 @@
} arg_action = ACTION_RUN;
static char *arg_default_unit = NULL;
+static char *arg_console = NULL;
static ManagerRunningAs arg_running_as = _MANAGER_RUNNING_AS_INVALID;
static bool arg_dump_core = true;
@@ -326,7 +327,26 @@
} else if (streq(word, "nomodules"))
arg_nomodules = true;
- else if (streq(word, "quiet")) {
+ else if (startswith(word, "console=")) {
+ const char *k;
+ size_t l;
+ char *w = NULL;
+
+ k = word + 8;
+ l = strcspn(k, ",");
+
+ if (l < 4 ||
+ !startswith(k, "tty") ||
+ k[3+strspn(k+3, "0123456789")] != 0) {
+
+ if (!(w = strndup(k, l)))
+ return -ENOMEM;
+ }
+
+ free(arg_console);
+ arg_console = w;
+
+ } else if (streq(word, "quiet")) {
if (!ignore_quiet)
arg_show_status = false;
} else {
@@ -821,7 +841,6 @@
int main(int argc, char *argv[]) {
Manager *m = NULL;
Unit *target = NULL;
- Job *job = NULL;
int r, retval = 1;
FDSet *fds = NULL;
bool reexecute = false;
@@ -836,9 +855,6 @@
return 1;
}
- if (label_init() < 0)
- goto finish;
-
log_show_color(isatty(STDERR_FILENO) > 0);
log_show_location(false);
log_set_max_level(LOG_INFO);
@@ -846,6 +862,9 @@
if (getpid() == 1) {
arg_running_as = MANAGER_SYSTEM;
log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
+
+ if (label_init() < 0)
+ goto finish;
} else {
arg_running_as = MANAGER_SESSION;
log_set_target(LOG_TARGET_CONSOLE);
@@ -1005,12 +1024,27 @@
manager_dump_units(m, stdout, "\t");
}
- if ((r = manager_add_job(m, JOB_START, target, JOB_REPLACE, false, &error, &job)) < 0) {
+ if ((r = manager_add_job(m, JOB_START, target, JOB_REPLACE, false, &error, NULL)) < 0) {
log_error("Failed to start default target: %s", bus_error(&error, r));
dbus_error_free(&error);
goto finish;
}
+ if (arg_console && arg_running_as == MANAGER_SYSTEM) {
+ char *name;
+
+ if (asprintf(&name, "getty@%s.service", arg_console) < 0)
+ log_error("Out of memory while generating console getty service name.");
+ else {
+ if ((r = manager_add_job_by_name(m, JOB_START, name, JOB_FAIL, false, &error, NULL)) < 0) {
+ log_error("Failed to start console getty target: %s", bus_error(&error, r));
+ dbus_error_free(&error);
+ }
+
+ free(name);
+ }
+ }
+
if (arg_action == ACTION_TEST) {
printf("-> By jobs:\n");
manager_dump_jobs(m, stdout, "\t");
@@ -1056,6 +1090,7 @@
manager_free(m);
free(arg_default_unit);
+ free(arg_console);
dbus_shutdown();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/src/manager.c new/systemd-6/src/manager.c
--- old/systemd-5/src/manager.c 2010-07-20 21:13:22.000000000 +0200
+++ new/systemd-6/src/manager.c 2010-08-06 09:39:14.000000000 +0200
@@ -746,7 +746,7 @@
return -ENOEXEC;
/* Ok, we can drop one, so let's do so. */
- log_notice("Trying to fix job merging by deleting job %s/%s", d->unit->meta.id, job_type_to_string(d->type));
+ log_debug("Fixing conflicting jobs by deleting job %s/%s", d->unit->meta.id, job_type_to_string(d->type));
transaction_delete_job(m, d, true);
return 0;
}
@@ -885,7 +885,7 @@
/* Have we seen this before? */
if (j->generation == generation) {
- Job *k;
+ Job *k, *delete;
/* If the marker is NULL we have been here already and
* decided the job was loop-free from here. Hence
@@ -901,17 +901,17 @@
* in there. */
log_warning("Found ordering cycle on %s/%s", j->unit->meta.id, job_type_to_string(j->type));
+ delete = NULL;
for (k = from; k; k = ((k->generation == generation && k->marker != k) ? k->marker : NULL)) {
log_info("Walked on cycle path to %s/%s", k->unit->meta.id, job_type_to_string(k->type));
- if (!k->installed &&
+ if (!delete &&
+ !k->installed &&
!unit_matters_to_anchor(k->unit, k)) {
/* Ok, we can drop this one, so let's
* do so. */
- log_warning("Breaking order cycle by deleting job %s/%s", k->unit->meta.id, job_type_to_string(k->type));
- transaction_delete_unit(m, k->unit);
- return -EAGAIN;
+ delete = k;
}
/* Check if this in fact was the beginning of
@@ -920,6 +920,13 @@
break;
}
+
+ if (delete) {
+ log_warning("Breaking ordering cycle by deleting job %s/%s", k->unit->meta.id, job_type_to_string(k->type));
+ transaction_delete_unit(m, delete->unit);
+ return -EAGAIN;
+ }
+
log_error("Unable to break cycle");
dbus_set_error(e, BUS_ERROR_TRANSACTION_ORDER_IS_CYCLIC, "Transaction order is cyclic. See logs for details.");
@@ -1061,7 +1068,7 @@
j->type == JOB_STOP && UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(j->unit));
changes_existing_job =
- j->unit->meta.job && job_type_is_conflicting(j->type, j->unit->meta.job->state);
+ j->unit->meta.job && job_type_is_conflicting(j->type, j->unit->meta.job->type);
if (!stops_running_service && !changes_existing_job)
continue;
@@ -1302,7 +1309,7 @@
job_dependency_free(j->object_list);
if (other && delete_dependencies) {
- log_info("Deleting job %s/%s as dependency of job %s/%s",
+ log_debug("Deleting job %s/%s as dependency of job %s/%s",
other->unit->meta.id, job_type_to_string(other->type),
j->unit->meta.id, job_type_to_string(j->type));
transaction_delete_job(m, other, delete_dependencies);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/src/mount.c new/systemd-6/src/mount.c
--- old/systemd-5/src/mount.c 2010-07-20 21:13:22.000000000 +0200
+++ new/systemd-6/src/mount.c 2010-08-06 02:31:19.000000000 +0200
@@ -279,14 +279,14 @@
assert(m);
- if (m->meta.manager->running_as == MANAGER_SYSTEM) {
+ if (m->meta.manager->running_as == MANAGER_SYSTEM &&
+ !path_equal(m->where, "/")) {
- if ((r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, SPECIAL_SYSINIT_TARGET, NULL, true)) < 0)
+ if ((r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, SPECIAL_FSCK_TARGET, NULL, true)) < 0)
return r;
- if (!path_equal(m->where, "/"))
- if ((r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0)
- return r;
+ if ((r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0)
+ return r;
}
return 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/src/service.c new/systemd-6/src/service.c
--- old/systemd-5/src/service.c 2010-07-21 08:46:08.000000000 +0200
+++ new/systemd-6/src/service.c 2010-08-05 20:29:47.000000000 +0200
@@ -56,11 +56,15 @@
{ "rc4.d", SPECIAL_RUNLEVEL4_TARGET, RUNLEVEL_UP },
{ "rc5.d", SPECIAL_RUNLEVEL5_TARGET, RUNLEVEL_UP },
+#ifdef TARGET_SUSE
/* SUSE style boot.d */
{ "boot.d", SPECIAL_SYSINIT_TARGET, RUNLEVEL_SYSINIT },
+#endif
+#ifdef TARGET_DEBIAN
/* Debian style rcS.d */
{ "rcS.d", SPECIAL_SYSINIT_TARGET, RUNLEVEL_SYSINIT },
+#endif
/* Standard SysV runlevels for shutdown */
{ "rc0.d", SPECIAL_POWEROFF_TARGET, RUNLEVEL_DOWN },
@@ -292,6 +296,7 @@
LIST_FOREACH(units_per_type, other, s->meta.manager->units_per_type[UNIT_SERVICE]) {
Service *t;
UnitDependency d;
+ bool special_s, special_t;
t = (Service*) other;
@@ -307,7 +312,14 @@
(!t->sysv_path || t->sysv_has_lsb))
continue;
- if (t->sysv_start_priority < s->sysv_start_priority)
+ special_s = s->sysv_runlevels && !chars_intersect(RUNLEVELS_UP, s->sysv_runlevels);
+ special_t = t->sysv_runlevels && !chars_intersect(RUNLEVELS_UP, t->sysv_runlevels);
+
+ if (special_t && !special_s)
+ d = UNIT_AFTER;
+ else if (special_s && !special_t)
+ d = UNIT_BEFORE;
+ else if (t->sysv_start_priority < s->sysv_start_priority)
d = UNIT_AFTER;
else if (t->sysv_start_priority > s->sysv_start_priority)
d = UNIT_BEFORE;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/src/special.h new/systemd-6/src/special.h
--- old/systemd-5/src/special.h 2010-07-13 06:16:19.000000000 +0200
+++ new/systemd-6/src/special.h 2010-08-06 01:30:39.000000000 +0200
@@ -51,6 +51,7 @@
#define SPECIAL_BASIC_TARGET "basic.target"
#define SPECIAL_SOCKETS_TARGET "sockets.target"
#define SPECIAL_SYSINIT_TARGET "sysinit.target"
+#define SPECIAL_FSCK_TARGET "fsck.target"
#define SPECIAL_RESCUE_TARGET "rescue.target"
#define SPECIAL_EXIT_SERVICE "exit.service"
#define SPECIAL_EMERGENCY_TARGET "emergency.target"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/src/systemadm.c new/systemd-6/src/systemadm.c
--- old/systemd-5/src/systemadm.c 2010-08-04 18:54:54.000000000 +0200
+++ new/systemd-6/src/systemadm.c 2010-08-06 13:02:49.000000000 +0200
@@ -572,7 +572,7 @@
}
-#line 7714 "gtk+-2.0.vapi"
+#line 7716 "gtk+-2.0.vapi"
static void _gtk_main_quit_gtk_object_destroy (GtkObject* _sender, gpointer self) {
#line 578 "systemadm.c"
gtk_main_quit ();
@@ -1744,21 +1744,21 @@
}
-#line 2162 "glib-2.0.vapi"
+#line 2180 "glib-2.0.vapi"
static void g_time_local (time_t time, struct tm* result) {
#line 1750 "systemadm.c"
struct tm _result_ = {0};
-#line 2164 "glib-2.0.vapi"
+#line 2182 "glib-2.0.vapi"
localtime_r (&time, &_result_);
#line 1754 "systemadm.c"
*result = _result_;
-#line 2165 "glib-2.0.vapi"
+#line 2183 "glib-2.0.vapi"
return;
#line 1758 "systemadm.c"
}
-#line 2172 "glib-2.0.vapi"
+#line 2190 "glib-2.0.vapi"
static char* g_time_format (struct tm *self, const char* format) {
#line 1764 "systemadm.c"
char* result = NULL;
@@ -1766,16 +1766,16 @@
gint _buffer_size_;
gint buffer_length1;
gchar* buffer;
-#line 2172 "glib-2.0.vapi"
+#line 2190 "glib-2.0.vapi"
g_return_val_if_fail (format != NULL, NULL);
#line 1772 "systemadm.c"
buffer = (_tmp0_ = g_new0 (gchar, 64), buffer_length1 = 64, _buffer_size_ = buffer_length1, _tmp0_);
-#line 2174 "glib-2.0.vapi"
+#line 2192 "glib-2.0.vapi"
strftime (buffer, buffer_length1, format, &(*self));
#line 1776 "systemadm.c"
result = g_strdup ((const char*) buffer);
buffer = (g_free (buffer), NULL);
-#line 2175 "glib-2.0.vapi"
+#line 2193 "glib-2.0.vapi"
return result;
#line 1781 "systemadm.c"
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/src/systemctl.c new/systemd-6/src/systemctl.c
--- old/systemd-5/src/systemctl.c 2010-07-24 09:46:03.000000000 +0200
+++ new/systemd-6/src/systemctl.c 2010-08-05 19:52:19.000000000 +0200
@@ -3933,7 +3933,8 @@
break;
case 'p':
- arg_action = ACTION_POWEROFF;
+ if (arg_action != ACTION_REBOOT)
+ arg_action = ACTION_POWEROFF;
break;
case ARG_REBOOT:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/src/systemd-interfaces.c new/systemd-6/src/systemd-interfaces.c
--- old/systemd-5/src/systemd-interfaces.c 2010-08-04 18:54:55.000000000 +0200
+++ new/systemd-6/src/systemd-interfaces.c 2010-08-06 13:02:49.000000000 +0200
@@ -3772,6 +3772,24 @@
}
+/***
+ This file is part of systemd.
+
+ Copyright 2010 Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ systemd is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with systemd; If not, see .
+***/
GType manager_get_type (void) {
static volatile gsize manager_type_id__volatile = 0;
if (g_once_init_enter (&manager_type_id__volatile)) {
@@ -6289,7 +6307,7 @@
char* unit_start (Unit* self, const char* mode, GError** error) {
#line 120 "systemd-interfaces.vala"
return UNIT_GET_INTERFACE (self)->start (self, mode, error);
-#line 6293 "systemd-interfaces.c"
+#line 6311 "systemd-interfaces.c"
}
@@ -6297,7 +6315,7 @@
char* unit_stop (Unit* self, const char* mode, GError** error) {
#line 121 "systemd-interfaces.vala"
return UNIT_GET_INTERFACE (self)->stop (self, mode, error);
-#line 6301 "systemd-interfaces.c"
+#line 6319 "systemd-interfaces.c"
}
@@ -6305,7 +6323,7 @@
char* unit_restart (Unit* self, const char* mode, GError** error) {
#line 122 "systemd-interfaces.vala"
return UNIT_GET_INTERFACE (self)->restart (self, mode, error);
-#line 6309 "systemd-interfaces.c"
+#line 6327 "systemd-interfaces.c"
}
@@ -6313,7 +6331,7 @@
char* unit_reload (Unit* self, const char* mode, GError** error) {
#line 123 "systemd-interfaces.vala"
return UNIT_GET_INTERFACE (self)->reload (self, mode, error);
-#line 6317 "systemd-interfaces.c"
+#line 6335 "systemd-interfaces.c"
}
@@ -10490,7 +10508,7 @@
void job_cancel (Job* self, GError** error) {
#line 140 "systemd-interfaces.vala"
JOB_GET_INTERFACE (self)->cancel (self, error);
-#line 10494 "systemd-interfaces.c"
+#line 10512 "systemd-interfaces.c"
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/src/util.c new/systemd-6/src/util.c
--- old/systemd-5/src/util.c 2010-08-04 01:08:04.000000000 +0200
+++ new/systemd-6/src/util.c 2010-08-05 19:52:19.000000000 +0200
@@ -62,11 +62,11 @@
static struct selabel_handle *label_hnd = NULL;
-static inline int use_selinux(void) {
+static inline bool use_selinux(void) {
static int use_selinux_ind = -1;
- if (use_selinux_ind == -1)
- use_selinux_ind = (is_selinux_enabled() == 1);
+ if (use_selinux_ind < 0)
+ use_selinux_ind = is_selinux_enabled() > 0;
return use_selinux_ind;
}
@@ -84,6 +84,8 @@
r = getfilecon(path, &dir_con);
if (r >= 0) {
r = -1;
+ errno = EINVAL;
+
if ((sclass = string_to_security_class(class)) != 0)
r = security_compute_create((security_context_t) label, dir_con, sclass, fcon);
}
@@ -122,7 +124,7 @@
struct stat st;
security_context_t fcon;
- if (!use_selinux())
+ if (!use_selinux() || !label_hnd)
return 0;
r = lstat(path, &st);
@@ -147,7 +149,7 @@
void label_finish(void) {
#ifdef HAVE_SELINUX
- if (use_selinux())
+ if (use_selinux() && label_hnd)
selabel_close(label_hnd);
#endif
}
@@ -270,7 +272,7 @@
int r;
security_context_t fcon = NULL;
- if (use_selinux()) {
+ if (use_selinux() && label_hnd) {
if (path[0] == '/') {
r = selabel_lookup_raw(label_hnd, &fcon, path, mode);
}
@@ -300,7 +302,7 @@
r = mkdir(path, mode);
finish:
- if (use_selinux()) {
+ if (use_selinux() && label_hnd) {
setfscreatecon(NULL);
freecon(fcon);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/units/emergency.service new/systemd-6/units/emergency.service
--- old/systemd-5/units/emergency.service 2010-07-21 08:46:08.000000000 +0200
+++ new/systemd-6/units/emergency.service 2010-08-05 20:29:47.000000000 +0200
@@ -20,6 +20,6 @@
RestartSec=0
KillMode=process-group
-# Bash ignores SIGTERM, so we send SIGHUP first, to ensure that bash
+# Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash
# terminates cleanly.
-ExecStop=-/bin/kill -HUP ${MAINPID}
+KillSignal=SIGHUP
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/units/fedora/single.service new/systemd-6/units/fedora/single.service
--- old/systemd-5/units/fedora/single.service 2010-07-21 08:46:08.000000000 +0200
+++ new/systemd-6/units/fedora/single.service 2010-08-05 20:29:47.000000000 +0200
@@ -23,6 +23,6 @@
RestartSec=0
KillMode=process-group
-# Bash ignores SIGTERM, so we send SIGHUP first, to ensure that bash
+# Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash
# terminates cleanly.
-ExecStop=-/bin/kill -HUP ${MAINPID}
+KillSignal=SIGHUP
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/units/getty@.service.m4 new/systemd-6/units/getty@.service.m4
--- old/systemd-5/units/getty@.service.m4 2010-08-04 18:54:11.000000000 +0200
+++ new/systemd-6/units/getty@.service.m4 2010-08-05 20:29:47.000000000 +0200
@@ -27,9 +27,10 @@
Restart=restart-always
RestartSec=0
KillMode=process-group
-m4_ifdef(`TARGET_SUSE',
+
+# Some login implementations ignore SIGTERM, so we send SIGHUP
+# instead, to ensure that login terminates cleanly.
KillSignal=SIGHUP
-)m4_dnl
[Install]
Alias=getty.target.wants/getty@tty1.service getty.target.wants/getty@tty2.service getty.target.wants/getty@tty3.service getty.target.wants/getty@tty4.service getty.target.wants/getty@tty5.service getty.target.wants/getty@tty6.service
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/units/suse/fsck.target new/systemd-6/units/suse/fsck.target
--- old/systemd-5/units/suse/fsck.target 1970-01-01 01:00:00.000000000 +0100
+++ new/systemd-6/units/suse/fsck.target 2010-08-06 01:32:34.000000000 +0200
@@ -0,0 +1,11 @@
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+# See systemd.special(7) for details
+
+[Unit]
+Description=File System Check
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-5/units/sysinit.target.m4 new/systemd-6/units/sysinit.target.m4
--- old/systemd-5/units/sysinit.target.m4 2010-07-13 06:16:19.000000000 +0200
+++ new/systemd-6/units/sysinit.target.m4 2010-08-06 01:30:39.000000000 +0200
@@ -23,3 +23,7 @@
Requires=sysinit.service
After=sysinit.service
)m4_dnl
+m4_ifdef(`TARGET_SUSE',`',
+m4_dnl On Suse, fsck.target is seperate, everywhere else it is just an alias for sysinit.target
+Names=fsck.target
+)m4_dnl
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org