Adapted grub/grub.cfg for WS14

This changeset includes lipck support (e.g. the generic filenames
used by lipck).

grub/grub.cfg

@@ -12,11 +12,13 @@ set menu_color_highlight=black/light-gray
 
 function set64 {
   set bits="64"
+  set arch="x86_64"
   set altbits="32"
 }
 
 function set32 {
  set bits="32"
+ set arch="i686"
  set altbits="64"
 }
 
@@ -52,19 +54,19 @@ set gfxpayload=keep
 # Start a Debian style Casper Kernel
 function LoadCasper {
 	echo	"Loading kernel${bits} (takes up to 2 minutes)"
-	linux	/casper/vmlinuz${bits} boot=casper file=/cdrom/preseed/kubuntu.seed ${localeinfo} unionstack=lipcommon.squashfs:lip${bits}.squashfs nosplash verbose --
+	linux	/casper/vmlinuz${bits} boot=casper file=/cdrom/preseed/kubuntu.seed ${cmdline} unionstack=lip-common.squashfs:lip-${arch}.squashfs nosplash verbose --
 	echo 	"Loading initrd${bits} (takes up to 5 minutes)"
 	initrd	/casper/initrd${bits}.lz
 	echo 	"Starting kernel"
 }
 
-menuentry "Empfohlen: Ubuntu 13.10 ${bits}bit (deutsch)" {
-	set localeinfo="debian-installer/locale=de_DE console-setup/layoutcode=de"
+menuentry "Empfohlen: Kubuntu 14.04.1 ${bits}bit (deutsch)" {
+	set cmdline="debian-installer/locale=de_DE console-setup/layoutcode=de"
 	LoadCasper
 }
 
-menuentry "Empfohlen: Ubuntu 13.10 ${bits}bit (english)" {
-	set localeinfo=""
+menuentry "Empfohlen: Kubuntu 14.04.1 ${bits}bit (english)" {
+	set cmdline=""
 	LoadCasper
 }
 
@@ -88,15 +90,15 @@ menuentry "Toggle 32/64 bits" {
 }
 
 menuentry "Tool: Check ${bits}bit install medium for defects" {
-	set localeinfo="integrity-check"
+	set cmdline="integrity-check"
 	LoadCasper
 }
 
 menuentry "Tool: 32bit GParted Live CD (laeuft im RAM -> mindestens 224MB)" {
   # Hint: remove "toram=..." to make it work with 128mb ram
-  loopback loop ($root)/gparted-live-0.18.0-1-i486.iso
+  loopback loop ($root)/gparted-live-i486.iso
   echo 	   "Loading 32 bit GParted kernel (takes up to 2 minutes)"
-  linux    (loop)/live/vmlinuz boot=live config noswap noprompt nosplash findiso=/gparted-live-0.18.0-1-i486.iso toram=filesystem.squashfs
+  linux    (loop)/live/vmlinuz boot=live config noswap noprompt nosplash findiso=/gparted-live-i486.iso toram=filesystem.squashfs
   echo 	   "Loading initrd from iso (takes up to 5 minutes)"  
   initrd   (loop)/live/initrd.img
   echo 	   "Starting 32 bit GParted kernel"
@@ -104,26 +106,26 @@ menuentry "Tool: 32bit GParted Live CD (laeuft im RAM -> mindestens 224MB)" {
 
 menuentry "Tool: 64bit GParted Live CD (laeuft im RAM -> mindestens 224MB)" {
   # Hint: remove "toram=..." to make it work with 128mb ram
-  loopback loop ($root)/gparted-live-0.18.0-1-amd64.iso
+  loopback loop ($root)/gparted-live-amd64.iso
   echo 	   "Loading 64 bit GParted kernel (takes up to 2 minutes)"
-  linux    (loop)/live/vmlinuz boot=live config noswap noprompt nosplash findiso=gparted-live-0.18.0-1-amd64.iso toram=filesystem.squashfs
+  linux    (loop)/live/vmlinuz boot=live config noswap noprompt nosplash findiso=gparted-live-amd64.iso toram=filesystem.squashfs
   echo 	   "Loading initrd from iso (takes up to 5 minutes)"  
   initrd   (loop)/live/initrd.img
   echo 	   "Starting 64 bit GParted kernel"
 }
 
-menuentry "Ubuntu 13.10 ${bits}bit (deutsch, failsafe)" {
-	set localeinfo="debian-installer/locale=de_DE console-setup/layoutcode=de nomodeset noplymouth nosplash verbose text noacpi"
+menuentry "Kubuntu 14.04.1 ${bits}bit (deutsch, failsafe)" {
+	set cmdline="debian-installer/locale=de_DE console-setup/layoutcode=de nomodeset noplymouth nosplash verbose text noacpi"
 	LoadCasper
 }
 
-menuentry "Ubuntu 13.10 ${bits}bit (english, failsafe)" {
-	set localeinfo="nomodeset noplymouth nosplash verbose text noacpi"
+menuentry "Kubuntu 14.04.1 ${bits}bit (english, failsafe)" {
+	set cmdline="nomodeset noplymouth nosplash verbose text noacpi"
 	LoadCasper
 }
 
 menuentry "Tool: Memtest86+" {
-  loopback loop ($root)/gparted-live-0.18.0-1-i486.iso
+  loopback loop ($root)/gparted-live-i486.iso
   echo     "Loading memtest"
   linux16  (loop)/live/memtest
   echo 	   "Starting Memtest86Plus"