ExternalVendorCode/heads
1
0
Fork 0
mirror of https://github.com/linuxboot/heads.git synced 2025-04-07 19:34:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1297 from tlaurion/usb-scan_moved_to-media-scan

Browse Source 
usb-scan->media-scan: usb-init calling media-scan usb
This commit is contained in:
tlaurion 2023-01-27 16:07:17 -05:00 committed by GitHub
commit 7be67e4992
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
initrd/bin/usb-scan → initrd/bin/media-scan
View File

@ -11,8 +11,19 @@ if grep -q /boot /proc/mounts ; then
|| die "Unable to unmount /boot"
fi
# Mount the USB boot device
mount_usb || die "Unable to mount /media"
available_partitions="$(blkid | while read line; do echo $line | awk -F ":" {'print $1'}; done )"
if [ "$1" == "usb" ]; then
# Mount the USB boot device
mount_usb || die "Unable to mount /media"
elif $(echo $available_partitions | grep -q "$1"); then
if grep -q /media /proc/mounts; then
umount /media \
|| die "Unable to unmount /media"
fi
mount "$1" /media \
|| die "Unable to mount $1 to /media"
fi
# Get USB boot device
USB_BOOT_DEV=$(grep "/media" /etc/mtab | cut -f 1 -d' ')

2
initrd/bin/usb-init
View File

@ -9,5 +9,5 @@ if [ "$CONFIG_TPM" = "y" ]; then
tpm extend -ix 4 -ic usb
fi
usb-scan
media-scan usb
recovery "Something failed during USB boot"