From: Tollef Fog Heen <tfheen@err.no>
Date: Wed, 12 Oct 2011 06:41:27 +0000 (+0200)
Subject: Merge branch 'master' into debian
X-Git-Tag: 37-1~3
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=adec45b2fed38c4e794efa8c297709208d3ca899;p=systemd

Merge branch 'master' into debian

Update to v37

Conflicts:
	units/remount-rootfs.service
---

adec45b2fed38c4e794efa8c297709208d3ca899
diff --cc units/remount-rootfs.service
index 6dbcaeb7,89a16c8b..ee9977eb
--- 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