From 4ee50f81e1f2f78af3298439ab8a9d9d96aa4d18 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Tue, 9 Aug 2011 14:18:17 -0400
Subject: Drop fedora-autoswap; it's somewhat dangerous, and better done via a
 udev/systemd combination anyway.

---
 Makefile                               |  1 -
 systemd/fedora-autoswap                | 18 ------------------
 systemd/system/fedora-autoswap.service | 12 ------------
 3 files changed, 31 deletions(-)
 delete mode 100755 systemd/fedora-autoswap
 delete mode 100644 systemd/system/fedora-autoswap.service

diff --git a/Makefile b/Makefile
index 1e8c09ee..975317b9 100644
--- a/Makefile
+++ b/Makefile
@@ -124,7 +124,6 @@ install:
 	mkdir -p -m 755 $(ROOT)/lib/systemd/system/sysinit.target.wants
 	ln -s ../fedora-configure.service $(ROOT)/lib/systemd/system/basic.target.wants
 	ln -s ../fedora-loadmodules.service $(ROOT)/lib/systemd/system/basic.target.wants
-	ln -s ../fedora-autoswap.service $(ROOT)/lib/systemd/system/basic.target.wants
 	ln -s ../fedora-autorelabel.service $(ROOT)/lib/systemd/system/basic.target.wants
 	ln -s ../fedora-autorelabel-mark.service $(ROOT)/lib/systemd/system/basic.target.wants
 	ln -s ../fedora-readonly.service $(ROOT)/lib/systemd/system/local-fs.target.wants
diff --git a/systemd/fedora-autoswap b/systemd/fedora-autoswap
deleted file mode 100755
index ea392909..00000000
--- a/systemd/fedora-autoswap
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-#
-# Support automatic swapon.
-#
-
-. /etc/init.d/functions
-
-if [ "$AUTOSWAP" = "yes" ]; then
-	curswap=$(awk '/^\/dev/ { print $1 }' /proc/swaps | while read x; do get_numeric_dev dec $x ; echo -n " "; done)
-	swappartitions=$(blkid -t TYPE=swap -o device)
-	if [ x"$swappartitions" != x ]; then
-		for partition in $swappartitions ; do
-			[ ! -e $partition ] && continue
-			majmin=$(get_numeric_dev dec $partition)
-			echo $curswap | grep -qw "$majmin" || action $"Enabling local swap partitions: " swapon $partition
-		done
-	fi
-fi
diff --git a/systemd/system/fedora-autoswap.service b/systemd/system/fedora-autoswap.service
deleted file mode 100644
index 21754c9c..00000000
--- a/systemd/system/fedora-autoswap.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Enable all detected swap partitions
-DefaultDependencies=no
-Conflicts=shutdown.target
-After=systemd-readahead-collect.service systemd-readahead-replay.service local-fs.target
-Before=swap.target shutdown.target
-
-[Service]
-ExecStart=/lib/systemd/fedora-autoswap
-Type=oneshot
-TimeoutSec=0
-RemainAfterExit=yes
-- 
cgit v1.2.1