aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-11-19 03:04:16 +0100
committerBill Nottingham <notting@redhat.com>2010-11-21 23:06:38 -0500
commite8fbd3e8f6588cb6051c5e6492316fd6b3eef8cf (patch)
treea6024053ea0275e1be9cdc87caa0d86e733a8446
parent2cc340fbe91ac28c5e3786e58429c3e5c62e79d6 (diff)
downloadinitscripts-e8fbd3e8f6588cb6051c5e6492316fd6b3eef8cf.tar
initscripts-e8fbd3e8f6588cb6051c5e6492316fd6b3eef8cf.tar.gz
initscripts-e8fbd3e8f6588cb6051c5e6492316fd6b3eef8cf.tar.bz2
initscripts-e8fbd3e8f6588cb6051c5e6492316fd6b3eef8cf.tar.xz
initscripts-e8fbd3e8f6588cb6051c5e6492316fd6b3eef8cf.zip
fedora-storage: drop reference to emergency, weaken dependencies
-rw-r--r--systemd/system/fedora-storage-init.service4
-rw-r--r--systemd/system/fedora-wait-storage.service4
2 files changed, 4 insertions, 4 deletions
diff --git a/systemd/system/fedora-storage-init.service b/systemd/system/fedora-storage-init.service
index bd8e02fe..add337b6 100644
--- a/systemd/system/fedora-storage-init.service
+++ b/systemd/system/fedora-storage-init.service
@@ -2,9 +2,9 @@
Description=Initialize storage subsystems (RAID, LVM, etc.)
DefaultDependencies=no
Conflicts=shutdown.target
-Before=shutdown.target local-fs.target emergency.service emergency.target
After=fedora-wait-storage.service
-Requires=fedora-wait-storage.service
+Before=local-fs.target shutdown.target
+Wants=fedora-wait-storage.service
[Service]
ExecStart=/lib/systemd/fedora-storage-init
diff --git a/systemd/system/fedora-wait-storage.service b/systemd/system/fedora-wait-storage.service
index 63744b63..48e92a53 100644
--- a/systemd/system/fedora-wait-storage.service
+++ b/systemd/system/fedora-wait-storage.service
@@ -2,9 +2,9 @@
Description=Wait for storage scan
DefaultDependencies=no
Conflicts=shutdown.target
-Before=local-fs.target shutdown.target emergency.service emergency.target
After=udev-settle.service
-Requires=udev.service udev-settle.service
+Before=local-fs.target shutdown.target
+Wants=udev.service udev-settle.service
[Service]
ExecStart=-/sbin/rmmod scsi_wait_scan