[Fai-commit] r5538 - in trunk/examples/simple/scripts: FAIBASE GRUB

[Michael Tautschnig]

Author: mt
Date: 2009-10-16 12:05:37 +0000 (Fri, 16 Oct 2009)
New Revision: 5538

Modified:
   trunk/examples/simple/scripts/FAIBASE/30-interface
   trunk/examples/simple/scripts/GRUB/10-setup
Log:
Completing the simple-example-is-softupdate-compatible-patch, part 1


Modified: trunk/examples/simple/scripts/FAIBASE/30-interface
===================================================================
--- trunk/examples/simple/scripts/FAIBASE/30-interface	2009-10-16 11:36:26 UTC (rev 5537)
+++ trunk/examples/simple/scripts/FAIBASE/30-interface	2009-10-16 12:05:37 UTC (rev 5538)
@@ -2,7 +2,7 @@
 
 error=0 ; trap "error=$((error|1))" ERR
 
-if ifclass DHCPC
+if ifclass DHCPC && [ $FAI_ACTION != "softupdate" ]
 then
     cat > $target/etc/network/interfaces <<-EOF
 	# generated by FAI
@@ -23,11 +23,11 @@
 EOF
     [ -n "$NETWORK" ] && echo "localnet $NETWORK" > $target/etc/networks
     [ -s /etc/resolv.conf ] && cp -p /etc/resolv.conf $target/etc
-    fcopy -i /etc/resolv.conf
 fi
 
 # here fcopy is mostly used, when installing a client for running in a
 # different subnet than during the installation  
+fcopy -i /etc/resolv.conf
 fcopy -iM /etc/network/interfaces /etc/networks
 
 exit $error

Modified: trunk/examples/simple/scripts/GRUB/10-setup
===================================================================
--- trunk/examples/simple/scripts/GRUB/10-setup	2009-10-16 11:36:26 UTC (rev 5537)
+++ trunk/examples/simple/scripts/GRUB/10-setup	2009-10-16 12:05:37 UTC (rev 5538)
@@ -2,7 +2,7 @@
 
 error=0 ; trap "error=$((error|1))" ERR
 
-fcopy -Uv /boot/grub/menu.lst
+fcopy -v /boot/grub/menu.lst
 
 exit $error