diff options
| -rwxr-xr-x | scripts/install/install-postinst-new | 6 | ||||
| -rwxr-xr-x | scripts/vyatta-grub-setup | 6 |
2 files changed, 9 insertions, 3 deletions
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" |