[Fai-commit] r3218 - trunk/bin

fai-repository at svn.debian.org fai-repository at svn.debian.org
Mon Jan 9 16:06:01 UTC 2006


Author: lange
Date: 2006-01-09 16:06:00 +0000 (Mon, 09 Jan 2006)
New Revision: 3218

Modified:
   trunk/bin/make-fai-nfsroot
Log:
do not try to copy file if resolv.conf does not exist


Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2006-01-09 16:05:06 UTC (rev 3217)
+++ trunk/bin/make-fai-nfsroot	2006-01-09 16:06:00 UTC (rev 3218)
@@ -327,8 +327,10 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 upgrade_nfsroot() {
 
-    cp -p $v /etc/resolv.conf $NFSROOT/etc/resolv.conf-installserver
-    cp -p $v /etc/resolv.conf $NFSROOT/etc/resolv.conf # this is needed during make-fai-nfsroot
+    if [ -f /etc/resolv.conf ]; then
+	cp -p $v /etc/resolv.conf $NFSROOT/etc/resolv.conf-installserver
+	cp -p $v /etc/resolv.conf $NFSROOT/etc/resolv.conf # this is needed during make-fai-nfsroot
+    fi
     $ROOTCMD apt-get update
     $ROOTCMD apt-get -fyu install
     $ROOTCMD apt-get check




More information about the Fai-commit mailing list