18 files changed, 22 insertions, 87 deletions
diff --git a/units/.gitignore b/units/.gitignore
index 2fff20a052..47e99154ee 100644
--- a/units/.gitignore
+++ b/units/.gitignore
@@ -1,4 +1,3 @@
-/systemd-bus-proxyd.service.m4
 /user@.service.m4
 /console-getty.service
 /console-getty.service.m4
@@ -23,8 +22,6 @@
 /systemd-ask-password-wall.service
 /systemd-backlight@.service
 /systemd-binfmt.service
-/systemd-bootchart.service
-/systemd-bus-proxyd.service
 /systemd-coredump@.service
 /systemd-firstboot.service
 /systemd-fsck-root.service
diff --git a/units/emergency.service.in b/units/emergency.service.in
index fb390eacfe..0de16f24e8 100644
--- a/units/emergency.service.in
+++ b/units/emergency.service.in
@@ -11,6 +11,7 @@ Documentation=man:sulogin(8)
 DefaultDependencies=no
 Conflicts=shutdown.target
 Conflicts=rescue.service
+Conflicts=syslog.socket
 Before=shutdown.target
 
 [Service]
diff --git a/units/user/systemd-bus-proxyd.socket b/units/initrd-root-device.target
index b9efc0e7ce..9d44d2d303 100644
--- a/units/user/systemd-bus-proxyd.socket
+++ b/units/initrd-root-device.target
@@ -6,7 +6,10 @@
 #  (at your option) any later version.
 
 [Unit]
-Description=Legacy D-Bus Protocol Compatibility Socket
-
-[Socket]
-ListenStream=%t/bus
+Description=Initrd Root Device
+Documentation=man:systemd.special(7)
+ConditionPathExists=/etc/initrd-release
+OnFailure=emergency.target
+OnFailureJobMode=replace-irreversibly
+DefaultDependencies=no
+Conflicts=shutdown.target
diff --git a/units/initrd.target b/units/initrd.target
index eae7c703c1..8be7e2b399 100644
--- a/units/initrd.target
+++ b/units/initrd.target
@@ -12,6 +12,6 @@ OnFailure=emergency.target
 OnFailureJobMode=replace-irreversibly
 ConditionPathExists=/etc/initrd-release
 Requires=basic.target
-Wants=initrd-root-fs.target initrd-fs.target initrd-parse-etc.service
-After=initrd-root-fs.target initrd-fs.target basic.target rescue.service rescue.target
+Wants=initrd-root-fs.target initrd-root-device.target initrd-fs.target initrd-parse-etc.service
+After=initrd-root-fs.target initrd-root-device.target initrd-fs.target basic.target rescue.service rescue.target
 AllowIsolate=yes
diff --git a/units/ldconfig.service b/units/ldconfig.service
index 994edd9908..d7b78bacf9 100644
--- a/units/ldconfig.service
+++ b/units/ldconfig.service
@@ -10,7 +10,7 @@ Description=Rebuild Dynamic Linker Cache
 Documentation=man:ldconfig(8)
 DefaultDependencies=no
 Conflicts=shutdown.target
-After=systemd-remount-fs.service
+After=local-fs.target
 Before=sysinit.target shutdown.target systemd-update-done.service
 ConditionNeedsUpdate=|/etc
 ConditionFileNotEmpty=|!/etc/ld.so.cache
diff --git a/units/rc-local.service.in b/units/rc-local.service.in
index d4db1747ed..480dddbe37 100644
--- a/units/rc-local.service.in
+++ b/units/rc-local.service.in
@@ -17,3 +17,4 @@ Type=forking
 ExecStart=@RC_LOCAL_SCRIPT_PATH_START@ start
 TimeoutSec=0
 RemainAfterExit=yes
