diff options
| author | Tollef Fog Heen <tfheen@err.no> | 2011-06-29 13:52:18 +0200 |
|---|---|---|
| committer | Tollef Fog Heen <tfheen@err.no> | 2011-06-29 13:52:18 +0200 |
| commit | a169c578d55a928f60619174b542db32faeb666b (patch) | |
| tree | 0f3be1f0f122c971330d7252fff1e6a186b98a5f /units | |
| parent | 1aa71a4d4ea5c8cd238f7495a3a3803a96395cc1 (diff) | |
| parent | f9a61ef2c9e3b330d9e2e37977b3dd5758a4b853 (diff) | |
| download | systemd-a169c578d55a928f60619174b542db32faeb666b.tar.gz | |
Merge commit 'v29'
Conflicts:
units/remote-fs.target
Diffstat (limited to 'units')
| -rw-r--r-- | units/.gitignore | 1 | ||||
| -rw-r--r-- | units/remote-fs.target (renamed from units/remote-fs.target.m4) | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/units/.gitignore b/units/.gitignore index fe23b12266..f969466bd7 100644 --- a/units/.gitignore +++ b/units/.gitignore @@ -31,7 +31,6 @@ systemd-random-seed-save.service systemd-initctl.service systemd-logger.service getty@.service -remote-fs.target systemd-update-utmp-runlevel.service systemd-update-utmp-shutdown.service test-env-replace diff --git a/units/remote-fs.target.m4 b/units/remote-fs.target index c11ffbffa8..61920d8f04 100644 --- a/units/remote-fs.target.m4 +++ b/units/remote-fs.target @@ -9,11 +9,7 @@ [Unit] Description=Remote File Systems -m4_dnl -m4_ifdef(`FOR_SYSTEM', -m4_dnl When running in system mode we need the network up -After=network.target local-fs.target -)m4_dnl +After=local-fs.target [Install] WantedBy=multi-user.target |