ExternalVendorCode/heads
1
0
Fork 0
mirror of https://github.com/linuxboot/heads.git synced 2024-12-18 20:47:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

functions: check both grub/grub2 dirs for boot files

Browse Source 
Signed-off-by: Matt DeVillier <matt.devillier@puri.sm>
This commit is contained in:
Matt DeVillier 2019-11-13 17:36:29 -06:00
parent 4d32b4adf8
commit 7998e96b98
No known key found for this signature in database
GPG Key ID: 2BBB776A35B978FD
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
initrd/etc/functions
View File

@ -305,10 +305,11 @@ detect_boot_device()
# check $CONFIG_BOOT_DEV if set/valid
if [ -e "$CONFIG_BOOT_DEV" ]; then
mount -o ro $CONFIG_BOOT_DEV /boot >/dev/null 2>&1
if [[ $? && -d /boot/grub ]]; then
# CONFIG_BOOT_DEV is valid device and contains an installed OS
return 0
if mount -o ro $CONFIG_BOOT_DEV /boot >/dev/null 2>&1; then
if ls -d /boot/grub* >/dev/null 2>&1; then
# CONFIG_BOOT_DEV is valid device and contains an installed OS
return 0
fi
fi
fi
@ -330,10 +331,11 @@ detect_boot_device()
# iterate thru possible options and check for grub dir
for i in `cat /tmp/boot_device_list`; do
umount /boot 2>/dev/null
mount -o ro $i /boot >/dev/null 2>&1
if [[ $? && -d /boot/grub ]]; then
CONFIG_BOOT_DEV="$i"
return 0
if mount -o ro $i /boot >/dev/null 2>&1; then
if ls -d /boot/grub* >/dev/null 2>&1; then
CONFIG_BOOT_DEV="$i"
return 0
fi
fi
done