[Fai-commit] r5403 - in trunk: bin conf

[Thomas Lange]

Author: lange
Date: 2009-05-03 20:12:32 +0000 (Sun, 03 May 2009)
New Revision: 5403

Modified:
   trunk/bin/fai-cd
   trunk/conf/menu.lst.boot-only
Log:
add nfsroot path into menu.lst


Modified: trunk/bin/fai-cd
===================================================================
--- trunk/bin/fai-cd	2009-05-03 19:30:35 UTC (rev 5402)
+++ trunk/bin/fai-cd	2009-05-03 20:12:32 UTC (rev 5403)
@@ -77,6 +77,7 @@
     if [ $bootonly -eq 1 ]; then
 	echo "Using kernel version $kernelversion"
 	perl -pi -e "s/_VERSIONSTRING_/Kernel : $kernelversion/" $tmp/boot/grub/menu.lst
+	perl -pi -e "s#_NFSROOT_#nfsroot=$servernfsroot#"        $tmp/boot/grub/menu.lst
     else
 	perl -pi -e "s/_VERSIONSTRING_/   $isoversion     /" $tmp/boot/grub/menu.lst
     fi
@@ -286,6 +287,7 @@
 [ "$verbose" ] && echo "Using configuration files from $cfdir"
 . $cfdir/fai.conf
 export NFSROOT=$(source $cfdir/make-fai-nfsroot.conf; echo $NFSROOT)
+servernfsroot=$NFSROOT
 NFSROOT="$NFSROOT/live/filesystem.dir"
 
 [ -d "$NFSROOT/etc/fai" ] || die 10 "Please create NFSROOT by calling make-fai-nfsroot or fai-setup."

Modified: trunk/conf/menu.lst.boot-only
===================================================================
--- trunk/conf/menu.lst.boot-only	2009-05-03 19:30:35 UTC (rev 5402)
+++ trunk/conf/menu.lst.boot-only	2009-05-03 20:12:32 UTC (rev 5403)
@@ -25,9 +25,9 @@
 chainloader +1
 
 title Fully Automatic Installation
-kernel /boot/vmlinuz ip=dhcp root=/dev/nfs boot=live FAI_FLAGS="verbose,sshd,createvt" FAI_ACTION=install
+kernel /boot/vmlinuz ip=dhcp root=/dev/nfs _NFSROOT_ boot=live FAI_FLAGS="verbose,sshd,createvt" FAI_ACTION=install
 initrd /boot/initrd.img
 
 title FAI rescue system, no installation
-kernel /boot/vmlinuz ip=dhcp root=/dev/nfs boot=live FAI_FLAGS="verbose,sshd,createvt" FAI_ACTION=sysinfo
+kernel /boot/vmlinuz ip=dhcp root=/dev/nfs _NFSROOT_ boot=live FAI_FLAGS="verbose,sshd,createvt" FAI_ACTION=sysinfo
 initrd /boot/initrd.img