aboutsummaryrefslogtreecommitdiffstats
path: root/systemd/system
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2010-11-16 22:18:58 -0500
committerBill Nottingham <notting@redhat.com>2010-11-16 22:18:58 -0500
commit48da8e510bca624516172aa144b48a850f0e4ac9 (patch)
treeadb221a64403cd237267a0cb3270285e66c74c8b /systemd/system
parent3d0da9219136e0d2a9f9b67ceed0b2985bafc44b (diff)
downloadinitscripts-48da8e510bca624516172aa144b48a850f0e4ac9.tar
initscripts-48da8e510bca624516172aa144b48a850f0e4ac9.tar.gz
initscripts-48da8e510bca624516172aa144b48a850f0e4ac9.tar.bz2
initscripts-48da8e510bca624516172aa144b48a850f0e4ac9.tar.xz
initscripts-48da8e510bca624516172aa144b48a850f0e4ac9.zip
Don't use our crypto init ; systemd handles this.
Diffstat (limited to 'systemd/system')
-rw-r--r--systemd/system/fedora-autoswap.service4
-rw-r--r--systemd/system/fedora-init-crypto-1.service15
-rw-r--r--systemd/system/fedora-init-crypto-2.service15
-rw-r--r--systemd/system/fedora-init-crypto-3.service15
-rw-r--r--systemd/system/fedora-storage-init.service4
5 files changed, 4 insertions, 49 deletions
diff --git a/systemd/system/fedora-autoswap.service b/systemd/system/fedora-autoswap.service
index 8cd881d9..d7f667da 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=local-fs.target fedora-init-crypto-3.service
-Requires=local-fs.target fedora-init-crypto-3.service
+After=local-fs.target
+Requires=local-fs.target
[Service]
ExecStart=/lib/systemd/fedora-autoswap
diff --git a/systemd/system/fedora-init-crypto-1.service b/systemd/system/fedora-init-crypto-1.service
deleted file mode 100644
index 6d6b732f..00000000
--- a/systemd/system/fedora-init-crypto-1.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Initialize encrypted storage
-DefaultDependencies=no
-Conflicts=shutdown.target
-Before=shutdown.target emergency.service emergency.target
-After=fedora-wait-storage.service
-Requires=fedora-wait-storage.service
-ConditionPathExists=/etc/crypttab
-
-[Service]
-ExecStart=/lib/systemd/fedora-init-crypto 0
-Type=oneshot
-TimeoutSec=0
-RemainAfterExit=yes
-StandardInput=tty
diff --git a/systemd/system/fedora-init-crypto-2.service b/systemd/system/fedora-init-crypto-2.service
deleted file mode 100644
index c01bbd1b..00000000
--- a/systemd/system/fedora-init-crypto-2.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Initialize encrypted filesystems on top of other storage
-DefaultDependencies=no
-Conflicts=shutdown.target
-Before=shutdown.target emergency.service emergency.target
-After=fedora-storage-init.service
-Requires=fedora-storage-init.service
-ConditionPathExists=/etc/crypttab
-
-[Service]
-ExecStart=/lib/systemd/fedora-init-crypto 0
-Type=oneshot
-TimeoutSec=0
-RemainAfterExit=yes
-StandardInput=tty
diff --git a/systemd/system/fedora-init-crypto-3.service b/systemd/system/fedora-init-crypto-3.service
deleted file mode 100644
index 84b11fd5..00000000
--- a/systemd/system/fedora-init-crypto-3.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Initialize encrypted filesystems on top of other storage
-DefaultDependencies=no
-Conflicts=shutdown.target
-Before=shutdown.target emergency.service emergency.target
-After=systemd-random-seed-load.service
-Requires=systemd-random-seed-load.service
-ConditionPathExists=/etc/crypttab
-
-[Service]
-ExecStart=/lib/systemd/fedora-init-crypto 1
-Type=oneshot
-TimeoutSec=0
-RemainAfterExit=yes
-StandardInput=tty
diff --git a/systemd/system/fedora-storage-init.service b/systemd/system/fedora-storage-init.service
index 2806c2dd..bd8e02fe 100644
--- a/systemd/system/fedora-storage-init.service
+++ b/systemd/system/fedora-storage-init.service
@@ -3,8 +3,8 @@ 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 fedora-init-crypto-1.service
-Requires=fedora-wait-storage.service fedora-init-crypto-1.service
+After=fedora-wait-storage.service
+Requires=fedora-wait-storage.service
[Service]
ExecStart=/lib/systemd/fedora-storage-init