[ installer ] T1446: on installing with efi skip the

UnicronNL · UnicronNL · commit 444975cec833 · 2019-06-18T13:55:44.000+02:00
xen extra checks, they use dmidecode which will not work in efi mode
Get the UUID of the correct partition based on the install type (bios/efi)
diff --git a/scripts/install/install-postinst-new b/scripts/install/install-postinst-new
@@ -263,8 +263,10 @@ fi
 # Install grub
 install_grub
 
-# Perform additional configuration if installing on Xen
-check_for_xen_extras
+if [ ! -d /sys/firmware/efi ]; then
+    # Perform additional configuration if installing on Xen
+    check_for_xen_extras
+fi
 
 #
 # Only start the mdadm daemon if we have the root filesystem running
diff --git a/scripts/vyatta-grub-setup b/scripts/vyatta-grub-setup
@@ -163,7 +163,11 @@ fi
     fi
 
     if [ ${ROOT_PARTITION:0:2} = "md" ]; then
-	uuid_root_disk=`/sbin/tune2fs -l /dev/${root_disk}1 | grep UUID | awk '{print $3}'`
+        if [ -d /sys/firmware/efi ]; then
+	    uuid_root_disk=`/sbin/tune2fs -l /dev/${root_disk}3 | grep UUID | awk '{print $3}'`
+        else
+	    uuid_root_disk=`/sbin/tune2fs -l /dev/${root_disk}1 | grep UUID | awk '{print $3}'`
+        fi
 	uuid_root_md=`/sbin/tune2fs -l /dev/md${ROOT_PARTITION#md} | grep UUID | awk '{print $3}'`
 	echo ""
 	echo -e "insmod part_msdos"
