search for: nabort

...r_port - fi - return - elif [ "$r" == "N" ]; then - printf "\nRestarting collectd configuration.\n" - break - elif [ "$r" == "A" ]; then - printf "\nAborting collectd configuration.\n" - return - fi + ask_yes_or_no "Is this correct (y/n/a)?" + rc=$? + case $rc in + 0) + printf "\nSaving configuration.\n" + if [[ -n...

...do this? [N/yes]: "; $answer = <STDIN>; chomp $answer; if ( $answer eq "yes" ) { print "\nOK, here we go.\n"; `rsync -auvz --progress --delete -e ssh Remote:/home/user/rsync-testing /home/user` } else { print "\nabort mission\n"; } ____________________________ Thanks for the help. -Rob

...face PREFIX=$OVIRT_IP_PREFIX fi + if [[ -n "${CONFIGURED_NIC}" ]]; then + printf "This will delete the current configuration for ${CONFIGURED_NIC}.\n" + read -ep "Continue? (y/N) " + case $REPLY in + N|n) printf "\nAborting...\n"; return;; + esac + fi + + rm -rf $WORKDIR/* + CONFIGURED_NIC=$NIC + local BRIDGE=br$NIC local IF_FILENAME="$WORKDIR/augtool-$NIC" local BR_FILENAME="$WORKDIR/augtool-$BRIDGE" @@ -69,7 +81,7 @@ function configure_interface...

...-n "$OVIRT_DNS" ]; then - echo "Press Enter for defaults: ($OVIRT_DNS)" + read -ep "Please enter the ${dns} DNS server: " + if [[ -z "${DNS}" ]] && [[ -z "${REPLY}" ]]; then + printf "\nAborted...\n" + return fi - read -ep ": " - DNS=$REPLY - - if [ -z "$DNS" ]; then - DNS=$OVIRT_DNS + if [[ -z "${DNS}" ]]; then + DNS="${REPLY}" +...

...if [[ -z "${REPLY}" ]]; then + local ADDRESS=$(trim_whitespace "$REPLY") + if [[ -z "${ADDRESS}" ]]; then if [[ -z "${DNS}" ]]; then printf "\nAborted...\n" return @@ -366,15 +367,20 @@ function configure_dns break fi fi - if is_valid_ipv4 $REPLY; then + if is_valid_ipv4 $ADDR...

The first line of the comment had a typo in it.

This was an older patch that had to be rebased against the current tip.

This includes a missed break and two spots where $ADDRESS was copied as $address instead.

This patch supercedes the previous and includes fixes based on feedback from apevec. Duplicate checks now check the whole address, so substrings won't cause false positives.

I missed one situation in the last patch. It wasn't properly handling the karg for NTP. This patch fixes that.

...os.system("rm -rf /etc/sysconfig/network-scripts/ifcfg-* &>/dev/null") - os.system("cp -a /etc/sysconfig/network-scripts/backup.lo /etc/sysconfig/network-scripts/ifcfg-lo") - else: + if self.CONFIGURED_NIC is None: log("\nAborting...\n") return False - for file in os.listdir(self.WORKDIR): - os.system("rm -rf %s/%s") % (self.WORKDIR, file) + if OVIRT_VARS.has_key("OVIRT_BOOTIF"): + if OVIRT_VARS["OVIRT_BOOTIF"].endswith("-DISABLED&q...

...ig("/etc/sysconfig/network-scripts/ifcfg-*") + os.system("rm -rf /etc/sysconfig/network-scripts/ifcfg-*") + os.system("cp -a /etc/sysconfig/network-scripts/backup.lo /etc/sysconfig/network-scripts/ifcfg-lo") + else: + log("\nAborting...\n") + return + + for file in os.listdir(self.WORKDIR): + os.system("rm -rf %s/%s") % (self.WORKDIR, file) + BRIDGE = "br" + self.CONFIGURED_NIC + IF_FILENAME = self.WORKDIR + "/augtool-" + self.CONFIGURED_NIC +...

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