diff options
| author | Daniil Baturin <daniil@baturin.org> | 2019-07-23 07:25:31 -0400 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2019-07-23 07:25:31 -0400 |
| commit | 2e3ce45a0218a626434891ba3db16d977fbf8f0e (patch) | |
| tree | 24ecc077759c0dfc8bc557915cb5002d2fae0385 /scripts/vyatta-grub-setup | |
| parent | 0beae43d41a6bd8e1997c7a0013fb9263d7774f9 (diff) | |
| parent | 995b5071d15f0a5a9d8c5f261f188e5252a966a4 (diff) | |
| download | vyatta-cfg-system-2e3ce45a0218a626434891ba3db16d977fbf8f0e.tar.gz vyatta-cfg-system-2e3ce45a0218a626434891ba3db16d977fbf8f0e.zip | |
Merge branch 'current' into equuleus
Diffstat (limited to 'scripts/vyatta-grub-setup')
| -rwxr-xr-x | scripts/vyatta-grub-setup | 6 |
1 files changed, 5 insertions, 1 deletions
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" |