Merge branch 'master' of ssh://git.freedesktop.org/git/systemd

diff --git a/units/systemd-initctl.socket b/units/systemd-initctl.socket
index af5cca202ea4df4640b1079bc1802c6ede581461..26b526cdcb63015c39e955cb46051bf85d7991d0 100644 (file)
--- a/units/systemd-initctl.socket
+++ b/units/systemd-initctl.socket
@@ -10,6 +10,7 @@
 [Unit]
 Description=systemd /dev/initctl Compatibility Socket
 After=sysinit.target
+Before=sockets.target
 
 [Socket]
 ListenFIFO=/dev/initctl

diff --git a/units/systemd-logger.socket b/units/systemd-logger.socket
index 7195a9e85616738521704d5878bfd18a68a9cbeb..44684ce1d0e3cf5249ad2df5a5586e84163c2701 100644 (file)
--- a/units/systemd-logger.socket
+++ b/units/systemd-logger.socket
@@ -10,6 +10,7 @@
 [Unit]
 Description=systemd Logging Socket
 After=sysinit.target
+Before=sockets.target
 
 [Socket]
 ListenStream=@/org/freedesktop/systemd1/logger