search for: get_dev_nam

All other patches from the sequence remain unchanged. Repost of patch 6 based on comments from Joey to follow. Mike

...evice "$manual_device" manual_device if [ -n "$manual_device" ]; then if [ -b "$(readlink -f $device)" ]; then + eval $return_var="$manual_device" return 0 fi else @@ -321,7 +334,7 @@ get_dev_name() # There are two or more; make the user choose. # display description for each disk for d in $devices; do - get_drive_size $d >&2 + get_drive_size "$d" >&2 done local choices="$devices Abort" select device in $choices &...

...n "$manual_device" ]; then - if [ -b "$(readlink -f $device)" ]; then + if [ -b "$(readlink -f "$device")" ]; then eval $return_var="$manual_device" return 0 fi @@ -273,7 +273,7 @@ get_dev_name() test "X$drive_type" = Xdisk || continue local block_dev=$(hal-get-property --udi "$d" --key block.device) # Must start with a '/'. - case $block_dev in + case "$block_dev" in *' '*)...

...,7 +73,7 @@ check_partition_sizes() fi printf "\n" - get_selected_drive_size + get_drive_size $DRIVE SPACE disk_size=$SPACE need_size=$(echo "scale=0;" \ "$BOOT_SIZE + $SWAP_SIZE + $ROOT_SIZE * 2" \ @@ -160,6 +164,10 @@ get_dev_name() esac # There are two or more; make the user choose. + # display description for each disk + for d in $devices; do + get_drive_size $d >&2 + done local choices="$devices Abort" select device in $choices do @@ -174,7 +182,7 @@ do_configur...

This patch adds a safety verification to configure_from_network function, where network configuration will not be performed if it is already up and running, preventing lost of communication for connections already established. Signed-off-by: Ricardo Marin Matinata <matinata at br.ibm.com> --- scripts/ovirt-early | 9 ++++++--- scripts/ovirt-functions | 7 +++++++ 2 files changed,

...u and then try to partition.\n" + printf "\n" + rc=1 + fi + else + rc=0 fi return $rc @@ -210,16 +220,17 @@ do_configure() printf "\n\nPlease select the disk to use for the Boot partition.\n\n" BOOTDRIVE=$(get_dev_name) || return 0 get_drive_size $BOOTDRIVE BOOTDRIVESPACE + echo $BOOTDRIVE + else + printf "\n\nPlease select the disk to use for the Root.\n\n" + ROOTDRIVE=$(get_dev_name) || return 0 + get_drive_size $ROOTDRIVE ROOTDRIVESPACE + + printf &quot...

...,vg_name --noheadings | \ - grep "HostVG"|grep -v $DRIVE|awk '{ print $1 }')" + grep "HostVG"|grep -v $HOSTVGDRIVE|awk '{ print $1 }')" rc=0 if [ -n "$devices" ]; then printf "\n" @@ -193,8 +206,14 @@ get_dev_name() do_configure() { local name_and_size - DRIVE=$(get_dev_name) || return 0 - get_drive_size $DRIVE SPACE + printf "\n\nPlease select the disk to use for the Root.\n\n" + ROOTDRIVE=$(get_dev_name) || return 0 + get_drive_size $ROOTDRIVE ROOTDRIVESPACE + + printf &...

The following patches introduce support for multipath and cciss devices to the ovirt-node and node-image. Comments are appreciated. These patches assume that the 3 patches (2 node, 1 node-image) from Joey are all incorporated. Mike

...grep -v "$HOSTVGDRIVE"|awk '{ print $1 }')" rc=0 if [ -n "$devices" ]; then printf "\n" @@ -357,11 +357,27 @@ do_configure() printf "\n\nPlease select the disk to use for the Root.\n\n" ROOTDRIVE=$(get_dev_name) || return 0 get_drive_size "$ROOTDRIVE" ROOTDRIVESPACE + if ask_yes_or_no "Will Root be shared with other nodes ([Y]es/[N]o)?"; then + OVIRT_SHARED_ROOT="y" + if ask_yes_or_no "Partition and install Root?"; then +...

