search for: start_log

...iff --git a/scripts/ovirt-config-storage b/scripts/ovirt-config-storage index be5aec0..671ad7d 100755 --- a/scripts/ovirt-config-storage +++ b/scripts/ovirt-config-storage @@ -36,15 +36,17 @@ logging_min_size=5 data_min_size=5 swap_min_size=5 -get_selected_drive_size() +get_drive_size() { - start_log + local drive=$1 + local space_var=$2 + local size= - local udi=$(hal-find-by-property --key block.device --string $DRIVE) + local udi=$(hal-find-by-property --key block.device --string $drive) if [ -z "$udi" ]; then # If hal didn't find the device, it c...

...+ "Abort") rm -f "${WORKDIR}"/augtool-*; exit 99;; "Save & Exit") break 2;; *) if [[ -n "${NIC}" ]] && [[ "${NICS}" =~ "${NIC}" ]]; then @@ -287,6 +304,12 @@ start_log net_configured=0 if ls "$WORKDIR"/augtool-* > /dev/null 2>&1 ; then log "Configuring network" + + # delete existing scripts + for script in /etc/sysconfig/network-scripts/ifcfg-*; do + if [[ ! "${script}" =~ ifcfg-lo ]]; then rm -f $script...

...if [ "$OVIRT_ROOT_INSTALL" == "n" ]; then + log "done." + return + fi + local found_boot=false if findfs LABEL=Boot 2>&1 >/dev/null ; then found_boot=true @@ -212,7 +218,12 @@ if [ -z "$doreboot" ]; then fi start_log -ovirt_boot_setup "$live" "$bootparams" +if [ "$OVIRT_ROOT_INSTALL" =="n" ]; then + log "done." + return +else + ovirt_boot_setup "$live" "$bootparams" +fi rc=$? if [ $rc -eq 0 -a "$doreboot" = "yes&quot...

...if [ "$OVIRT_ROOT_INSTALL" == "n" ]; then + log "done." + return + fi + local found_boot=false if findfs LABEL=Boot 2>&1 >/dev/null ; then found_boot=true @@ -212,7 +218,12 @@ if [ -z "$doreboot" ]; then fi start_log -ovirt_boot_setup "$live" "$bootparams" +if [ "$OVIRT_ROOT_INSTALL" =="n" ]; then + log "done." + return +else + ovirt_boot_setup "$live" "$bootparams" +fi rc=$? if [ $rc -eq 0 -a "$doreboot" = "yes&quot...

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

This is a repost of patches for ovirt-config-* ACK to all. Pushed.

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

...form_partitioning() { - log "Partitioning drive: $DRIVE" - if [ -z "$DRIVE" ]; then + log "Partitioning drive: $ROOTDRIVE" + if [ -z "$HOSTVGDRIVE" ]; then printf "\nNo storage device selected.\n" return fi start_log - log "Starting partitioning of $DRIVE" + log "Starting partitioning of $ROOTDRIVE" log "Saving parameters" unmount_config /etc/default/ovirt @@ -326,40 +351,51 @@ perform_partitioning() # FIXME: save a backup copy, just in case? log &quot...

...;y" ]]; then printf "\nNo storage device selected.\n" return fi + if [[ -z "$BOOTDRIVE" && "$OVIRT_ISCSI_ENABLED" == "y" ]]; then + printf "\nNo storage device selected.\n" + return + fi start_log - log "Starting partitioning of $ROOTDRIVE" log "Saving parameters" unmount_config /etc/default/ovirt @@ -366,24 +392,36 @@ perform_partitioning() # begin critical section set -e - # FIXME: save a backup copy, just in case? - log "Wiping old...

...;$HOSTVGDRIVE" devs; then for dev in $devs do printf "Removing HostVG on $dev will erase the drive and cannot be undone\n" if ask_yes_or_no "Do you want to remove HostVG from $dev (y/n)?"; then start_log - if ! wipe_lvm_on_disk $dev; then + if ! wipe_lvm_on_disk "$dev"; then stop_log return 1 fi @@ -379,7 +379,7 @@ do_configure() fi $skipped && printf &qu...

I'm looking for feedback on this first patch. The node has been pushed towards a more generic boot process. With this patch the node can now boot up and execute a few specifically-named scripts that reside in /etc/node.d/ at key points during the startup. After this goes upstream, the next step will be to define in more detail the remote interfaces for the "managed" runtime

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