X-Git-Url: https://iankelling.org/git/?p=distro-setup;a=blobdiff_plain;f=check-subvol-stale;h=cc032d41715425e07fd777c46bdf303bbffc6487;hp=0049ff011d12e95da1a4edbd902a6feb6bdb561d;hb=3174b9cb665b9a7b7ac8413a8e236cd236786632;hpb=cca99b5a9d3cf311585a9c37b39698b0febe417c diff --git a/check-subvol-stale b/check-subvol-stale index 0049ff0..cc032d4 100644 --- a/check-subvol-stale +++ b/check-subvol-stale @@ -82,6 +82,7 @@ for d; do vol=${d##*/} # second field, non-comment line == $d dev=$(sed -rn "s,^\s*([^#]\S*)\s+$d\s.*,\1,p" /etc/fstab /etc/mtab|head -n1) + d dev=$dev subvol_dir=$(sed -rn "s,^\s*[^#]\S*\s+$d\s.*\bsubvol=([a-zA-A/]+).*,\1,p" /etc/fstab /etc/mtab|head -n1) d subvol_dir=$subvol_dir @@ -89,7 +90,7 @@ for d; do # because the device in fstab for the rootfs can be different. for devx in $(btrfs fi show $dev| sed -rn 's#.*path (/\S+)$#\1#p'); do d devx=$devx - root_dir=$(sed -rn "s,^\s*$devx\s+(\S+).*\bsubvolid=[05]\b.*,\1,p" /etc/mtab|head -n1) + root_dir=$(sed -rn "s,^\s*$devx\s+(\S+).*\bsubvolid=[05]\b.*,\1,p" /etc/mtab /etc/fstab|head -n1) if [[ $root_dir ]]; then d root_dir=$root_dir break