From 1e4fbe97da9a2e1e9b14c0a1f88f85af59387bf0 Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Mon, 10 Nov 2008 18:28:27 +0100 Subject: cleanup + hopefully a fix for grub thingie --- src/core/libs/lib-blockdevices-filesystems.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/core/libs/lib-blockdevices-filesystems.sh b/src/core/libs/lib-blockdevices-filesystems.sh index 8234463..b4818fc 100644 --- a/src/core/libs/lib-blockdevices-filesystems.sh +++ b/src/core/libs/lib-blockdevices-filesystems.sh @@ -102,8 +102,7 @@ findpartitions() { for part in $disk* do # check if not already assembled to a raid device - if ! [ "$(cat /proc/mdstat 2>/dev/null | grep $part)" -o "$(fstype 2>/dev/null /dev/null | grep "5")" ] + if ! [ "$(grep $part /proc/mdstat 2>/dev/null)" -o "$(fstype 2>/dev/null /dev/null | grep "5")" ] then if [ -d $part ] then @@ -155,7 +154,7 @@ findpartitions() { # taken from setup get_grub_map() { - rm $TMP_DEV_MAP + rm $TMP_DEV_MAP #TODO: this doesn't exist? is this a problem? ASKDEV $var_TARGET_DIR/sbin/grub --no-floppy --device-map $TMP_DEV_MAP >/tmp/grub.log 2>&1 <