Some cleanup. Preparing also bootcore for new layout

1 files changed, 6 insertions, 117 deletions

diff --git a/cdroot/boot/grub/grub.cfg b/cdroot/boot/grub/grub.cfg
index 1a357a8..fe7b132 100755
--- a/cdroot/boot/grub/grub.cfg
+++ b/cdroot/boot/grub/grub.cfg
@@ -90,44 +90,12 @@ menuentry "Start $iso_distro $iso_flavour $iso_version" {
    echo "Language: ${bootlang}"
    echo "Keyboard: ${bootkeymap}"
    echo "Please wait..."
-   linux /boot/vmlinuz aufs cdroot ${init_opt} ${vesa_opt} splash quiet  vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
+   linux /boot/vmlinuz rd.live.image root=CDLABEL=ISOIMAGE rootfstype=auto console=tty0 splash quiet vconsole.keymap=${bootkeymap} locale=${bootlang} ${vesa_opt} ${modeset_opt} ${acpi_opt} -- 
    initrd /boot/initrd
 }
 
 submenu "Advanced Options" {
 
-   menuentry "Console mode" {
-      set gfxpayload=keep
-      echo "Language: ${bootlang}"
-      echo "Keyboard: ${bootkeymap}"
-      echo "Please wait..."
-      linux /boot/vmlinuz aufs cdroot ${init_opt}  quiet  vconsole.keymap=${bootkeymap} gentoo=nox locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
-      initrd /boot/initrd
-   }
-
-   menuentry "Check disc for defects" {
-      set gfxpayload=keep
-      echo "Language: ${bootlang}"
-      echo "Keyboard: ${bootkeymap}"
-      echo "Please wait..."
-      linux /boot/vmlinuz aufs cdroot ${init_opt} ${vesa_opt} splash quiet  vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
-      initrd /boot/initrd
-   }
-
-   menuentry "VESA driver, needed by some Nvidia graphic cards with Optimus" {
-       echo "Switching to vesa driver ..."
-       set vesa_opt="xdriver=nvidia"
-       export vesa_opt
-       configfile /boot/grub/grub.cfg
-   }
-
-   menuentry "Disable systemd" {
-      echo "Disabling Systemd..."
-      set init_opt="real_init=/sbin/init.d/sysvinit/init"
-      export init_opt
-      configfile /boot/grub/grub.cfg
-   }
-
    menuentry "Disable Kernel Mode Settings (for AMD Radeon GPUs with fglrx)" {
       echo "Disabling Kernel Mode Setting..."
       set modeset_opt="nomodeset"
@@ -149,13 +117,11 @@ submenu "Advanced Options" {
       configfile /boot/grub/grub.cfg
    }
 
-   menuentry "Debug mode" {
-      set gfxpayload=keep
-      echo "Language: ${bootlang}"
-      echo "Keyboard: ${bootkeymap}"
-      echo "Please wait..."
-      linux /boot/vmlinuz aufs cdroot ${init_opt} debug vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} --
-      initrd /boot/initrd
+   menuentry "VESA driver, needed by some Nvidia graphic cards with Optimus" {
+       echo "Switching to vesa driver ..."
+       set vesa_opt="xdriver=nvidia"
+       export vesa_opt
+       configfile /boot/grub/grub.cfg
    }
 
 }
@@ -184,13 +150,6 @@ submenu "Language Selection" {
 
 submenu "Keyboard Selection" {
 
-   menuentry "Belgium" {
-      echo "Switching to: $chosen"
-      set bootkeymap=be
-      export bootkeymap
-      configfile /boot/grub/grub.cfg
-   }
-
    menuentry "Dvorak" {
       echo "Switching to: $chosen"
       set bootkeymap=us_dvorak
@@ -226,13 +185,6 @@ submenu "Keyboard Selection" {
       configfile /boot/grub/grub.cfg
    }
 
-   menuentry "India" {
-      echo "Switching to: $chosen"
-      set bootkeymap=in
-      export bootkeymap
-      configfile /boot/grub/grub.cfg
-   }
-
    menuentry "Italy" {
       echo "Switching to: $chosen"
       set bootkeymap=it
@@ -240,41 +192,6 @@ submenu "Keyboard Selection" {
       configfile /boot/grub/grub.cfg
    }
 
-   menuentry "Latin Amer." {
-      echo "Switching to: $chosen"
-      set bootkeymap=latam
-      export bootkeymap
-      configfile /boot/grub/grub.cfg
-   }
-
-   menuentry "Malta" {
-      echo "Switching to: $chosen"
-      set bootkeymap=mt
-      export bootkeymap
-      configfile /boot/grub/grub.cfg
-   }
-
-   menuentry "Norway" {
-      echo "Switching to: $chosen"
-      set bootkeymap=no
-      export bootkeymap
-      configfile /boot/grub/grub.cfg
-   }
-
-   menuentry "Poland" {
-      echo "Switching to: $chosen"
-      set bootkeymap=pl
-      export bootkeymap
-      configfile /boot/grub/grub.cfg
-   }
-
-   menuentry "Portugal" {
-      echo "Switching to: $chosen"
-      set bootkeymap=pt
-      export bootkeymap
-      configfile /boot/grub/grub.cfg
-   }
-
    menuentry "Romania" {
       echo "Switching to: $chosen"
       set bootkeymap=ro
@@ -296,27 +213,6 @@ submenu "Keyboard Selection" {
       configfile /boot/grub/grub.cfg
    }
 
-   menuentry "Sweden" {
-      echo "Switching to: $chosen"
-      set bootkeymap=se
-      export bootkeymap
-      configfile /boot/grub/grub.cfg
-   }
-
-   menuentry "Swiss French" {
-      echo "Switching to: $chosen"
-      set bootkeymap=ch_fr
-      export bootkeymap
-      configfile /boot/grub/grub.cfg
-   }
-
-   menuentry "Swiss German" {
-      echo "Switching to: $chosen"
-      set bootkeymap=ch
-      export bootkeymap
-      configfile /boot/grub/grub.cfg
-   }
-
    menuentry "Turkey (Q)" {
       echo "Switching to: $chosen"
       set bootkeymap=tr
@@ -352,12 +248,5 @@ submenu "Keyboard Selection" {
       configfile /boot/grub/grub.cfg
    }
 
-   menuentry "Ukraine" {
-      echo "Switching to: $chosen"
-      set bootkeymap=ua
-      export bootkeymap
-      configfile /boot/grub/grub.cfg
-   }
-
 }