diff options
| author | Andreas Loibl <andreas@andreas-loibl.de> | 2012-05-20 16:13:54 +0200 |
|---|---|---|
| committer | Andreas Loibl <andreas@andreas-loibl.de> | 2012-05-20 16:13:54 +0200 |
| commit | e59f935de8d8358a351d571c2a7831b37cabdef4 (patch) | |
| tree | a8e604a41e2924299edd847ab207221cde08787f /config/binary_grub | |
| parent | 1baa786363756a8c9f1e21631950bbbec9425e45 (diff) | |
| download | kanotix-e59f935de8d8358a351d571c2a7831b37cabdef4.zip kanotix-e59f935de8d8358a351d571c2a7831b37cabdef4.tar.gz | |
updated grub.cfg for combined ISOs
Diffstat (limited to 'config/binary_grub')
| -rw-r--r-- | config/binary_grub/grub.cfg | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/config/binary_grub/grub.cfg b/config/binary_grub/grub.cfg index 52ae410..0a5d6df 100644 --- a/config/binary_grub/grub.cfg +++ b/config/binary_grub/grub.cfg @@ -42,17 +42,11 @@ if test -e ($root,msdos3) ; then echo 'Loading initial ramdisk ...' initrd /live/initrd.img } - else - menuentry 'Start Kanotix (persistent)' --class kanotix64 --class gnu-linux --class gnu --class os { - echo 'Loading Linux ...' - linux /live/vmlinuz ${boot_en} quiet splash persistent - echo 'Loading initial ramdisk ...' - initrd /live/initrd.img - } fi fi fi +##### menuentry 'Start Kanotix DE' --class kanotix64 --class gnu-linux --class gnu --class os { echo 'Loading Linux ...' linux /live/vmlinuz ${boot_de} quiet splash @@ -100,14 +94,23 @@ menuentry 'Start Kanotix EN (failsafe)' --class kanotix64 --class gnu-linux --cl initrd /live/initrd.img } +##### + if [ $efi != 1 ] ; then menuentry 'Memtest86+' --class memtest { linux16 /live/memtest } else - menuentry 'EFI Shell' { - chainloader /efi/boot/shellx64.efi - } + if test -f /efi/boot/shellx64.efi ; then + menuentry 'EFI Shell x64' { + chainloader /efi/boot/shellx64.efi + } + fi + if test -f /efi/boot/shellx86.efi ; then + menuentry 'EFI Shell x86' { + chainloader /efi/boot/shellx86.efi + } + fi if search -nf /EFI/Microsoft/Boot/BOOTMGR.EFI ; then menuentry 'Microsoft Bootmgr' { search -sf /EFI/Microsoft/Boot/BOOTMGR.EFI |