Sophie

Sophie

distrib > Fedora > 13 > i386 > media > updates-src > by-pkgid > da19379dbe56e20dc3796c4684ddaaf8 > files > 2

ecryptfs-utils-85-1.fc13.src.rpm

diff -up ecryptfs-utils-81/src/utils/ecryptfs-setup-swap.nocryptdisks ecryptfs-utils-81/src/utils/ecryptfs-setup-swap
--- ecryptfs-utils-81/src/utils/ecryptfs-setup-swap.nocryptdisks	2009-09-19 01:41:21.000000000 +0200
+++ ecryptfs-utils-81/src/utils/ecryptfs-setup-swap	2009-09-29 10:25:07.481996541 +0200
@@ -37,23 +37,20 @@ warn() {
 usage() {
 	echo
 	echo `gettext "Usage:"`
-	echo "  $0 [-f|--force] [-n|--no-reload]"
+	echo "  $0 [-f|--force]"
 	echo
 	exit 1
 }
 
 # Handle command line options
 FORCE=0
+NO_RELOAD=1
 while [ ! -z "$1" ]; do
 	case "$1" in
 		-f|--force)
 			FORCE=1
 			shift 1
 		;;
-		-n|--no-reload)
-			NO_RELOAD=1
-			shift 1
-		;;
 		*)
 			usage
 		;;
@@ -166,7 +163,6 @@ for swap in $swaps; do
 	# Add fstab entry
 	echo "/dev/mapper/cryptswap$i none swap sw 0 0" >> /etc/fstab
 done
-
 if [ "$NO_RELOAD" != 1 ]; then
 	# Turn swap off
 	swapoff -a
@@ -179,3 +175,4 @@ if [ "$NO_RELOAD" != 1 ]; then
 fi
 
 info `gettext "Successfully setup encrypted swap!"`
+info "This will take effect after reboot"