File ecryptfs-setup-swap-SuSE.patch of Package ecryptfs-utils.1844

--- ecryptfs-utils-103/src/utils/ecryptfs-setup-swap	2013-08-05 10:44:55.618908888 -0400
+++ ecryptfs-utils-103/src/utils/ecryptfs-setup-swap.mod	2013-08-05 10:54:16.966419219 -0400
@@ -37,23 +37,20 @@
 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
 		;;
@@ -149,7 +146,8 @@
 for swap in $swaps; do
 	info `gettext "Setting up swap:"` "[$swap]"
 	uuid=$(blkid -o value -s UUID $swap)
-	for target in "UUID=$uuid" $swap; do
+	suse_swap=$(grep swap /etc/fstab |cut -d' ' -f1)
+	for target in $suse_swap $swap; do
 		if [ -n "$target" ] && grep -qs "^$target " /etc/fstab; then
 			sed -i "s:^$target :\#$target :" /etc/fstab
 			warn "Commented out your unencrypted swap from /etc/fstab"
@@ -166,7 +164,6 @@
 	# 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 +176,4 @@
 fi
 
 info `gettext "Successfully setup encrypted swap!"`
+info "This will take effect after reboot"
openSUSE Build Service is sponsored by