From: Tollef Fog Heen Date: Mon, 20 Feb 2012 19:00:20 +0000 (+0100) Subject: Merge tag 'v43' into debian-units X-Git-Tag: debian-units_43-1~2 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14466291560ece602232c1ae960033025f3bbb1c;p=systemd Merge tag 'v43' into debian-units systemd 43 Conflicts: units/remount-rootfs.service --- 14466291560ece602232c1ae960033025f3bbb1c diff --cc units/remount-rootfs.service index 6dbcaeb7,7b63752c..53d0f315 --- a/units/remount-rootfs.service +++ b/units/remount-rootfs.service @@@ -10,7 -10,8 +10,8 @@@ Description=Remount Root F DefaultDependencies=no Conflicts=shutdown.target After=systemd-readahead-collect.service systemd-readahead-replay.service fsck-root.service - Before=local-fs.target shutdown.target mountoverflowtmp.service -Before=local-fs-pre.target local-fs.target shutdown.target ++Before=local-fs-pre.target local-fs.target shutdown.target mountoverflowtmp.service + Wants=local-fs-pre.target [Service] Type=oneshot