From: Tollef Fog Heen Date: Thu, 28 Jul 2011 08:41:45 +0000 (+0200) Subject: Move the debianisation of upstream files into its own branch X-Git-Tag: debian-units_43-1~3 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbe879eae939311429293dcd433c5ad99c53f54f;p=systemd Move the debianisation of upstream files into its own branch --- diff --git a/tmpfiles.d/legacy.conf b/tmpfiles.d/legacy.conf index 9198e89d..c357b189 100644 --- a/tmpfiles.d/legacy.conf +++ b/tmpfiles.d/legacy.conf @@ -17,6 +17,6 @@ # On modern systems a BSD file lock is a better choice if # serialization is needed on those devices. -d /run/lock 0755 root root - +d /run/lock 1777 root root - d /run/lock/subsys 0755 root root - -d /run/lock/lockdev 0775 root lock - +d /run/lock/lockdev 0775 root root - diff --git a/units/getty@.service.m4 b/units/getty@.service.m4 index b1115672..ea807841 100644 --- a/units/getty@.service.m4 +++ b/units/getty@.service.m4 @@ -8,7 +8,7 @@ [Unit] Description=Getty on %I BindTo=dev-%i.device -After=dev-%i.device systemd-user-sessions.service plymouth-quit-wait.service +After=dev-%i.device systemd-user-sessions.service plymouth-quit-wait.service openvpn.service apache2.service m4_ifdef(`TARGET_FEDORA', After=rc-local.service )m4_dnl diff --git a/units/remote-fs.target b/units/remote-fs.target index a48f87e5..61920d8f 100644 --- a/units/remote-fs.target +++ b/units/remote-fs.target @@ -9,6 +9,7 @@ [Unit] Description=Remote File Systems +After=local-fs.target [Install] WantedBy=multi-user.target diff --git a/units/remount-rootfs.service b/units/remount-rootfs.service index e95023f0..6dbcaeb7 100644 --- a/units/remount-rootfs.service +++ b/units/remount-rootfs.service @@ -10,7 +10,7 @@ Description=Remount Root FS DefaultDependencies=no Conflicts=shutdown.target After=systemd-readahead-collect.service systemd-readahead-replay.service fsck-root.service -Before=local-fs.target shutdown.target +Before=local-fs.target shutdown.target mountoverflowtmp.service [Service] Type=oneshot