Merge branch 'master' into debian

19 files changed, 49 insertions, 11 deletions

diff --git a/units/.gitignore b/units/.gitignore
index cbf9f255f0..fe23b12266 100644
--- a/units/.gitignore
+++ b/units/.gitignore
@@ -1,3 +1,4 @@
+systemd-hostnamed.service
 console-shell.service
 systemd-sysctl.service
 systemd-ask-password-console.service
diff --git a/units/emergency.service b/units/emergency.service
index a97ec5e389..eff5261868 100644
--- a/units/emergency.service
+++ b/units/emergency.service
@@ -19,7 +19,7 @@ WorkingDirectory=/root
 ExecStartPre=-/bin/plymouth quit
 ExecStartPre=-/bin/echo 'Welcome to emergency mode. Use "systemctl default" or ^D to activate default mode.'
 ExecStart=-/sbin/sulogin
-ExecStopPost=/bin/systemctl --fail default
+ExecStopPost=/bin/systemctl --fail --no-block default
 StandardInput=tty-force
 KillMode=process
 
diff --git a/units/fsck-root.service.in b/units/fsck-root.service.in
index 8f4adc48e0..7b3529db07 100644
--- a/units/fsck-root.service.in
+++ b/units/fsck-root.service.in
@@ -9,7 +9,7 @@
 Description=File System Check on Root Device
 DefaultDependencies=no
 After=systemd-readahead-collect.service systemd-readahead-replay.service
-Before=local-fs.target shutdown.target remount-rootfs.service quotacheck.service
+Before=local-fs.target shutdown.target
 
 # Dracut informs us with this flag file if the root fsck was already run
 ConditionPathExists=!/run/initramfs/root-fsck
diff --git a/units/fsck@.service.in b/units/fsck@.service.in
index ad9ec3bcc9..e1f773639b 100644
--- a/units/fsck@.service.in
+++ b/units/fsck@.service.in
@@ -10,7 +10,7 @@ Description=File System Check on %f
 DefaultDependencies=no
 BindTo=%i.device
 After=systemd-readahead-collect.service systemd-readahead-replay.service %i.device
-Before=basic.target shutdown.target
+Before=shutdown.target
 
 [Service]
 Type=oneshot
diff --git a/units/local-fs.target b/units/local-fs.target
index 52d0e68101..1886f7499d 100644
--- a/units/local-fs.target
+++ b/units/local-fs.target
@@ -9,3 +9,5 @@
 
 [Unit]
 Description=Local File Systems
+OnFailure=emergency.target
+OnFailureIsolate=yes
diff --git a/units/quotacheck.service.in b/units/quotacheck.service.in
index ed1ddc5589..27dcb1e4c6 100644
--- a/units/quotacheck.service.in
+++ b/units/quotacheck.service.in
@@ -8,7 +8,7 @@
 [Unit]
 Description=File System Quota Check
 DefaultDependencies=no
-After=systemd-readahead-collect.service systemd-readahead-replay.service
+After=systemd-readahead-collect.service systemd-readahead-replay.service remount-rootfs.service
 Before=local-fs.target shutdown.target
 ConditionPathExists=/sbin/quotacheck
 
diff --git a/units/remount-rootfs.service b/units/remount-rootfs.service
index 31309015ca..e95023f03d 100644
--- a/units/remount-rootfs.service
+++ b/units/remount-rootfs.service
@@ -9,7 +9,7 @@
 Description=Remount Root FS
 DefaultDependencies=no
 Conflicts=shutdown.target
-After=systemd-readahead-collect.service systemd-readahead-replay.service
+After=systemd-readahead-collect.service systemd-readahead-replay.service fsck-root.service
 Before=local-fs.target shutdown.target
 
 [Service]
