search for: ovirt_ntp

...OOT="$IFCONFIG_FILE_ROOT-br${CONFIGURED_NIC}" local IF_CONFIG= if [ -z "$AUTO" ]; then @@ -241,12 +243,11 @@ function configure_dns function configure_ntp { - local NTP=$1 local AUTO=$2 if [[ "$AUTO" == "AUTO" && -n "$OVIRT_NTP" ]]; then - NTP=$OVIRT_NTP + NTPSERVERS=$OVIRT_NTP else - NTP="" + NTPSERVERS="" fi if [ -z "$AUTO" ]; then @@ -255,18 +256,29 @@ function configure_ntp if [ -z "$REPLY" ]; then break; fi - NTP="$NTP $REPLY" +...

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

...t; + printf "${ADDRESS} is an invalid address.\n" fi done done @@ -403,24 +409,29 @@ function configure_ntp { 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 serv...

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.

...uot;) % (IF_ROOT, DNS1) + if not DNS2 is None: + os.system("echo \"set %s/DNS2 %s\n\" >> %s") % (IF_ROOT, DNS2) + except: + pass + + def configure_ntp(self): + if OVIRT_VARS.has_key("OVIRT_NTP"): + NTPSERVERS=OVIRT_NTP + else: + NTPSERVERS="" + + def save_ntp_configuration(self): + ntproot = "/files/etc/ntp.conf" + ntpconf = "rm %s\n" % ntproot + ntpconf += "set %s/driftfile /var/lib/ntp/drift\n&...

...***\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 "${NIC}" ]] && [[ "${NICS}" =~ "${NIC}" ]]; then @@ -...

...+ augtool(oper, key, value) except: - oper, file = line.split() - - augtool(oper, line, "") + oper, key = line.split() + augtool(oper, key, "") if OVIRT_VARS.has_key("OVIRT_NTP"): offset=1 @@ -201,33 +201,33 @@ class Network: for line in self.IF_CONFIG: log(line) try: - oper, file, value = line.split() - augtool(oper, file, value) + oper, key, value = line.split() +...