Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86

[android-x86/bootable-newinstaller.git] / install / grub2 / efi / boot / android.cfg

diff --git a/install/grub2/efi/boot/android.cfg b/install/grub2/efi/boot/android.cfg
index a7c1191..5f04bfb 100644 (file)
--- a/install/grub2/efi/boot/android.cfg
+++ b/install/grub2/efi/boot/android.cfg
@@ -1,15 +1,30 @@
-# $1 Title
-# $2... Kernel cmdline
-function add_entry {
-       menuentry "OS_TITLE VER $1" "$@" --class android-x86 {
-               shift 2
+# $1 Kernel dir
+# $2 Title
+# $3... Kernel cmdline
+function add_boot_entry {
+       menuentry "$2" "$@" --class android-x86 {
                savedefault
                set root=$android
-               linux $kdir/kernel CMDLINE $src $@
-               initrd $kdir/initrd.img
+               if [ -e $2/kernel ]; then
+                       true
+               else
+                       search --no-floppy --set root -f $2/kernel
+               fi
+               set kd=$2
+               shift 3
+               linux $kd/kernel CMDLINE $src $@
+               initrd $kd/initrd.img
        }
 }
 
+# $1 Title
+# $2... Kernel cmdline
+function add_entry {
+       set title="OS_TITLE VER $1"
+       shift 1
+       add_boot_entry "$kdir" "$title" "$@"
+}
+
 # $1 EFI to chainload
 # $2 OS name
 # $3 Class
@@ -102,7 +117,7 @@ add_os_if_exists /EFI/linuxmint/${grub}.efi "Linux Mint" linuxmint
 add_os_if_exists /EFI/boto/bootx64.efi OPENTHOS openthos
 add_os_if_exists /EFI/Microsoft/Boot/bootmgfw.efi Windows windows
 
-for d in $config_directory $cmdpath $prefix; do
+for d in $cmdpath $prefix; do
        if [ -f $d/custom.cfg ]; then
                source $d/custom.cfg
        fi