[Fai-commit] r6486 - trunk/conf

[Thomas Lange]

Author: lange
Date: 2011-04-18 14:08:24 +0000 (Mon, 18 Apr 2011)
New Revision: 6486

Modified:
   trunk/conf/grub.cfg
Log:
grub2 (for fai-cd) now asks for user and password 


Modified: trunk/conf/grub.cfg
===================================================================
--- trunk/conf/grub.cfg	2011-04-18 13:36:45 UTC (rev 6485)
+++ trunk/conf/grub.cfg	2011-04-18 14:08:24 UTC (rev 6486)
@@ -2,6 +2,9 @@
 set default=4
 set timeout=20
 
+set superusers="grub"
+password grub installme
+
 if loadfont /boot/grub/ascii.pf2 ; then
    insmod png
    set gfxmode=640x480
@@ -46,19 +49,25 @@
     linux   /boot/vmlinuz boot=live
 }
 
-menuentry "Fully Automatic Installation - demohost (pw: installme)" {
+menuentry "Fully Automatic Installation - demohost (user: grub pw: installme)" --users "grub" {
     set gfxpayload=1024x768
     linux   /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install ip=192.168.1.1:::::eth0:off hostname=demohost
     initrd  /boot/initrd.img
 }
 
-menuentry "Fully Automatic Installation with GNOME (pw: installme)" {
+menuentry "Fully Automatic Installation with XFCE (user: grub pw: installme)" --users "grub" {
     set gfxpayload=1024x768
+    linux /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install ip=192.168.1.1:::::eth0:off hostname=xfcehost
+    initrd /boot/initrd.img
+}
+
+menuentry "Fully Automatic Installation with GNOME (user: grub pw: installme)" --users "grub" {
+    set gfxpayload=1024x768
     linux /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install ip=192.168.1.1:::::eth0:off hostname=gnomehost
     initrd /boot/initrd.img
 }
 
-menuentry "Fully Automatic Installation - faiserver (pw: installme)" {
+menuentry "Fully Automatic Installation - faiserver (user: grub pw: installme)" --users "grub" {
     set gfxpayload=1024x768
     linux /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install ip=192.168.1.250::192.168.1.254:255.255.255.0::xxx:off hostname=faiserver
     initrd /boot/initrd.img