[Kiwi-ltsp-devel] SF.net SVN: kiwi-ltsp:[863] trunk/kiwi-ltsp/ltsp/include/ kiwi-ltsp-functions.sh

[<cyb...@us...>]

Revision: 863
          http://sourceforge.net/p/kiwi-ltsp/code/863
Author:   cyberorg
Date:     2015-09-29 11:34:38 +0000 (Tue, 29 Sep 2015)
Log Message:
-----------
copy resolv.conf from host in chroot

Modified Paths:
--------------
    trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh

Modified: trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh
===================================================================
--- trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh	2015-09-29 10:31:42 UTC (rev 862)
+++ trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh	2015-09-29 11:34:38 UTC (rev 863)
@@ -1455,7 +1455,11 @@
 	local prfName=$1
 	load_kiwi_profile $prfName
 	pushd $LTSNFSPATH 1>/dev/null
-	cp -a $LTSNFSPATH-unneeded/* $LTSNFSPATH/
+	if [[ -f etc/resolv.conf ]]; then
+		mv etc/resolv.conf etc/resolv.conf.chrootbackup
+	fi
+	cp /etc/resolv.conf etc/
+	#cp -a $LTSNFSPATH-unneeded/* $LTSNFSPATH/
 	
 	#======================================
 	# Prepare for chroot
@@ -1472,7 +1476,9 @@
 	$CHROOTCMD .
 	log "Exiting from chroot of $prfName"
 	umount *   2>/dev/null
-	
+	if [[ -f etc/resolv.conf.chrootbackup ]]; then
+		mv etc/resolv.conf.chrootbackup etc/resolv.conf
+	fi	
 	popd  1>/dev/null
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.