diff options
| author | Dave Reisner <dreisner@archlinux.org> | 2012-04-30 03:11:41 +0200 |
|---|---|---|
| committer | Dave Reisner <dreisner@archlinux.org> | 2012-05-02 05:25:07 +0200 |
| commit | bcbc009ccc8397c177877383570eb2dde7758c13 (patch) | |
| tree | 790ee9e967509ce24f500079e8742dd0a01d9c64 /install/fsck | |
| parent | a1753c140be6138a2313966ba3f0efec5497417d (diff) | |
| download | mkinitcpio-bcbc009ccc8397c177877383570eb2dde7758c13.tar.gz mkinitcpio-bcbc009ccc8397c177877383570eb2dde7758c13.tar.xz | |
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>
Diffstat (limited to 'install/fsck')
| -rw-r--r-- | install/fsck | 4 |
1 files changed, 2 insertions, 2 deletions
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 |