From bcbc009ccc8397c177877383570eb2dde7758c13 Mon Sep 17 00:00:00 2001
From: Dave Reisner <dreisner@archlinux.org>
Date: Sun, 29 Apr 2012 21:11:41 -0400
Subject: fsck: try harder to find fsck binaries

fsck binaries might be outside of /sbin -- glob on all the common paths.
This almost matches what we use for util-linux's fsck search path, but
we omit the oddball /sbin/fs and /sbin/fs.d directories.

Note that this only affects non-autodetect images, since autodetect
resolves fsck helpers directly by name.

Signed-off-by: Dave Reisner <dreisner@archlinux.org>
---
 install/fsck | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'install')

diff --git a/install/fsck b/install/fsck
index b820063..baf1c3d 100644
--- a/install/fsck
+++ b/install/fsck
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 build() {
-    local added=0
+    local fsck= added=0
 
     add_fsck() {
         if [[ $1 = ext[234] ]]; then
@@ -21,7 +21,7 @@ build() {
             add_fsck $usrfstype && (( ++added ))
         fi
     else
-        for fsck in "$BASEDIR"/sbin/fsck.*; do
+        for fsck in "$BASEDIR"/{usr/,}{s,}bin/fsck.*; do
             [[ -f $fsck ]] || continue
             add_binary "${fsck#$BASEDIR}" && (( ++added ))
         done
-- 
cgit v1.2.3-24-g4f1b