Skip to content

Commit

Permalink
fix(dracut-functions): get_maj_min without get_maj_min_cache_file set
Browse files Browse the repository at this point in the history
If `get_maj_min_cache_file` is unset `get_maj_min()` would error out.

Fix it to work without a cache file set.
  • Loading branch information
haraldh committed May 21, 2021
1 parent 0a6007b commit a277a5f
Showing 1 changed file with 12 additions and 5 deletions.
17 changes: 12 additions & 5 deletions dracut-functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -234,13 +234,20 @@ get_fs_env() {
# 8:2
get_maj_min() {
local _majmin
out="$(grep -m1 -oP "^$1 \K\S+$" "${get_maj_min_cache_file:?}")"
if [ -z "$out" ]; then
local _out
if [[ $get_maj_min_cache_file ]]; then
_out="$(grep -m1 -oP "^$1 \K\S+$" "$get_maj_min_cache_file")"
fi
if ! [[ "$_out" ]]; then
_majmin="$(stat -L -c '%t:%T' "$1" 2> /dev/null)"
out="$(printf "%s" "$((0x${_majmin%:*})):$((0x${_majmin#*:}))")"
echo "$1 $out" >> "${get_maj_min_cache_file:?}"
_out="$(printf "%s" "$((0x${_majmin%:*})):$((0x${_majmin#*:}))")"
if [[ $get_maj_min_cache_file ]]; then
echo "$1 $_out" >> "$get_maj_min_cache_file"
fi
fi
echo -n "$out"
echo -n "$_out"
}
# get_devpath_block <device>
Expand Down

0 comments on commit a277a5f

Please sign in to comment.