search for: configure_dn

...DGE" + local BR_ROOT="$IFCONFIG_FILE_ROOT-$BRIDGE" local BR_CONFIG="rm $BR_ROOT\nset $BR_ROOT/DEVICE $BRIDGE" BR_CONFIG="$BR_CONFIG\nset $BR_ROOT/TYPE Bridge" BR_CONFIG="$BR_CONFIG\nset $BR_ROOT/PEERNTP yes" @@ -202,7 +204,7 @@ function configure_dns fi local IF_FILENAME="$WORKDIR/augtool-br${CONFIGURED_NIC}" - local IF_ROOT="$CONFIG_FILE_ROOT-br${CONFIGURED_NIC}" + local IF_ROOT="$IFCONFIG_FILE_ROOT-br${CONFIGURED_NIC}" local IF_CONFIG= if [ -z "$AUTO" ]; then @@ -241,12 +2...

This patch obsoletes the previously submitted patch. It adds a warning message to the user when they select to change the NTP settings.

...++++++++++-------------------- 1 files changed, 11 insertions(+), 20 deletions(-) diff --git a/scripts/ovirt-config-networking b/scripts/ovirt-config-networking index d29bd12..901e48d 100755 --- a/scripts/ovirt-config-networking +++ b/scripts/ovirt-config-networking @@ -206,26 +206,18 @@ function configure_dns local IF_CONFIG= if [ -z "$AUTO" ]; then - while true; do + for dns in first second; do printf "\n" - echo "Enter up to two DNS servers separated by commas:" - if [ -n "$OVIRT_DNS" ]; then -...

.../ovirt-config-networking | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/ovirt-config-networking b/scripts/ovirt-config-networking index e114538..7d4e363 100755 --- a/scripts/ovirt-config-networking +++ b/scripts/ovirt-config-networking @@ -343,7 +343,7 @@ function configure_dns ask_yes_or_no "Is this correct ([Y]es/[N]o/[A]bort)?" true true case $? in 0) break ;; - 1) ;; + 1) DNS="";; 2) return ;; esac done --...

...-functions | 7 ++++++ 2 files changed, 33 insertions(+), 15 deletions(-) diff --git a/scripts/ovirt-config-networking b/scripts/ovirt-config-networking index ec154c2..1342a0a 100755 --- a/scripts/ovirt-config-networking +++ b/scripts/ovirt-config-networking @@ -358,7 +358,8 @@ function configure_dns while true; do printf "\n" read -ep "Please enter the ${dns} DNS server (or ENTER to exit): " - if [[ -z "${REPLY}" ]]; then + local ADDRESS=$(trim_whi...

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.

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

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.

...L_CONFIG="set %s/ONBOOT yes" % VL_ROOT + self.IF_CONFIG = self.IF_CONFIG.split("\n") + self.BR_CONFIG = self.BR_CONFIG.split("\n") + try: + self.VL_CONFIG = self_VL_CONFIG.split("\n") + except: + pass + def configure_dns(self): + if OVIRT_VARS.has_key("OVIRT_DNS"): + DNS=OVIRT_VARS["OVIRT_DNS"] + IF_FILENAME="%s/augtool-br%s" % (self.WORKDIR, CONFIGURED_NIC) + IF_ROOT="%s-br%s" % (self.IFCONFIG_FILE_ROOT, self.CONFIGURED_NIC) +...

...rintf "configuration on this system.\n" + printf "***** WARNING *****\n" select NIC in $NICS "DNS" "NTP" "Save & Exit" do @@ -269,6 +285,7 @@ else case "$NIC" in "DNS") configure_dns "$OVIRT_DNS"; break ;; "NTP") configure_ntp "$OVIRT_NTP"; break ;; + "Abort") rm -f "${WORKDIR}"/augtool-*; exit 99;; "Save & Exit") break 2;; *) if [[ -n "...

...2) + CONFIGURED_NIC="" + return ;; - N|n) BR_CONFIG=$BR_CONFIG_BASE ;; - A|a) CONFIGURED_NIC=""; return;; esac done else @@ -220,11 +223,11 @@ function configure_dns fi printf "\n" - read -ep "Is this correct (Y/N/A)? " - case $REPLY in - Y|y) break ;; - N|n) ;; - A|a) return ;; + ask_yes_or_no "Is this correct (y/n/a)?" +...

.../BOOTPROTO static\n" % (BR_ROOT) if self.VL_CONFIG == "": @@ -134,7 +132,6 @@ class Network: self.VL_CONFIG = self_VL_CONFIG.split("\n") except: pass - log("VL_CONFIG: " + self.VL_CONFIG) return True def configure_dns(self): @@ -194,13 +191,12 @@ class Network: # except: # pass # -# for script in os.listdir("/etc/sysconfig/network-scripts/"): -# if "ifcfg" in script: -# if not "ifcfg-lo" in script: -# ovirt_sa...