]> err.no Git - systemd/commitdiff
Merge tag 'v43' into debian-units
authorTollef Fog Heen <tfheen@err.no>
Mon, 20 Feb 2012 19:00:20 +0000 (20:00 +0100)
committerTollef Fog Heen <tfheen@err.no>
Mon, 20 Feb 2012 19:00:20 +0000 (20:00 +0100)
systemd 43

Conflicts:
units/remount-rootfs.service

1  2 
units/getty@.service.m4
units/remount-rootfs.service

Simple merge
index 6dbcaeb701091ecea9803f920193688396ae4773,7b63752c7e4fd69e264d2d1ba5a3e6954229a420..53d0f31531d354fe0cdf578f037ff5c936de50bd
@@@ -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