[arch-releng] [PATCH 0/2] *** Rename mdraid_is-raid and mdraid_all-slaves ***
*** Renamed mdraid_is-raid and mdraid_all-slaves to mdraid_is_raid and mdraid_all_slaves *** Matthew Gyurgyik (2): change mdraid_is-raid to mdraid_is_raid change mdraid_all-slaves to mdraid_all_slaves src/core/libs/lib-blockdevices-filesystems.sh | 4 ++-- src/core/libs/lib-ui-interactive.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) -- 1.7.3.4
--- 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 298c4d2..ef1a9b0 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 d42ebdb..9ecd00c 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 -- 1.7.3.4
--- 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 ef1a9b0..4457721 100644 --- a/src/core/libs/lib-blockdevices-filesystems.sh +++ b/src/core/libs/lib-blockdevices-filesystems.sh @@ -948,7 +948,7 @@ mdraid_slave0 () # $1 md raid blockdevice (ex: /dev/md0) # return a list of array members from given md array # ex: /dev/md0 has slaves: "/dev/sda1 /dev/sdb2 /dev/sdc2" -mdraid_all-slaves () +mdraid_all_slaves () { local slave= local slaves= diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh index 9ecd00c..19a0cbb 100644 --- a/src/core/libs/lib-ui-interactive.sh +++ b/src/core/libs/lib-ui-interactive.sh @@ -925,7 +925,7 @@ interactive_grub() { local ask_str="Do you want to install grub to the MBR of each harddisk from your BOOT array "$md" ? (recommended)" ask_yesno "$ask_str" yes if [ $? -eq 0 ]; then - slaves=$(mdraid_all-slaves $md) + slaves=$(mdraid_all_slaves $md) for slave in $slaves; do boothd=$(echo $slave | cut -c -8) bootpart=$(mdraid_slave0 $md) -- 1.7.3.4
On Sat, 1 Jan 2011 18:12:27 -0500 pyther@pyther.net wrote:
*** Renamed mdraid_is-raid and mdraid_all-slaves to mdraid_is_raid and mdraid_all_slaves ***
Matthew Gyurgyik (2): change mdraid_is-raid to mdraid_is_raid change mdraid_all-slaves to mdraid_all_slaves
src/core/libs/lib-blockdevices-filesystems.sh | 4 ++-- src/core/libs/lib-ui-interactive.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
applied both, thanks. Dieter
participants (2)
-
Dieter Plaetinck
-
pyther＠pyther.net