manuel
/
gentoo-install
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use more robust device resolving by using blkid only as a fallback

This commit is contained in:
oddlama 2021-06-03 16:12:51 +02:00
parent 8463547fef
commit 47ffc8a551
No known key found for this signature in database
GPG Key ID: 14EFE510775FE39A
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
scripts/utils.sh
View File

@ -123,11 +123,11 @@ function download() {
function get_blkid_field_by_device() { function get_blkid_field_by_device() {
local blkid_field="$1" local blkid_field="$1"
local device="$2" local device="$2"
blkid -g \ blkid -g -c /dev/null \
|| die "Error while executing blkid -g" || die "Error while executing blkid"
partprobe &>/dev/null partprobe &>/dev/null
local val local val
val="$(blkid -o export "$device")" \ val="$(blkid -c /dev/null -o export "$device")" \
|| die "Error while executing blkid '$device'" || die "Error while executing blkid '$device'"
val="$(grep -- "^$blkid_field=" <<< "$val")" \ val="$(grep -- "^$blkid_field=" <<< "$val")" \
|| die "Could not find $blkid_field=... in blkid output" || die "Could not find $blkid_field=... in blkid output"
@ -148,11 +148,11 @@ function get_blkid_uuid_for_id() {
function get_device_by_blkid_field() { function get_device_by_blkid_field() {
local blkid_field="$1" local blkid_field="$1"
local field_value="$2" local field_value="$2"
blkid -g \ blkid -g -c /dev/null \
|| die "Error while executing blkid -g" || die "Error while executing blkid"
type partprobe &>/dev/null && partprobe &>/dev/null type partprobe &>/dev/null && partprobe &>/dev/null
local dev local dev
dev="$(blkid -o export -t "$blkid_field=$field_value")" \ dev="$(blkid -c /dev/null -o export -t "$blkid_field=$field_value")" \
|| die "Error while executing blkid to find $blkid_field=$field_value" || die "Error while executing blkid to find $blkid_field=$field_value"
dev="$(grep DEVNAME <<< "$dev")" \ dev="$(grep DEVNAME <<< "$dev")" \
|| die "Could not find DEVNAME=... in blkid output" || die "Could not find DEVNAME=... in blkid output"
@ -161,11 +161,19 @@ function get_device_by_blkid_field() {
} }
function get_device_by_partuuid() { function get_device_by_partuuid() {
get_device_by_blkid_field 'PARTUUID' "$1" if [[ -e "/dev/disk/by-partuuid/$1" ]]; then
echo -n "/dev/disk/by-partuuid/$1"
else
get_device_by_blkid_field 'PARTUUID' "$1"
fi
} }
function get_device_by_uuid() { function get_device_by_uuid() {
get_device_by_blkid_field 'UUID' "$1" if [[ -e "/dev/disk/by-uuid/$1" ]]; then
echo -n "/dev/disk/by-uuid/$1"
else
get_device_by_blkid_field 'UUID' "$1"
fi
} }
function cache_lsblk_output() { function cache_lsblk_output() {