rpms/ecryptfs-utils/F-12 ecryptfs-utils-75-nocryptdisks.patch, 1.2, 1.3

[Michal Hlavinka]

Author: mhlavink

Update of /cvs/extras/rpms/ecryptfs-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27463

Modified Files:
	ecryptfs-utils-75-nocryptdisks.patch 
Log Message:
trim patches


ecryptfs-utils-75-nocryptdisks.patch:
 ecryptfs-setup-swap |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

Index: ecryptfs-utils-75-nocryptdisks.patch
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/F-12/ecryptfs-utils-75-nocryptdisks.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ecryptfs-utils-75-nocryptdisks.patch	18 Aug 2009 06:56:17 -0000	1.2
+++ ecryptfs-utils-75-nocryptdisks.patch	29 Sep 2009 11:02:10 -0000	1.3
@@ -1,18 +1,42 @@
-diff -up ecryptfs-utils-79/src/utils/ecryptfs-setup-swap.nocryptdisks ecryptfs-utils-79/src/utils/ecryptfs-setup-swap
---- ecryptfs-utils-79/src/utils/ecryptfs-setup-swap.nocryptdisks	2009-08-17 15:50:12.000000000 +0200
-+++ ecryptfs-utils-79/src/utils/ecryptfs-setup-swap	2009-08-18 08:46:44.734619290 +0200
-@@ -158,13 +158,5 @@ for swap in $swaps; do
+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
- 
--# Turn swap off
--swapoff -a
--
--# Restart cryptdisks
--/etc/init.d/cryptdisks restart
--
--# Turn the swap on
--swapon -a
 -
+ 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"