diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2014-11-10 12:46:00 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-11-10 12:46:00 +0000 |
commit | 5b53470cf0491b9378e0a48325e98230569d68b1 (patch) | |
tree | 2f68a4d53519c76ad8a321c56228a347e9b6a829 /initramfs-init.in | |
parent | 8bfd996b8c79d6eda6d80c02b34d6183f303a267 (diff) | |
download | mkinitfs-5b53470cf0491b9378e0a48325e98230569d68b1.tar.bz2 mkinitfs-5b53470cf0491b9378e0a48325e98230569d68b1.tar.xz |
init: minor refactor of find_ovl
use 'set' instead of 'ls' to find duplicate apkovls
Diffstat (limited to 'initramfs-init.in')
-rwxr-xr-x | initramfs-init.in | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/initramfs-init.in b/initramfs-init.in index 22daede..8de3e8d 100755 --- a/initramfs-init.in +++ b/initramfs-init.in @@ -49,8 +49,6 @@ scan_drivers() { find_ovl() { local mnt="$1" - local ovl - local lines if [ -n "$APKOVL" ]; then [ -f "$mnt/$APKOVL" ] && echo "$mnt/$APKOVL" @@ -58,14 +56,13 @@ find_ovl() { fi # look for apkovl's on mounted media - ovl=$( ls -1 "$mnt"/*.apkovl.tar.gz* 2>/dev/null ) || return 1 - lines=$(echo "$ovl" | wc -l) + set -- "$mnt"/*.apkovl.tar.gz* - if [ $lines -gt 1 ] ; then + if [ $# -gt 1 ] ; then echo "ERROR: More than one apkovl file was found on $(basename $mnt). None will be read." >&2 return 1 fi - echo "$ovl" + echo "$1" } retry_mount() { |