[Fusionforge-commits] r13530 - branches/Branch_5_1/src/deb-specific

Roland Mas lolando at fusionforge.org
Tue Jun 21 15:20:04 CEST 2011


Author: lolando
Date: 2011-06-21 15:20:04 +0200 (Tue, 21 Jun 2011)
New Revision: 13530

Modified:
   branches/Branch_5_1/src/deb-specific/install-chroot.sh
Log:
Make chroot install script more resilient, again

Modified: branches/Branch_5_1/src/deb-specific/install-chroot.sh
===================================================================
--- branches/Branch_5_1/src/deb-specific/install-chroot.sh	2011-06-21 09:54:34 UTC (rev 13529)
+++ branches/Branch_5_1/src/deb-specific/install-chroot.sh	2011-06-21 13:20:04 UTC (rev 13530)
@@ -71,7 +71,7 @@
 	    | sort -u \
 	    | cpio --quiet -pdumVLB $CHROOTDIR
 
-	for i in /lib/ld-linux*.so.* /lib/libgcc_s* /lib/libcom_err* ; do
+	for i in /lib/ld-linux*.so.* /lib/libgcc_s* /lib/libcom_err* /lib/libpam* /lib/libnss_files*; do
 		test -e "$i" || continue
 		cp "$i" $CHROOTDIR/lib/
 	done
@@ -108,10 +108,8 @@
 	[ -f /etc/pam.d/cvs ] && cp /etc/pam.d/cvs $CHROOTDIR/etc/pam.d
 	[ -f /etc/pam.d/other ] && cp /etc/pam.d/other $CHROOTDIR/etc/pam.d
 	[ "`ls /etc/pam.d/common* 2>/dev/null`" ] && cp /etc/pam.d/common* $CHROOTDIR/etc/pam.d
-	cp /lib/libpam* $CHROOTDIR/lib
-	
-	cp /lib/libnss_files* $CHROOTDIR/lib
-	cp /lib/security/* $CHROOTDIR/lib/security
+
+	cp -r /lib/security/* $CHROOTDIR/lib/
 	cp /etc/security/*.conf $CHROOTDIR/etc/security
 
 #	# Libnss-ldap related stuffs




More information about the Fusionforge-commits mailing list