From 178693fbab9667e8701cbfa45b2a703a84b76900 Mon Sep 17 00:00:00 2001 From: Bo Yao Date: Fri, 13 Oct 2017 09:15:08 -0400 Subject: [PATCH 1/2] new ask_for_ip_or_none https://bugzilla.redhat.com/show_bug.cgi?id=1501260 --- lib/gems/pending/appliance_console/prompts.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/gems/pending/appliance_console/prompts.rb b/lib/gems/pending/appliance_console/prompts.rb index 2ac57cf71..1c6fcb747 100644 --- a/lib/gems/pending/appliance_console/prompts.rb +++ b/lib/gems/pending/appliance_console/prompts.rb @@ -73,6 +73,10 @@ def ask_for_ip(prompt, default, validate = IP_REGEXP, error_text = "a valid IP A just_ask(prompt, default, validate, error_text, &block) end + def ask_for_ip_or_none(prompt, default = nil) + ask_for_ip(prompt, default, Regexp.union(NONE_REGEXP, IP_REGEXP)).gsub(NONE_REGEXP, "") + end + def ask_for_ipv4(prompt, default) ask_for_ip(prompt, default, IPV4_REGEXP) end From 866088df0e7083362e275eb4fa25029d0ae8ddaf Mon Sep 17 00:00:00 2001 From: Bo Yao Date: Fri, 13 Oct 2017 09:16:22 -0400 Subject: [PATCH 2/2] allow ipv6 address as dns when setting static ipv4 --- lib/gems/pending/appliance_console.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/gems/pending/appliance_console.rb b/lib/gems/pending/appliance_console.rb index 972c925b0..d7a334ecb 100755 --- a/lib/gems/pending/appliance_console.rb +++ b/lib/gems/pending/appliance_console.rb @@ -195,8 +195,8 @@ module ApplianceConsole new_ip = ask_for_ipv4("IP Address", ip) new_mask = ask_for_ipv4("Netmask", mask) new_gw = ask_for_ipv4("Gateway", gw) - new_dns1 = ask_for_ipv4("Primary DNS", dns1) - new_dns2 = ask_for_ipv4_or_none("Secondary DNS (Enter 'none' for no value)") + new_dns1 = ask_for_ip("Primary DNS", dns1) + new_dns2 = ask_for_ip_or_none("Secondary DNS (Enter 'none' for no value)") new_search_order = ask_for_many("domain", "Domain search order", order)