From 869c314159497c74aa6cf477862629b05a9fd2b0 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Sat, 1 Mar 2014 16:38:21 -0500 Subject: Always use the --target flag with findmnt Prevents problems with bogusly named filesystems, e.g.: mount -t tmpfs / /mount/point Fixes FS#39090. --- hooks/usr | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'hooks/usr') diff --git a/hooks/usr b/hooks/usr index f45ca7f..44aebb2 100644 --- a/hooks/usr +++ b/hooks/usr @@ -4,12 +4,12 @@ run_latehook() { local usr_source mountopts passno realtab=/new_root/etc/fstab if [ -f "$realtab" ]; then - if usr_source=$(findmnt -snero source --tab-file="$realtab" /usr); then - mountopts=$(findmnt -snero options --tab-file="$realtab" /usr) + if usr_source=$(findmnt -snero source --tab-file="$realtab" -T /usr); then + mountopts=$(findmnt -snero options --tab-file="$realtab" -T /usr) # returning the passno column requires util-linux >= 2.23. for # older versions which do not support this column, always fsck. - passno=$(findmnt -snero passno --tab-file="$realtab" /usr 2>/dev/null) + passno=$(findmnt -snero passno --tab-file="$realtab" -T /usr 2>/dev/null) if [ -z "$passno" ] || [ "$passno" -gt 0 ]; then fsck_device "$usr_source" fi -- cgit v1.2.3-24-g4f1b