[or-cvs] r16452: {incognito} Perform USB configuration copying only if a persistent home (incognito/trunk/root_overlay/etc/init.d)

[anonym@xxxxxxxx]

Author: anonym
Date: 2008-08-06 18:58:15 -0400 (Wed, 06 Aug 2008)
New Revision: 16452

Modified:
   incognito/trunk/root_overlay/etc/init.d/external-config-setup
Log:
Perform USB configuration copying only if a persistent home volume is not used.


Modified: incognito/trunk/root_overlay/etc/init.d/external-config-setup
===================================================================
--- incognito/trunk/root_overlay/etc/init.d/external-config-setup	2008-08-06 22:56:20 UTC (rev 16451)
+++ incognito/trunk/root_overlay/etc/init.d/external-config-setup	2008-08-06 22:58:15 UTC (rev 16452)
@@ -50,20 +50,20 @@
 		ebegin "Copying user config from boot media to /home/__INCOGNITO_USER__"
 		mkdir -p /home/__INCOGNITO_USER__/.kde/share/config
 		if [[ -d ${MEDIAROOT}/keys/ssh ]]; then
+			einfo "Copying SSH keys"
 			cp -a ${MEDIAROOT}/keys/ssh /home/__INCOGNITO_USER__/.ssh
 			chown -R __INCOGNITO_USER__:users /home/__INCOGNITO_USER__/.ssh
 			chmod 700 /home/__INCOGNITO_USER__/.ssh
 		fi
+
+		if [[ -d ${MEDIAROOT}/keys/openvpn ]]; then
+			einfo "Copying OpenVPN keys"
+			cp -a ${MEDIAROOT}/keys/openvpn /etc
+		fi
+
 		eend 0
 	fi
 
-	# System wide config
-	ebegin "Copying system config from boot media"
-	if [[ -d ${MEDIAROOT}/keys/openvpn ]]; then
-		cp -a ${MEDIAROOT}/keys/openvpn /etc
-	fi
-	eend 0
-
 	# Ensure correct user dir permissions
 	if [[ ! -f /var/state/boot-media-home ]]; then
 		ebegin "Fixing permissions on /home"