search for: has_configured_interfac

Now, rather than displaying yet another warning, the NTP configuration just requires that the user select a NIC to configure first. That act alone provides the single warning to the user that they'll be changing their network configuration.

...rt-early | 7 ++++- 2 files changed, 53 insertions(+), 10 deletions(-) diff --git a/scripts/ovirt-config-networking b/scripts/ovirt-config-networking index 2674dfe..2bd082e 100755 --- a/scripts/ovirt-config-networking +++ b/scripts/ovirt-config-networking @@ -45,6 +45,33 @@ function has_configured_interface fi } +# Configures vlan for the node. +# $1 - the nic +# $2 - the network bridge name +# $3 - the vlan id +# $4 - the VL_ROOT variable +# $5 - the VL_CONFIG variable +# $6 - the IF_ROOT value +# $7 - the vlan config filename variable +# $8 - the NIC config filename +function setup_vlan +{...

...if is_valid_ipv4 $REPLY; then + eval $varname=\"$REPLY\" + return + else + printf "\nThe address $REPLY is not a valid IPv4 address.\n" + fi + done +} + # Checks that a network interface was already configured. function has_configured_interface { @@ -167,9 +189,9 @@ function configure_interface ;; S|s) printf "\n" - read -ep "IP Address: "; IPADDR=$REPLY - read -ep " Netmask: "; NETMASK=$REPLY -...

This version of the patch was rebased to go on top of recent changes committed to ovirt-config-networking on next.

...local AUTO=$2 if [[ "$AUTO" == "AUTO" && -n "$OVIRT_NTP" ]]; then - NTPSERVERS=$OVIRT_NTP + NTPSERVERS=$OVIRT_NTP else - NTPSERVERS="" + NTPSERVERS="" fi if [ -z "$AUTO" ]; then if has_configured_interface true; then - while true; do - read -ep "Enter an NTP server (hit return when finished): " + while true; do + read -ep "Enter an NTP server (hit return when finished): " + local address=$(trim_whitespace "$REPLY")...

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.