From 8ebf0a43d2df1b47d6404d33518c1654d740cf73 Mon Sep 17 00:00:00 2001
From: Miloslav Trmac <mitr@volny.cz>
Date: Mon, 24 Jul 2006 19:49:06 +0000
Subject: Don't require encrypted swap partitions to be swap formated before
 setting them up (#127378)

---
 rc.d/rc.sysinit | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'rc.d')

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index fd8ae8df..e48d700b 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -178,13 +178,6 @@ init_crypto() {
 	    ret=1
 	    continue
 	fi
-	if [ "$makeswap" = "yes" ]; then
-	    # init.d/halt should format $src as swap before shutdown
-	    if [ "$(/sbin/blkid -o value -s TYPE "$src")" != "swap" ]; then
-		echo $"$src is not a swap partition"
-		makeswap=no
-	    fi
-	fi
 	if [ -z "$key" -a -x /usr/bin/rhgb-client ] \
 	    && /usr/bin/rhgb-client --ping ; then
 	    chvt 1
-- 
cgit v1.2.1