diff options
| author | Dieter Plaetinck <dieter@plaetinck.be> | 2009-02-28 17:33:25 +0100 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2009-02-28 17:33:25 +0100 |
| commit | 07d9ffe35c6dffda66987832a25802cbf54f2f4e (patch) | |
| tree | 856b82b2fd75806b546f251afbad527906663e83 /src | |
| parent | 0426846d1ecbda0fd90451fb26262286b0bf05ad (diff) | |
check_is_in fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/libs/lib-blockdevices-filesystems.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/libs/lib-blockdevices-filesystems.sh b/src/core/libs/lib-blockdevices-filesystems.sh index ae4f5d0..1307d52 100644 --- a/src/core/libs/lib-blockdevices-filesystems.sh +++ b/src/core/libs/lib-blockdevices-filesystems.sh @@ -395,7 +395,7 @@ process_filesystems () fs_id="$part $fs_type $fs_mountpoint $fs_opts $fs_label $fs_params" if [ "$fs_create" = yes ] then - if check_is_in "$fs_id" "${done_filesystems[@]}" + if check_is_in "${done_filesystems[@]}" "$fs_id" then debug 'FS' "$fs_id ->Already done" else @@ -472,7 +472,7 @@ rollback_filesystems () elif [ "$fs_mountpoint" != no_mountpoint ] then part_real=${part/+/} - if ! check_is_in "$part_real" "${done_umounts[@]}" + if ! check_is_in "${done_umounts[@]}" "$part_real" then infofy "(Maybe) Umounting $part_real" disks if mount | grep -q "^$part_real " # could be that this was not mounted yet. no problem, we can just skip it then. @@ -744,7 +744,7 @@ get_blockdevice_size () [ -b "$1" ] || die_error "get_blockdevice_size needs a blockdevice as \$1 ($1 given)" unit=${2:-B} allowed_units=(B KiB kB MiB MB GiB GB) - if ! is_in $unit "${allowed_units[@]}" + if ! check_is_in "${allowed_units[@]}" $unit then die_error "Unrecognized unit $unit!" fi |