diff options
| author | Bill Nottingham <notting@redhat.com> | 2010-10-26 15:21:05 -0400 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2010-10-26 15:33:00 -0400 |
| commit | 7577c483e62806140a278d2eb9147ce835893f7c (patch) | |
| tree | 306a9ee579c677b7ab91c6a2e82a13ea9cc85968 /systemd/system | |
| parent | b6788fc6a4089bbf538664bb814d81475c4ffa96 (diff) | |
| download | initscripts-7577c483e62806140a278d2eb9147ce835893f7c.tar initscripts-7577c483e62806140a278d2eb9147ce835893f7c.tar.gz initscripts-7577c483e62806140a278d2eb9147ce835893f7c.tar.bz2 initscripts-7577c483e62806140a278d2eb9147ce835893f7c.tar.xz initscripts-7577c483e62806140a278d2eb9147ce835893f7c.zip | |
Drop fedora-mountall, fedora-cleanup. Adjust other services accordingly.
systemd can do mount & fsck & quota, etc. now.
Diffstat (limited to 'systemd/system')
| -rw-r--r-- | systemd/system/fedora-autoswap.service | 4 | ||||
| -rw-r--r-- | systemd/system/fedora-cleanup.service | 13 | ||||
| -rw-r--r-- | systemd/system/fedora-mountall.service | 14 | ||||
| -rw-r--r-- | systemd/system/fedora-readonly.service | 5 |
4 files changed, 4 insertions, 32 deletions
diff --git a/systemd/system/fedora-autoswap.service b/systemd/system/fedora-autoswap.service index c5087967..8cd881d9 100644 --- a/systemd/system/fedora-autoswap.service +++ b/systemd/system/fedora-autoswap.service @@ -3,8 +3,8 @@ Description=Enable all detected swap partitions DefaultDependencies=no Conflicts=shutdown.target Before=shutdown.target emergency.service emergency.target -After=fedora-mountall.service fedora-init-crypto-3.service -Requires=fedora-mountall.service fedora-init-crypto-3.service +After=local-fs.target fedora-init-crypto-3.service +Requires=local-fs.target fedora-init-crypto-3.service [Service] ExecStart=/lib/systemd/fedora-autoswap diff --git a/systemd/system/fedora-cleanup.service b/systemd/system/fedora-cleanup.service deleted file mode 100644 index 3bbb12df..00000000 --- a/systemd/system/fedora-cleanup.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Clean out assorted temporary files -DefaultDependencies=no -Conflicts=shutdown.target -Before=shutdown.target emergency.service emergency.target local-fs.target -After=fedora-mountall.service fedora-readonly.service -Requires=fedora-mountall.service - -[Service] -ExecStart=/lib/systemd/fedora-cleanup -Type=oneshot -TimeoutSec=0 -RemainAfterExit=yes diff --git a/systemd/system/fedora-mountall.service b/systemd/system/fedora-mountall.service deleted file mode 100644 index af5cf79b..00000000 --- a/systemd/system/fedora-mountall.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Check, mount, and relabel all filesystems -DefaultDependencies=no -Conflicts=shutdown.target -Before=shutdown.target emergency.service emergency.target remount-rootfs.service -After=fedora-storage-init.service fedora-init-crypto-2.service -Requires=fedora-storage-init.service fedora-init-crypto-2.service - -[Service] -ExecStart=/lib/systemd/fedora-mountall -Type=oneshot -TimeoutSec=0 -RemainAfterExit=yes -StandardInput=tty diff --git a/systemd/system/fedora-readonly.service b/systemd/system/fedora-readonly.service index c1e42367..eca197f0 100644 --- a/systemd/system/fedora-readonly.service +++ b/systemd/system/fedora-readonly.service @@ -2,9 +2,8 @@ Description=Configure read-only root support DefaultDependencies=no Conflicts=shutdown.target -Before=shutdown.target emergency.service emergency.target fedora-cleanup.service -After=fedora-mountall.service -Requires=fedora-mountall.service +Before=shutdown.target emergency.service emergency.target systemd-tmpfiles-setup.service +After=remount-rootfs.service [Service] ExecStart=/lib/systemd/fedora-readonly |