From 588fadded55c6d808b5a2b076da87d32a7b885e6 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Fri, 15 Oct 2010 23:20:15 -0400
Subject: Use systemd's support for normal swapon; only handle autoswap here.

---
 systemd/system/fedora-autoswap.service | 13 +++++++++++++
 systemd/system/fedora-swapon.service   | 13 -------------
 2 files changed, 13 insertions(+), 13 deletions(-)
 create mode 100644 systemd/system/fedora-autoswap.service
 delete mode 100644 systemd/system/fedora-swapon.service

(limited to 'systemd/system')

diff --git a/systemd/system/fedora-autoswap.service b/systemd/system/fedora-autoswap.service
new file mode 100644
index 00000000..c5087967
--- /dev/null
+++ b/systemd/system/fedora-autoswap.service
@@ -0,0 +1,13 @@
+[Unit]
+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
+
+[Service]
+ExecStart=/lib/systemd/fedora-autoswap
+Type=oneshot
+TimeoutSec=0
+RemainAfterExit=yes
diff --git a/systemd/system/fedora-swapon.service b/systemd/system/fedora-swapon.service
deleted file mode 100644
index 4b945026..00000000
--- a/systemd/system/fedora-swapon.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Configure the system if the administrator requested it
-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
-
-[Service]
-ExecStart=/lib/systemd/fedora-swapon
-Type=oneshot
-TimeoutSec=0
-RemainAfterExit=yes
-- 
cgit v1.2.1