diff --git a/units/rescue.service.m4 b/units/rescue.service.m4
index 241c75071f..d2fd582e86 100644
--- a/units/rescue.service.m4
+++ b/units/rescue.service.m4
@@ -25,8 +25,11 @@ ExecStart=-/bin/bash -c "exec ${SINGLE}"',
 m4_ifdef(`TARGET_MANDRIVA',
 `EnvironmentFile=/etc/sysconfig/init
 ExecStart=-/bin/bash -c "exec ${SINGLE}"',
-`ExecStart=-/sbin/sulogin'))
-ExecStopPost=-/bin/systemctl --fail default
+`ExecStart=-/sbin/sulogin'
+m4_ifdef(`TARGET_MEEGO',
+`EnvironmentFile=/etc/sysconfig/init
+ExecStart=-/bin/bash -c "exec ${SINGLE}"',)))
+ExecStopPost=-/bin/systemctl --fail --no-block default
 StandardInput=tty-force
 KillMode=process
 
diff --git a/units/syslog.target b/units/syslog.target
index 8b1626ed55..825b26e7bf 100644
--- a/units/syslog.target
+++ b/units/syslog.target
@@ -12,3 +12,8 @@
 
 [Unit]
 Description=Syslog
+
+# Avoid that we conflict with shutdown.target, so that we can stay
+# until the very end and do not cancel shutdown.target if we should
+# hapen to be activated very late.
+DefaultDependencies=no
diff --git a/units/systemd-ask-password-console.path b/units/systemd-ask-password-console.path
index 4005a27734..b5acf943b4 100644
--- a/units/systemd-ask-password-console.path
+++ b/units/systemd-ask-password-console.path
@@ -13,3 +13,4 @@ Before=basic.target shutdown.target
 
 [Path]
 DirectoryNotEmpty=/run/systemd/ask-password
+MakeDirectory=yes
diff --git a/units/systemd-ask-password-plymouth.path b/units/systemd-ask-password-plymouth.path
index a2aec44122..6a96520921 100644
--- a/units/systemd-ask-password-plymouth.path
+++ b/units/systemd-ask-password-plymouth.path
@@ -13,3 +13,4 @@ Before=basic.target shutdown.target
 
 [Path]
 DirectoryNotEmpty=/run/systemd/ask-password
+MakeDirectory=yes
diff --git a/units/systemd-ask-password-wall.path b/units/systemd-ask-password-wall.path
index 7a883d5af8..050b73b2e1 100644
--- a/units/systemd-ask-password-wall.path
+++ b/units/systemd-ask-password-wall.path
@@ -13,3 +13,4 @@ Before=basic.target shutdown.target
 
 [Path]
 DirectoryNotEmpty=/run/systemd/ask-password
+MakeDirectory=yes
diff --git a/units/systemd-hostnamed.service.in b/units/systemd-hostnamed.service.in
new file mode 100644
index 0000000000..6efab1e25f
--- /dev/null
+++ b/units/systemd-hostnamed.service.in
@@ -0,0 +1,17 @@
+#  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=Hostname Service
+
+[Service]
+ExecStart=@rootlibexecdir@/systemd-hostnamed
+Type=dbus
+BusName=org.freedesktop.hostname1
+CapabilityBoundingSet=CAP_SYS_ADMIN
diff --git a/units/systemd-kmsg-syslogd.service.in b/units/systemd-kmsg-syslogd.service.in
index b81e4a3069..b20889e5e5 100644
--- a/units/systemd-kmsg-syslogd.service.in
+++ b/units/systemd-kmsg-syslogd.service.in
@@ -14,4 +14,6 @@ DefaultDependencies=no
 [Service]
 ExecStart=@rootlibexecdir@/systemd-kmsg-syslogd
 NotifyAccess=all
+StandardOutput=null
 Sockets=syslog.socket
+CapabilityBoundingSet=CAP_DAC_OVERRIDE
diff --git a/units/systemd-logger.service.in b/units/systemd-logger.service.in
index f82db15ac1..5f7fe40939 100644
--- a/units/systemd-logger.service.in
+++ b/units/systemd-logger.service.in
@@ -10,9 +10,11 @@
 [Unit]
 Description=Stdio Syslog Bridge
 DefaultDependencies=no
+Requires=syslog.socket
 After=syslog.socket
 
 [Service]
 ExecStart=@rootlibexecdir@/systemd-logger
 NotifyAccess=all
 StandardOutput=null
+CapabilityBoundingSet=CAP_SYS_ADMIN CAP_SETUID CAP_SETGID
diff --git a/units/systemd-logger.socket b/units/systemd-logger.socket
index 389b507d24..7178cc8246 100644
--- a/units/systemd-logger.socket
+++ b/units/systemd-logger.socket
@@ -8,9 +8,14 @@
 # See systemd.special(7) for details
 
 [Unit]
-Description=Stream Logging Socket
+Description=Stdio Syslog Bridge Socket
 DefaultDependencies=no
 Before=sockets.target
 
+# Mount and swap units need this. If this socket unit is removed by an
+# isolate request the mount and and swap units would be removed too,
+# hence let's exclude this from isolate requests.
+IgnoreOnIsolate=yes
+
 [Socket]
 ListenStream=/run/systemd/logger
diff --git a/units/systemd-shutdownd.service.in b/units/systemd-shutdownd.service.in
index 2214cafab2..657365a451 100644
--- a/units/systemd-shutdownd.service.in
+++ b/units/systemd-shutdownd.service.in
@@ -8,7 +8,7 @@
 # See systemd.special(7) for details
 
 [Unit]
-Description=Delayed Shutdown Daemon
+Description=Delayed Shutdown Service
 DefaultDependencies=no
 
 [Service]
diff --git a/units/systemd-update-utmp-runlevel.service.in b/units/systemd-update-utmp-runlevel.service.in
index 865a1535de..614c759a63 100644
--- a/units/systemd-update-utmp-runlevel.service.in
+++ b/units/systemd-update-utmp-runlevel.service.in
@@ -8,7 +8,6 @@
 [Unit]
 Description=Notify Audit System and Update UTMP about System Runlevel Changes
 DefaultDependencies=no
-Wants=local-fs.target sysinit.target
 After=local-fs.target sysinit.target auditd.service runlevel1.target runlevel2.target runlevel3.target runlevel4.target runlevel5.target systemd-tmpfiles-setup.service
 Before=poweroff.service reboot.service halt.service
 
diff --git a/units/systemd-update-utmp-shutdown.service.in b/units/systemd-update-utmp-shutdown.service.in
index c30d86d24c..e7c3c04a00 100644
--- a/units/systemd-update-utmp-shutdown.service.in
+++ b/units/systemd-update-utmp-shutdown.service.in
@@ -8,7 +8,6 @@
 [Unit]
 Description=Notify Audit System and Update UTMP about System Shutdown
 DefaultDependencies=no
-Wants=local-fs.target sysinit.target
 After=local-fs.target sysinit.target auditd.service systemd-update-utmp-runlevel.service
 Before=poweroff.service reboot.service halt.service