diff options
author | Tollef Fog Heen <tfheen@err.no> | 2011-01-16 11:00:53 +0100 |
---|---|---|
committer | Tollef Fog Heen <tfheen@err.no> | 2011-01-16 11:00:53 +0100 |
commit | bccfbb85a534780093cfc59ca4024ce5ddaa9632 (patch) | |
tree | e9528550528005650cf52ec49192be53c7b2ef38 | |
parent | 60b9d86fe5dced94c50d6e7e459b620fa1ea54e0 (diff) | |
parent | 68b0e0e0003c95c63d144d06061291e22854f6c5 (diff) | |
download | systemd-bccfbb85a534780093cfc59ca4024ce5ddaa9632.tar.gz |
Merge branch 'master' into debian
-rw-r--r-- | units/local-fs.target | 2 | ||||
-rw-r--r-- | units/remote-fs.target.m4 | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/units/local-fs.target b/units/local-fs.target index 3c6d11a165..52d0e68101 100644 --- a/units/local-fs.target +++ b/units/local-fs.target @@ -9,5 +9,3 @@ [Unit] Description=Local File Systems -Wants=mountall.service mountoverflowtmp.service umountfs.service -After=mountall.service mountoverflowtmp.service umountfs.service diff --git a/units/remote-fs.target.m4 b/units/remote-fs.target.m4 index 586efe6e9f..fc1fd2bec4 100644 --- a/units/remote-fs.target.m4 +++ b/units/remote-fs.target.m4 @@ -13,7 +13,7 @@ m4_dnl m4_ifdef(`FOR_SYSTEM', m4_dnl When running in system mode we need the network up Requires=network.target -After=network.target local-fs.target mountnfs.service mountnfs-bootclean.service +After=network.target local-fs.target )m4_dnl [Install] |