...a/scripts/ovirt-config-storage b/scripts/ovirt-config-storage index 8d59a6b..aec3447 100755 --- a/scripts/ovirt-config-storage +++ b/scripts/ovirt-config-storage @@ -357,6 +357,22 @@ do_configure() printf "\n\nPlease select the disk to use for the Root.\n\n" ROOTDRIVE=$(get_dev_name) || return 0 get_drive_size "$ROOTDRIVE" ROOTDRIVESPACE + if ask_yes_or_no "Will Root be shared with other nodes ([Y]es/[N]o)?"; then + OVIRT_SHARED_ROOT="y" + if ask_yes_or_no "Partition and install Root?"; then +...

...default_overcommit=0.5 - +default_boot_size=50 default_root_size=256 default_config_size=5 default_logging_size=2048 # -1 indicates data partition should use remaining disk default_data_size=-1 - +boot_min_size=50 root_min_size=256 config_min_size=5 logging_min_size=5 @@ -206,6 +206,11 @@ get_dev_name() do_configure() { local name_and_size + if [ "$OVIRT_ISCSI_ENABLED" == "y" ]; then + printf "\n\nPlease select the disk to use for the Boot partition.\n\n" + BOOTDRIVE=$(get_dev_name) || return 0 + get_drive_size $BOOTDRIVE BOOTDRIVESPA...

This set of patches introduces support for multipath devices for storage. Comments and suggestions are appreciated. Mike

...gnostic and return nonzero. -# If there is just one, e.g., /dev/sda, treat it as selected (see below). -# and return 0. If there are two or more, make the user select one -# or decline. Upon decline, return nonzero. Otherwise, print the -# selected name, then return 0. -# Sample output: /dev/sda -get_dev_name() +# Ensures the device is acceptable +# $1 - the device +check_if_device_is_good () +{ + debug "check_if_device_is_good: start" + local device=$1 + local result=1 + + # Must start with a '/'. + case $device in + *' '*) + # we use space as...

This patch includes a fix to no longer list devices with 0 bytes of storage, such as removeable media devices with no media present.

...m> --- scripts/ovirt-config-storage | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/scripts/ovirt-config-storage b/scripts/ovirt-config-storage index 5560b5f..d9b72f8 100755 --- a/scripts/ovirt-config-storage +++ b/scripts/ovirt-config-storage @@ -169,6 +169,13 @@ get_dev_name() devices="$devices $(ls /dev/vd? 2> /dev/null | xargs)" devices=$(echo $devices | tr ' ' '\n' | sort -u | xargs) + # FIXME: workaround for dealing with cciss devices + for dev in $(ls /dev/cciss/); do + if [[ ! $dev =~ p[0-9]+\$ ]]; then + device...

...om> --- scripts/ovirt-config-storage | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/ovirt-config-storage b/scripts/ovirt-config-storage index 34e84e5..e4b6c98 100755 --- a/scripts/ovirt-config-storage +++ b/scripts/ovirt-config-storage @@ -307,14 +307,15 @@ get_dev_name() devices="$devices /dev/mapper/$dev" local sd_devs="" get_multipath_devices $dev sd_devs - devs_to_remove="${devs_to_remove} ${sd_devs}" + local dm_dev=$(multipath -ll $dev | grep $dev | sed -r 's/^.*(dm-[0-9]+ ).*$/\1/...

This patch just includes the repo name in the subject.

...printf "\t$device ${uuid}\n" done printf "We cannot proceed until either device is removed from the system\n" printf "or until the HostVG volume group is removed.\n" @@ -260,40 +232,19 @@ manual_input() # Sample output: /dev/sda get_dev_name() { - local udi_list=$(hal-find-by-capability --capability storage) local byid_list=$(find /dev/disk/by-id -mindepth 1 -not -name '*-part*' 2>/dev/null) - if test -z "$udi_list" -a -z "$byid_list"; then - warn "ERROR: no usable storage devices...

This one incorporates feedback from mburns and apevec to ensure that all multipath devices are excluded in the list of available drives. Only drives with an identified bus are included in the list now.

...tic and return nonzero. +# If there is just one, e.g., /dev/sda, treat it as selected (see below). +# and return 0. If there are two or more, make the user select one +# or decline. Upon decline, return nonzero. Otherwise, print the +# selected name, then return 0. +# Sample output: /dev/sda +def get_dev_name(): + devices="" + # list separator + for d in os.listdir("/sys/block/"): + if re.match("^[hsv]+d", d): + devices="/dev/%s %s" % (d,devices) + byid_list_cmd = "find /dev/disk/by-id -mindepth 1 -not -name '*-part*' 2&...