[Fai-commit] r6760 - in trunk: bin examples/simple/files/etc/kernel-img.conf

[Thomas Lange]

Author: lange
Date: 2011-10-23 10:17:25 +0000 (Sun, 23 Oct 2011)
New Revision: 6760

Removed:
   trunk/examples/simple/files/etc/kernel-img.conf/DEBIAN
Modified:
   trunk/bin/make-fai-nfsroot
Log:
kernel-img.conf is not needed any more

All do_ option are not available in squeeze any more. m-f-n and client
installation works perfectly without a kernel-img.conf


Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2011-10-23 09:59:37 UTC (rev 6759)
+++ trunk/bin/make-fai-nfsroot	2011-10-23 10:17:25 UTC (rev 6760)
@@ -430,12 +430,6 @@
     export FAI_ROOT=$NFSROOT
     export classes="NFSROOT $iarch"
 
-    # is this still needed? All these variables are not documented in kernel-img.conf(5) in squeeze
-    cat > $NFSROOT/etc/kernel-img.conf << EOF
-do_bootloader = No
-do_initrd = No
-warn_initrd = No
-EOF
     install_packages -l -p$cfdir > $NFSROOT/var/tmp/packages.nfsroot
     echo "Adding additional packages to $NFSROOT:"
     cat $NFSROOT/var/tmp/packages.nfsroot

Deleted: trunk/examples/simple/files/etc/kernel-img.conf/DEBIAN
===================================================================
--- trunk/examples/simple/files/etc/kernel-img.conf/DEBIAN	2011-10-23 09:59:37 UTC (rev 6759)
+++ trunk/examples/simple/files/etc/kernel-img.conf/DEBIAN	2011-10-23 10:17:25 UTC (rev 6760)
@@ -1,5 +0,0 @@
-do_symlinks = Yes
-do_initrd = Yes
-silent_modules=yes
-clobber_modules=yes
-do_boot_enable=no