Merge lp:~alberto-o/ecryptfs/swapfile-fix into lp:ecryptfs

[Alberto Pianon]

This fixes a small but very important bug (at least for Ubuntu): since Zesty uses swapfiles by default, because of this bug if you choose "encrypt home folder" during installation (which forces also swap encryption), after installation the system hangs a lot on every boot because it cannot activate swap.
Ecryptfs-setup-swap did not handle swapfiles correctly, and put a UUID in crypyttab as if the swapfile were a partition (see https://bugs.launchpad.net/ubuntu/+source/ecryptfs-utils/+bug/1670336)
Moreover, it called the wrong script to start the encrypted swap.

Unmerged revisions

886. By Alberto Pianon on 2017-03-06

[ Alberto Pianon ]
src/utils/ecryptfs-setup-swap: Fix to make the script work with swapfiles
and to use the right script to start encrypted swap (LP: #1670336)

=== modified file 'debian/changelog'
--- debian/changelog	2016-07-15 00:14:41 +0000
+++ debian/changelog	2017-03-06 20:21:05 +0000
@@ -1,4 +1,4 @@
-ecryptfs-utils (112) UNRELEASED; urgency=medium
+ecryptfs-utils (112ubuntu1) UNRELEASED; urgency=medium
 
   [ Dustin Kirkland ]
   * UNRELEASED
@@ -25,7 +25,11 @@
     modify the swap partitions on systems that ecryptfs-setup-swap has been
     used on. (LP: #1447282, LP: #1597154)
 
- -- Dustin Kirkland <[e-mail]>  Fri, 26 Feb 2016 18:00:18 -0600
+  [ Alberto Pianon ]
+  * src/utils/ecryptfs-setup-swap: Fix to make the script work with swapfiles
+    and to use the right script to start encrypted swap (LP: #1670336)
+
+ -- Alberto Pianon <[e-mail]>  Mon, 06 Mar 2017 21:04:47 +0100
 
 ecryptfs-utils (111) xenial; urgency=medium
 
 
=== modified file 'src/utils/ecryptfs-setup-swap'
--- src/utils/ecryptfs-setup-swap	2016-07-13 05:02:30 +0000
+++ src/utils/ecryptfs-setup-swap	2017-03-06 20:21:05 +0000
@@ -150,7 +150,7 @@
 	info `gettext "Setting up swap:"` "[$swap]"
 	uuid=$(blkid -o value -s UUID $swap)
 	# /etc/fstab might use a symlink like /dev/mapper/ubuntu--vg-swap_1
-	links=$(for d in $(udevadm info --query=symlink -n $swap); do echo /dev/$d; done)
+	[ -f $swap ] || links=$(for d in $(udevadm info --query=symlink -n $swap); do echo /dev/$d; done)
 	for target in "UUID=$uuid" $swap $links; do
 		if [ -n "$target" ] && grep -qs "^$target\s\+" /etc/fstab; then
 			sed -i "s:^$target\s\+:\#$target :" /etc/fstab
@@ -193,8 +193,11 @@
 	# Add crypttab entry
 	# Use /dev/urandom, since this is not a long lived key (generated each boot),
 	# and so that we don't block booting while waiting for entropy
-	echo "cryptswap$i UUID=$uuid /dev/urandom swap,offset=1024,cipher=aes-xts-plain64" >> /etc/crypttab
-
+  if [ -f $swap ]; then  # swapfile
+	  echo "cryptswap$i $swap /dev/urandom swap,offset=1024,cipher=aes-xts-plain64" >> /etc/crypttab
+	else                   # partition
+  	echo "cryptswap$i UUID=$uuid /dev/urandom swap,offset=1024,cipher=aes-xts-plain64" >> /etc/crypttab
+  fi
 	# Add fstab entry
 	echo "/dev/mapper/cryptswap$i none swap sw 0 0" >> /etc/fstab
 done
@@ -204,7 +207,9 @@
 	swapoff -a
 
 	# Restart cryptdisks
-	/etc/init.d/cryptdisks restart
+	#/etc/init.d/cryptdisks restart
+	# the above script does nothing, the following is the right command:
+	systemctl restart cryptsetup.target
 
 	# Turn the swap on
 	swapon -a