ExternalVendorCode/heads
1
0
Fork 0
mirror of https://github.com/linuxboot/heads.git synced 2025-02-07 03:29:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

etc/functions, gpg-gui: Filter boot device options with '/dev/'

Browse Source 
Grepping on just 'Disk' can lead to disk UUID identifier strings
being added to /tmp/disklist, which then fail to parse later on.
Avoid this by grepping on 'Disk /dev' instead.

Signed-off-by: Matt DeVillier <matt.devillier@puri.sm>
This commit is contained in:
Matt DeVillier 2021-01-05 16:13:41 -06:00 committed by tlaurion
parent 1c6f623c25
commit de0ce98da3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
initrd/bin/config-gui.sh
View File

@ -31,7 +31,7 @@ while true; do
;; ;;
"b" ) "b" )
CURRENT_OPTION=`grep 'CONFIG_BOOT_DEV=' /tmp/config | tail -n1 | cut -f2 -d '=' | tr -d '"'` CURRENT_OPTION=`grep 'CONFIG_BOOT_DEV=' /tmp/config | tail -n1 | cut -f2 -d '=' | tr -d '"'`
if ! fdisk -l | grep "Disk" | cut -f2 -d " " | cut -f1 -d ":" > /tmp/disklist.txt ; then if ! fdisk -l | grep "Disk /dev/" | cut -f2 -d " " | cut -f1 -d ":" > /tmp/disklist.txt ; then
whiptail $BG_COLOR_ERROR --title 'ERROR: No bootable devices found' \ whiptail $BG_COLOR_ERROR --title 'ERROR: No bootable devices found' \
--msgbox " $ERROR\n\n" 16 60 --msgbox " $ERROR\n\n" 16 60
exit 1 exit 1

2
initrd/etc/functions
View File

@ -315,7 +315,7 @@ detect_boot_device()
fi fi
# generate list of possible boot devices # generate list of possible boot devices
fdisk -l | grep "Disk" | cut -f2 -d " " | cut -f1 -d ":" > /tmp/disklist fdisk -l | grep "Disk /dev/" | cut -f2 -d " " | cut -f1 -d ":" > /tmp/disklist
# filter out extraneous options # filter out extraneous options
> /tmp/boot_device_list > /tmp/boot_device_list