dsanchez/spectre-meltdown-checker
1
0
Fork 0
mirror of https://github.com/speed47/spectre-meltdown-checker synced 2024-11-07 14:43:40 +01:00
Code Issues Releases Wiki Activity

Add support for the kernel being within a btrfs subvolume (#226)

Browse Source 
- /boot may be within a named root subvolume (eg. "/@/boot")
- /boot may be in its own subvolume (eg. "/@boot")
This commit is contained in:
Nathan Parsons 2018-08-09 13:00:35 +01:00 committed by Stéphane Lesimple
parent 21af561148
commit d3481d9524
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spectre-meltdown-checker.sh
View File

@ -1309,6 +1309,9 @@ if [ "$opt_live" = 1 ]; then
if [ -r /proc/cmdline ] && grep -q 'BOOT_IMAGE=' /proc/cmdline; then if [ -r /proc/cmdline ] && grep -q 'BOOT_IMAGE=' /proc/cmdline; then
opt_kernel=$(grep -Eo 'BOOT_IMAGE=[^ ]+' /proc/cmdline | cut -d= -f2) opt_kernel=$(grep -Eo 'BOOT_IMAGE=[^ ]+' /proc/cmdline | cut -d= -f2)
_debug "found opt_kernel=$opt_kernel in /proc/cmdline" _debug "found opt_kernel=$opt_kernel in /proc/cmdline"
# if the boot partition is within a btrfs subvolume, strip the subvolume name
# if /boot is a separate subvolume, the remainder of the code in this section should handle it
if echo "$opt_kernel" | grep -q "^/@"; then opt_kernel=$(echo "$opt_kernel" | sed "s:/@[^/]*::"); fi
# if we have a dedicated /boot partition, our bootloader might have just called it / # if we have a dedicated /boot partition, our bootloader might have just called it /
# so try to prepend /boot and see if we find anything # so try to prepend /boot and see if we find anything
[ -e "/boot/$opt_kernel" ] && opt_kernel="/boot/$opt_kernel" [ -e "/boot/$opt_kernel" ] && opt_kernel="/boot/$opt_kernel"