Blame ecryptfs-utils-75-nocryptdisks.patch

0d13c9
diff -up ecryptfs-utils-106/src/utils/ecryptfs-setup-swap.nocryptdisks ecryptfs-utils-106/src/utils/ecryptfs-setup-swap
0d13c9
--- ecryptfs-utils-106/src/utils/ecryptfs-setup-swap.nocryptdisks	2015-03-11 16:15:31.000000000 +0100
0d13c9
+++ ecryptfs-utils-106/src/utils/ecryptfs-setup-swap	2015-03-30 11:07:17.042580187 +0200
Michal Hlavinka db6652
@@ -37,23 +37,20 @@ warn() {
Michal Hlavinka db6652
 usage() {
Michal Hlavinka db6652
 	echo
Michal Hlavinka db6652
 	echo `gettext "Usage:"`
Michal Hlavinka db6652
-	echo "  $0 [-f|--force] [-n|--no-reload]"
Michal Hlavinka db6652
+	echo "  $0 [-f|--force]"
Michal Hlavinka db6652
 	echo
Michal Hlavinka db6652
 	exit 1
Michal Hlavinka db6652
 }
Michal Hlavinka db6652
 
Michal Hlavinka db6652
 # Handle command line options
Michal Hlavinka db6652
 FORCE=0
Michal Hlavinka db6652
+NO_RELOAD=1
Michal Hlavinka db6652
 while [ ! -z "$1" ]; do
Michal Hlavinka db6652
 	case "$1" in
Michal Hlavinka db6652
 		-f|--force)
Michal Hlavinka db6652
 			FORCE=1
Michal Hlavinka db6652
 			shift 1
Michal Hlavinka db6652
 		;;
Michal Hlavinka db6652
-		-n|--no-reload)
Michal Hlavinka db6652
-			NO_RELOAD=1
Michal Hlavinka db6652
-			shift 1
Michal Hlavinka db6652
-		;;
Michal Hlavinka db6652
 		*)
Michal Hlavinka db6652
 			usage
Michal Hlavinka db6652
 		;;
0d13c9
@@ -168,7 +165,6 @@ for swap in $swaps; do
Michal Hlavinka db6652
 	# Add fstab entry
Michal Hlavinka c3bb6c
 	echo "/dev/mapper/cryptswap$i none swap sw 0 0" >> /etc/fstab
Michal Hlavinka c3bb6c
 done
Michal Hlavinka 7beee0
-
Michal Hlavinka db6652
 if [ "$NO_RELOAD" != 1 ]; then
Michal Hlavinka db6652
 	# Turn swap off
Michal Hlavinka db6652
 	swapoff -a
0d13c9
@@ -181,3 +177,4 @@ if [ "$NO_RELOAD" != 1 ]; then
Michal Hlavinka db6652
 fi
Michal Hlavinka db6652
 
0d13c9
 info `gettext "Successfully encrypted swap!"`
Michal Hlavinka 7beee0
+info "This will take effect after reboot"