From e43e4d55208a2d2e52bca873d7eae932e0d10e95 Mon Sep 17 00:00:00 2001 From: "pyther@pyther.net" Date: Sat, 1 Jan 2011 18:12:28 -0500 Subject: change mdraid_is-raid to mdraid_is_raid Signed-off-by: Dieter Plaetinck --- src/core/libs/lib-blockdevices-filesystems.sh | 2 +- src/core/libs/lib-ui-interactive.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/libs/lib-blockdevices-filesystems.sh b/src/core/libs/lib-blockdevices-filesystems.sh index 7901dfe..4457721 100644 --- a/src/core/libs/lib-blockdevices-filesystems.sh +++ b/src/core/libs/lib-blockdevices-filesystems.sh @@ -920,7 +920,7 @@ get_blockdevice_size () # $1 blockdevice (ex: /dev/md0 or /dev/sda1) # return true when blockdevice is an md raid, otherwise return a unset value -mdraid_is-raid () +mdraid_is_raid() { local israid if [ -z $1 ]; then diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh index d64f673..19a0cbb 100644 --- a/src/core/libs/lib-ui-interactive.sh +++ b/src/core/libs/lib-ui-interactive.sh @@ -874,7 +874,7 @@ interactive_grub() { bootdev=$(mount | grep $var_TARGET_DIR/boot | cut -d' ' -f 1) # check if bootdev or PART_ROOT is on a md raid array # This dialog is only shown when we detect / or /boot on a raid device. - if [ -n "$(mdraid_is-raid $bootdev)" -o -n "$(mdraid_is-raid $PART_ROOT)" ]; then + if [ -n "$(mdraid_is_raid $bootdev)" -o -n "$(mdraid_is_raid $PART_ROOT)" ]; then ask_yesno "Do you have your system installed on software raid?\nAnswer 'YES' to install grub to another hard disk." no if [ $? -eq 0 ]; then onraid=true -- cgit v1.2.3