Boot entry creationfor boot from disk directly (#109)

Author: shankarsrinivas1

standalone-node/installation_scripts/standalone-vm-setup.sh

@@ -103,7 +103,8 @@ echo ""
 echo "Please see the installation status on VNC viewer.Enter $host_ip:1 on vnc viewer"
 sudo -E qemu-system-x86_64  \
   -m 4G   -enable-kvm  \
-  -cpu host \
+  -cpu host,+vmx \         # nested VM support
+  -machine q35,accel=kvm \
   -bios /usr/share/qemu/OVMF.fd  \
   -vnc :1 \
   -drive file=emt-disk.img,format=qcow2 \

standalone-node/provisioning_scripts/install-os.sh

@@ -437,50 +437,67 @@ EOT
 boot_order_chage_to_disk() {
     echo -e "${BLUE}Changing the Boot order to disk!!${NC}" 
 
+    boot_entry="Emt"
+    efiboot_part=1
+    EFI=""
+
+    # Delete the pile up Ubuntu/Emt partitions from BIOS bootMenu
+    for bootnumber in $(efibootmgr | grep -iE "emt|Ubuntu" | awk '{print $1}' | sed 's/Boot//;s/\*//'); do
+        efibootmgr -b "$bootnumber" -B
+    done
+    # Delete the duplicate boot entries from bootmenu
     boot_order=$(efibootmgr -D)
     echo "$boot_order"
-    usb_boot_number=$(efibootmgr | grep -i "Bootcurrent" | awk '{print $2}')
 
-    boot_order=$(efibootmgr | grep -i "Bootorder" | awk '{print $2}')
+    # Get the rootfs 
+    rootfs=$(blkid | grep -Ei 'TYPE="ext4"' | grep -Ei 'LABEL="rootfs"' | awk -F: '{print $1}')
 
-    # Convert boot_order to an array and remove , between the entries
-    IFS=',' read -ra boot_order_array <<<"$boot_order"
+    efiboot=$(blkid | grep -Ei 'TYPE="vfat"' | grep -Ei 'LABEL="esp|uefi"' |  awk -F: '{print $1}')
 
-    # Remove PXE boot entry from Array
-    final_boot_array=()
-    for element in "${boot_order_array[@]}"; do
-        if [[ "$element" != "$usb_boot_number" ]]; then
-            final_boot_array+=("$element")
-        fi
-    done
+    if echo "$efiboot" | grep -q "nvme"; then
+        osdisk=$(echo "$rootfs" | grep -oE 'nvme[0-9]+n[0-9]+' | head -n 1)
+    elif echo "$efiboot" | grep -q "sd"; then
+        osdisk=$(echo "$rootfs" | grep -oE 'sd[a-z]+' | head -n 1)
+    fi
 
-    # Add the PXE  boot entry to the end of the boot order array
-    final_boot_array+=("$usb_boot_number")
+    check_mnt_mount_exist
+    mount "${rootfs}" /mnt
+    mount $efiboot /mnt/boot/efi
 
-    # Join the elements of boot_order_array into a comma-separated string
-    final_boot_order=$(
-        IFS=,
-        echo "${final_boot_array[*]}"
-    )
+    # Get the EFI boot from chroot
+    EFI=$(chroot /mnt sh -c 'basename $(find /boot/efi/EFI/Linux -type f -iname "*.efi" | head -n1)') || { echo "EFI binary not present,please check"; return 1; } 
 
-    #remove trail and leading , if preset
-    final_boot_order=$(echo "$final_boot_order" | sed -e 's/^,//;s/,$//')
+    # Unmount the file systems
+    umount /mnt/boot/efi
+    umount /mnt
 
-    echo "final_boot order--->" "$final_boot_order"
+    # Create the boot entry
+    new_boot_number=$(efibootmgr -c -d "/dev/${osdisk}" -p $efiboot_part -L "$boot_entry" -l "\\EFI\\Linux\\$EFI") || { echo "Failed to create new boot entry"; return 1; } 
 
-    # Update the boot order using efibootmgr
+    echo "Successfully created the boot entry $efiboot_part"
 
-    if efibootmgr -o "$final_boot_order"; then
-        success "Made Disk as first boot and USB boot at end"
-        #Make UEFI boot as inactive
-        efibootmgr -b "$usb_boot_number" -A
-        boot_order=$(efibootmgr)
-        echo "$boot_order"
+    new_boot_number=$(efibootmgr | grep -i Emt | grep -oP 'Boot\d{4}' | head -n1 | sed 's/Boot//')
+
+    echo "New boot number is $new_boot_number"
+
+    # Update the bootorder
+    usb_boot_number=$(efibootmgr | grep -i "Bootcurrent" | awk '{print $2}')
+
+    boot_order_cur=$(efibootmgr | grep -i "Bootorder" | awk '{print $2}')
+
+    if [ -n "$boot_order_cur" ]; then
+        final_boot_order="$new_boot_number,$boot_order_cur" || { echo "Final boot order change failed"; return 1; } 
     else
-        failure "Boot order change not successful,Please Manually Select the Disk boot option"
-        return 1 
+        final_boot_order="$new_boot_number" || { echo "Final boot order change failed"; return 1; } 
     fi
-    efibootmgr
+
+    # Update the boot order using efibootmgr
+    efibootmgr -o "$final_boot_order" || { echo "Updating the Boot order with new boot entry failed"; return 1; } 
+
+    #Make UEFI boot as inactive
+    efibootmgr -b "$usb_boot_number" -A
+
+    echo "Made Disk as first boot option"
     return 0
 }
 
@@ -769,13 +786,13 @@ platform_config_manager() {
     update_ssh_settings || return 1
 
     update_mac_under_dhcp_systemd || return 1
+
+    boot_order_chage_to_disk || return 1
 }
 
 # Post installation tasks
 system_finalizer() {
 
-    boot_order_chage_to_disk || return 1
-
     dump_logs_to_usb || return 1
 }