From 444975cec833fd6788c89e4ce47475cce948cf87 Mon Sep 17 00:00:00 2001
From: Kim Hagen <kim.sidney@gmail.com>
Date: Tue, 18 Jun 2019 13:55:44 +0200
Subject: [ installer ] T1446: on installing with efi skip the 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)

---
 scripts/install/install-postinst-new | 6 ++++--
 scripts/vyatta-grub-setup            | 6 +++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'scripts')

diff --git a/scripts/install/install-postinst-new b/scripts/install/install-postinst-new
index ae723627..85eba45f 100755
--- 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
index 236b41ea..de67ba60 100755
--- 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"
-- 
cgit v1.2.3