+GuessMainPID=no
diff --git a/units/systemd-bootchart.service.in b/units/systemd-bootchart.service.in
deleted file mode 100644
index 396817f0ce..0000000000
--- a/units/systemd-bootchart.service.in
+++ /dev/null
@@ -1,20 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
-
-# Note: it's usually a better idea to run systemd-bootchart via the
-# init= kernel command line switch. See the man page for details.
-
-[Unit]
-Description=Boot Process Profiler
-Documentation=man:systemd-bootchart.service(1) man:bootchart.conf(5)
-DefaultDependencies=no
-
-[Service]
-ExecStart=@rootlibexecdir@/systemd-bootchart -r
-
-[Install]
-WantedBy=sysinit.target
diff --git a/units/systemd-bus-proxyd.service.m4.in b/units/systemd-bus-proxyd.service.m4.in
deleted file mode 100644
index e75cdb1a59..0000000000
--- a/units/systemd-bus-proxyd.service.m4.in
+++ /dev/null
@@ -1,25 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Legacy D-Bus Protocol Compatibility Daemon
-
-[Service]
-ExecStart=@rootlibexecdir@/systemd-bus-proxyd --address=kernel:path=/sys/fs/kdbus/0-system/bus
-ExecReload=@bindir@/busctl --address=unix:path=/run/dbus/system_bus_socket call org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus ReloadConfig
-NotifyAccess=main
-CapabilityBoundingSet=CAP_IPC_OWNER CAP_SETUID CAP_SETGID CAP_SETPCAP m4_ifdef(`HAVE_SMACK', CAP_MAC_ADMIN )
-PrivateTmp=yes
-PrivateDevices=yes
-PrivateNetwork=yes
-ProtectSystem=full
-ProtectHome=yes
-
-# The proxy manages connections of all users, so it needs an elevated file
-# limit. It does proper per-user accounting (indirectly via kdbus), therefore,
-# the effective per-user limits stay the same.
-LimitNOFILE=16384
diff --git a/units/systemd-bus-proxyd.socket b/units/systemd-bus-proxyd.socket
deleted file mode 100644
index 3f80a1d547..0000000000
--- a/units/systemd-bus-proxyd.socket
+++ /dev/null
@@ -1,12 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Legacy D-Bus Protocol Compatibility Socket
-
-[Socket]
-ListenStream=/var/run/dbus/system_bus_socket
diff --git a/units/systemd-fsck@.service.in b/units/systemd-fsck@.service.in
index 0468392dc4..6ca6b07e9e 100644
--- a/units/systemd-fsck@.service.in
+++ b/units/systemd-fsck@.service.in
@@ -11,7 +11,7 @@ Documentation=man:systemd-fsck@.service(8)
 DefaultDependencies=no
 BindsTo=%i.device
 After=%i.device systemd-fsck-root.service local-fs-pre.target
-Before=shutdown.target
+Before=systemd-quotacheck.service shutdown.target
 
 [Service]
 Type=oneshot
diff --git a/units/systemd-importd.service.in b/units/systemd-importd.service.in
index d3238cf8f5..b74ad72cdc 100644
--- a/units/systemd-importd.service.in
+++ b/units/systemd-importd.service.in
@@ -8,6 +8,7 @@
 [Unit]
 Description=Virtual Machine and Container Download Service
 Documentation=man:systemd-importd.service(8)
+Documentation=http://www.freedesktop.org/wiki/Software/systemd/importd
 
 [Service]
 ExecStart=@rootlibexecdir@/systemd-importd
diff --git a/units/systemd-machined.service.in b/units/systemd-machined.service.in
index 3710c595ca..685baab21d 100644
--- a/units/systemd-machined.service.in
+++ b/units/systemd-machined.service.in
@@ -15,7 +15,7 @@ After=machine.slice
 [Service]
 ExecStart=@rootlibexecdir@/systemd-machined
 BusName=org.freedesktop.machine1
-CapabilityBoundingSet=CAP_KILL CAP_SYS_PTRACE CAP_SYS_ADMIN CAP_SETGID CAP_SYS_CHROOT CAP_DAC_READ_SEARCH CAP_DAC_OVERRIDE CAP_CHOWN CAP_FOWNER CAP_FSETID
+CapabilityBoundingSet=CAP_KILL CAP_SYS_PTRACE CAP_SYS_ADMIN CAP_SETGID CAP_SYS_CHROOT CAP_DAC_READ_SEARCH CAP_DAC_OVERRIDE CAP_CHOWN CAP_FOWNER CAP_FSETID CAP_MKNOD
 WatchdogSec=3min
 
 # Note that machined cannot be placed in a mount namespace, since it
diff --git a/units/systemd-nspawn@.service.in b/units/systemd-nspawn@.service.in
index eb10343ac6..ea28941507 100644
--- a/units/systemd-nspawn@.service.in
+++ b/units/systemd-nspawn@.service.in
@@ -6,14 +6,14 @@
 #  (at your option) any later version.
 
 [Unit]
-Description=Container %I
+Description=Container %i
 Documentation=man:systemd-nspawn(1)
 PartOf=machines.target
 Before=machines.target
 After=network.target
 
 [Service]
-ExecStart=@bindir@/systemd-nspawn --quiet --keep-unit --boot --link-journal=try-guest --network-veth --settings=override --machine=%I
+ExecStart=@bindir@/systemd-nspawn --quiet --keep-unit --boot --link-journal=try-guest --network-veth -U --settings=override --machine=%i
 KillMode=mixed
 Type=notify
 RestartForceExitStatus=133
diff --git a/units/systemd-resolved.service.m4.in b/units/systemd-resolved.service.m4.in
index c674b27ced..8e1c1dea79 100644
--- a/units/systemd-resolved.service.m4.in
+++ b/units/systemd-resolved.service.m4.in
@@ -8,6 +8,9 @@
 [Unit]
 Description=Network Name Resolution
 Documentation=man:systemd-resolved.service(8)
+Documentation=http://www.freedesktop.org/wiki/Software/systemd/resolved
+Documentation=http://www.freedesktop.org/wiki/Software/systemd/writing-network-configuration-managers
+Documentation=http://www.freedesktop.org/wiki/Software/systemd/writing-resolver-clients
 After=systemd-networkd.service network.target
 
 # On kdbus systems we pull in the busname explicitly, because it
diff --git a/units/systemd-user-sessions.service.in b/units/systemd-user-sessions.service.in
index c09c05d4d5..b4ea5a134b 100644
--- a/units/systemd-user-sessions.service.in
+++ b/units/systemd-user-sessions.service.in
@@ -8,7 +8,7 @@
 [Unit]
 Description=Permit User Sessions
 Documentation=man:systemd-user-sessions.service(8)
-After=remote-fs.target nss-user-lookup.target
+After=remote-fs.target nss-user-lookup.target network.target
 
 [Service]
 Type=oneshot
diff --git a/units/tmp.mount.m4 b/units/tmp.mount.m4
index 00a0d28722..1448bd268a 100644
--- a/units/tmp.mount.m4
+++ b/units/tmp.mount.m4
@@ -13,6 +13,7 @@ ConditionPathIsSymbolicLink=!/tmp
 DefaultDependencies=no
 Conflicts=umount.target
 Before=local-fs.target umount.target
+After=swap.target
 
 [Mount]
 What=tmpfs
diff --git a/units/user/.gitignore b/units/user/.gitignore
index ce9df9e7e1..41a74f5461 100644
--- a/units/user/.gitignore
+++ b/units/user/.gitignore
@@ -1,2 +1 @@
 /systemd-exit.service
-/systemd-bus-proxyd.service
diff --git a/units/user/systemd-bus-proxyd.service.in b/units/user/systemd-bus-proxyd.service.in
deleted file mode 100644
index 6f79707b46..0000000000
--- a/units/user/systemd-bus-proxyd.service.in
+++ /dev/null
@@ -1,14 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Legacy D-Bus Protocol Compatibility Daemon
-
-[Service]
-ExecStart=@rootlibexecdir@/systemd-bus-proxyd --address=kernel:path=/sys/fs/kdbus/%U-user/bus
-ExecReload=@bindir@/busctl --address=unix:path=/run/user/%U/bus call org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus ReloadConfig
-NotifyAccess=main