[ecryptfs-utils/f15] check for ecryptfs pam module before home dir migration

[Michal Hlavinka]

commit a947d556436194688830429a4583ebe7d0c53f68
Author: Michal Hlavinka <mhlavink at redhat.com>
Date:   Thu Jun 9 14:06:16 2011 +0200

    check for ecryptfs pam module before home dir migration

 ecryptfs-utils-87-authconfig.patch |   15 +++++++++++++++
 ecryptfs-utils.spec                |    9 ++++++++-
 2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/ecryptfs-utils-87-authconfig.patch b/ecryptfs-utils-87-authconfig.patch
new file mode 100644
index 0000000..4ac45c6
--- /dev/null
+++ b/ecryptfs-utils-87-authconfig.patch
@@ -0,0 +1,15 @@
+diff -up ecryptfs-utils-87/src/utils/ecryptfs-migrate-home.authconfig ecryptfs-utils-87/src/utils/ecryptfs-migrate-home
+--- ecryptfs-utils-87/src/utils/ecryptfs-migrate-home.authconfig	2011-06-09 13:25:11.346617817 +0200
++++ ecryptfs-utils-87/src/utils/ecryptfs-migrate-home	2011-06-09 13:25:39.288769200 +0200
+@@ -98,6 +98,11 @@ sanity_check () {
+ 	if ! which rsync >/dev/null 2>&1; then
+ 		error "Please install the rsync package."
+ 	fi
++	# Check for ecryptfs pam module
++	if ! grep -q ecryptfs /etc/pam.d/postlogin
++	then
++		error "You must enable ecryptfs pam module first. It can be enabled by using: authconfig --enableecryptfs --updateall"
++	fi
+ 	# Check free space: make sure we have sufficient disk space
+ 	# available. To make a full copy, we will need at least 2.5x the
+ 	# disk usage of the target home directory.
diff --git a/ecryptfs-utils.spec b/ecryptfs-utils.spec
index ffca490..6dc189f 100644
--- a/ecryptfs-utils.spec
+++ b/ecryptfs-utils.spec
@@ -5,7 +5,7 @@
 
 Name: ecryptfs-utils
 Version: 87
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: The eCryptfs mount helper and support libraries
 Group: System Environment/Base
 License: GPLv2+
@@ -38,6 +38,9 @@ Patch9: ecryptfs-utils-87-autoload.patch
 # sent upstream, for e-u < 88, rhbz#706911
 Patch10: ecryptfs-utils-87-mtab.patch
 
+# fedora/rhel specific, check for pam ecryptfs module before home migration
+Patch11: ecryptfs-utils-87-authconfig.patch
+
 # allow building with -Werror
 Patch999: ecryptfs-utils-75-werror.patch
 
@@ -86,6 +89,7 @@ the interface supplied by the ecryptfs-utils library.
 %patch8 -p1 -b .manfix
 %patch9 -p1 -b .autoload
 %patch10 -p1 -b .mtabfix
+%patch11 -p1 -b .authconfig
 %patch999 -p1 -b .werror
 
 %build
@@ -214,6 +218,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/ecryptfs-utils/_libecryptfs.so
 
 %changelog
+* Thu Jun 09 2011 Michal Hlavinka <mhlavink at redhat.com> - 87-4
+- check for ecryptfs pam module before home dir migration
+
 * Tue Jun 07 2011 Michal Hlavinka <mhlavink at redhat.com> - 87-3
 - update of mtab does not work if it's a symlink (#706911)