[Fai-commit] r6290 - trunk/examples/simple/scripts/DEBIAN

[Michael Goetze]

Author: mgoetze-guest
Date: 2011-02-12 09:32:57 +0000 (Sat, 12 Feb 2011)
New Revision: 6290

Modified:
   trunk/examples/simple/scripts/DEBIAN/30-interface
   trunk/examples/simple/scripts/DEBIAN/40-misc
Log:
Copy fai.conf and a small fix, so that fai softupdate
runs without error on a fresh installation with simple-examples

Modified: trunk/examples/simple/scripts/DEBIAN/30-interface
===================================================================
--- trunk/examples/simple/scripts/DEBIAN/30-interface	2011-02-11 13:34:16 UTC (rev 6289)
+++ trunk/examples/simple/scripts/DEBIAN/30-interface	2011-02-12 09:32:57 UTC (rev 6290)
@@ -10,7 +10,8 @@
 	iface lo inet loopback
 	iface eth0 inet dhcp
 EOF
-else
+elif [ $FAI_ACTION != "softupdate" ]
+then
       [ -n "$IPADDR" ] && cat > $target/etc/network/interfaces <<-EOF
 	# generated by FAI
 	auto lo eth0

Modified: trunk/examples/simple/scripts/DEBIAN/40-misc
===================================================================
--- trunk/examples/simple/scripts/DEBIAN/40-misc	2011-02-11 13:34:16 UTC (rev 6289)
+++ trunk/examples/simple/scripts/DEBIAN/40-misc	2011-02-12 09:32:57 UTC (rev 6290)
@@ -6,4 +6,7 @@
 sed -i -e "s/^UTC.*/UTC=${UTC}/" $target/etc/default/rcS
 sed -i -e 's#/sbin/getty 38400#/sbin/getty -f /etc/issue.linuxlogo 38400#' ${target}/etc/inittab
 
+[ $FAI_ACTION = "softupdate" ] || cp /etc/fai/fai.conf $target/etc/fai/fai.conf
+fcopy -iv /etc/fai/fai.conf
+
 exit $error