From: Lennart Poettering Date: Fri, 4 Jun 2010 20:34:07 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.freedesktop.org/git/systemd X-Git-Tag: v1~220 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=86d6515040a729779a58b8c70465563b9008cea1;hp=a013b84b49a7d4a30196949e24ea03066e227626 Merge branch 'master' of ssh://git.freedesktop.org/git/systemd --- diff --git a/units/systemd-initctl.socket b/units/systemd-initctl.socket index af5cca202..26b526cdc 100644 --- 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 7195a9e85..44684ce1d 100644 --- 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