search for: is_valid_ipv4

...{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 $ADDRESS; then if [[ -z "${DNS}" ]]; then - DNS="${REPLY}" - elif [[ -n "${REPLY}" ]]; then - DN...

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

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.

...ig-setup.py index d55ea36..753c80d 100755 --- a/scripts/ovirt-config-setup.py +++ b/scripts/ovirt-config-setup.py @@ -231,7 +231,8 @@ class NodeConfigScreen(): warn = 0 if not self.dns_host1.value() is None and not self.dns_host1.value() == "": if not is_valid_ipv4(self.dns_host1.value()): - warn = 1 + if not is_valid_ipv6(self.dns_host1.value()): + warn = 1 if warn == 1: self.screen.setColor("BUTTON", "black", "red") self.screen.se...

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.

...54c2..40a2d2c 100755 --- a/scripts/ovirt-config-networking +++ b/scripts/ovirt-config-networking @@ -414,12 +414,7 @@ function configure_ntp read -ep "Enter an NTP server (hit return when finished): " if [ -z "$REPLY" ]; then break; fi - - if is_valid_ipv4 $REPLY; then - NTPSERVERS="${NTPSERVERS}:${REPLY}" - else - printf "${REPLY} is an invalid address.\n" - fi + NTPSERVERS="${NTPSERVERS}:${REPLY}" done fi fi @@ -560,5...

...$1 - the variable name to set +# $2 - the input prompt +function input_ipv4_address { + local varname=$1 + local prompt=$2 + + eval $varname=\"\" + + while true; do + read -ep "${prompt}: " + + if [ -z "$REPLY" ]; then return; fi + + 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...

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

...ck reported ok even when DHCP failed --- scripts/ovirt-functions | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/ovirt-functions b/scripts/ovirt-functions index 1db89ae..866f963 100644 --- a/scripts/ovirt-functions +++ b/scripts/ovirt-functions @@ -734,7 +734,7 @@ is_valid_ipv4 () { # Check if networking is already up network_up () { - test -n "$(/sbin/ip -o link show up | cut -d: -f2 | grep -v 'lo$')" + ip addr show | grep -q "inet.*scope global" } # execute a function if called as a script, e.g. -- 1.6.0.6

...fig-setup.py index 8c6c8af..a8f85cf 100755 --- a/scripts/ovirt-config-setup.py +++ b/scripts/ovirt-config-setup.py @@ -274,8 +274,8 @@ class NodeConfigScreen(): warn = 0 if not self.ntp_host2.value() is None and not self.ntp_host2.value() == "": if not is_valid_ipv4(self.ntp_host2.value()): - if not is_valid_ipv6(self.ntp_host1.value()): - if not is_valid_hostname(self.ntp_host1.value()): + if not is_valid_ipv6(self.ntp_host2.value()): + if not is_valid_hostname(self.ntp_host2.valu...

...network-scripts/ifup-post IPADDR=$(LC_ALL=C ip -o -4 addr ls dev ${DEVICE} | awk '{ print $4 ; exit }') diff --git a/scripts/ovirt-functions b/scripts/ovirt-functions index fc43343..2801bd8 100644 --- a/scripts/ovirt-functions +++ b/scripts/ovirt-functions @@ -709,6 +709,13 @@ is_valid_ipv4 () { return $result } +# Check if networking is already up +network_up () { + UPIFS=$(/sbin/ip -o link show up | awk -F ": " '{ print $2 }' | grep -v lo | wc -l) + test -n "${UPIFS}" -a "${UPIFS}" -gt "0" + return $? +} + # execute a...

...uot;]) else: - current_gateway = get_gateway(self.nic_lb.current()) - if current_gateway == "": - current_gateway = get_gateway("br" + self.nic_lb.current()) + current_gateway = get_gateway(dev) if is_valid_ipv4(current_gateway) or is_valid_ipv6(current_gateway): self.ipv4_netdevgateway.set(current_gateway) ipv4_grid = Grid (5,3) @@ -1576,10 +1572,7 @@ class NodeConfigScreen(): elif self.net_apply_config == 1: self....