diff options
| author | Daniil Baturin <daniil@baturin.org> | 2019-06-30 20:25:03 +0200 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2019-06-30 20:25:03 +0200 |
| commit | cb83db1758822dbd16fa712aa6aab7005d51b154 (patch) | |
| tree | 565026f8c2ed14f26f9a4bfda59f2aba1b462faf /scripts/vyatta-grub-setup | |
| parent | 842f2974d483bb37fc32b5766cb4edb5f21ec2fe (diff) | |
| parent | 444975cec833fd6788c89e4ce47475cce948cf87 (diff) | |
| download | vyatta-cfg-system-cb83db1758822dbd16fa712aa6aab7005d51b154.tar.gz vyatta-cfg-system-cb83db1758822dbd16fa712aa6aab7005d51b154.zip | |
Merge branch 'current' of https://github.com/vyos/vyatta-cfg-system into current
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" |