[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. 0106a82e2d25b3610321c91f6de1366e4c590323

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit 0106a82e2d25b3610321c91f6de1366e4c590323
Author: Andreas B. Mundt <andi.mundt at web.de>
Date:   Thu Jan 12 23:22:14 2012 +0100

    Use disk* in disk_config instead of vda*/sda* and provide
    customized etc/fai/grub.cfg.  Thanks to Andreas Schockenhoff.

diff --git a/fai/config/disk_config/CLIENT_A b/fai/config/disk_config/CLIENT_A
index 5ba34fd..ecadf3e 100644
--- a/fai/config/disk_config/CLIENT_A
+++ b/fai/config/disk_config/CLIENT_A
@@ -1,19 +1,10 @@
-## use 'sda' for real hardware:
-#disk_config  sda  fstabkey:uuid
-
-## use 'vda' for virtual disks:
-disk_config  vda  fstabkey:uuid
+disk_config  disk1  fstabkey:uuid
 primary  /boot       64-256    ext3    rw
 primary  swap        64-2096   swap    sw
 logical  -           0-        -       -
 
 disk_config lvm
-## use 'sda5' for real hardware:
-#vg  vg_system  sda5
-
-## use 'vda5' for virtual disks:
-vg  vg_system  vda5
+vg  vg_system  disk1.5
 vg_system-root  /      500M-10G  ext3  errors=remount-ro
 vg_system-usr   /usr   3G-20G    ext3  defaults 
 vg_system-var   /var   1G-       ext3  defaults
-
diff --git a/fai/config/disk_config/SERVER_A b/fai/config/disk_config/SERVER_A
index 87afda1..9f899de 100644
--- a/fai/config/disk_config/SERVER_A
+++ b/fai/config/disk_config/SERVER_A
@@ -1,20 +1,11 @@
-## use 'sda' for real hardware:
-#disk_config  sda  fstabkey:uuid
-
-## use 'vda' for virtual disks:
-disk_config  vda  fstabkey:uuid
+disk_config  disk1  fstabkey:uuid
 primary  /boot       64-256    ext3    rw
 primary  swap        64-2096   swap    sw
 logical  -           0-        -       -
 
 disk_config lvm
-## use 'sda5' for real hardware:
-#vg  vg_system  sda5
-
-## use 'vda5' for virtual disks:
-vg  vg_system  vda5
+vg  vg_system  disk1.5
 vg_system-root  /      1G-2G     ext3  errors=remount-ro
-vg_system-usr   /usr   2G-20G    ext3  defaults 
+vg_system-usr   /usr   2G-20G    ext3  defaults
 vg_system-var   /var   1G-20G    ext3  defaults
 vg_system-home  /lan/mainserver/home0  2G-       ext3  defaults
-
diff --git a/fai/config/files/etc/fai/grub.cfg/SERVER_A b/fai/config/files/etc/fai/grub.cfg/SERVER_A
new file mode 100644
index 0000000..f0bf3bd
--- /dev/null
+++ b/fai/config/files/etc/fai/grub.cfg/SERVER_A
@@ -0,0 +1,89 @@
+## grub2 configuration
+set default=4
+set timeout=20
+
+if loadfont /boot/grub/ascii.pf2 ; then
+   insmod png
+   set gfxmode=640x480
+   insmod gfxterm
+   insmod vbe
+   terminal_output gfxterm
+fi
+
+if background_image /boot/grub/fai.png ; then
+  set color_normal=black/black
+  set color_highlight=red/black
+  set menu_color_normal=black/black
+  set menu_color_highlight=black/yellow
+else
+  set menu_color_normal=white/black
+  set menu_color_highlight=black/yellow
+fi
+
+# make sure we can access partitions
+insmod part_msdos
+insmod part_gpt
+
+if [ ${iso_path} ] ; then
+    set loopback="findiso=${iso_path}"
+fi
+
+
+menuentry "+------------------------------------------------------+" {
+    set gfxpayload=1024x768
+    linux   /boot/vmlinuz boot=live
+}
+menuentry "|    FAI-CD        (c) Thomas Lange, lange at debian.org  |" {
+    set gfxpayload=1024x768
+    linux   /boot/vmlinuz boot=live
+}
+menuentry "| _VERSIONSTRING_ |" {
+    set gfxpayload=1024x768
+    linux   /boot/vmlinuz boot=live
+}
+menuentry "+------------------------------------------------------+" {
+    set gfxpayload=1024x768
+    linux   /boot/vmlinuz boot=live
+}
+
+menuentry "Fully Automatic Installation - mainserver" {
+    set gfxpayload=1024x768
+    linux   /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install hostname=mainserver
+    initrd  /boot/initrd.img
+}
+
+menuentry "Fully Automatic Installation - workstation00" {
+    set gfxpayload=1024x768
+    linux   /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install hostname=workstation00
+    initrd  /boot/initrd.img
+}
+
+menuentry "Fully Automatic Installation - workstation01" {
+    set gfxpayload=1024x768
+    linux   /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install hostname=workstation01
+    initrd  /boot/initrd.img
+}
+
+menuentry "Fully Automatic Installation - workstation02" {
+    set gfxpayload=1024x768
+    linux   /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install hostname=workstation02
+    initrd  /boot/initrd.img
+}
+
+menuentry "Fully Automatic Installation - workstation03" {
+    set gfxpayload=1024x768
+    linux   /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install hostname=workstation03
+    initrd  /boot/initrd.img
+}
+
+menuentry "FAI rescue system, no installation" {
+    set gfxpayload=1024x768
+    linux /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=sysinfo ip=10.0.1.100:::::eth0:off hostname=demohost
+    initrd /boot/initrd.img
+}
+
+menuentry "Boot OS of first partition on first disk" {
+    set root=(hd0,1)
+    chainloader +1
+}
+

-- 
Debian-LAN development and packaging