switch "cidr", "gateway" & "dns" over to central config

allows to drop quite a few module wide variables for GUI widgets,
which haven been re-created everytime the step got visited anyway.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/Proxmox/Install/Config.pm b/Proxmox/Install/Config.pm
index f959f014fc81b8731e7179a2c50a1549fe2d9a98..79ea91d84982640ca1383bac6811139a68876c5b 100644 (file)
--- a/Proxmox/Install/Config.pm
+++ b/Proxmox/Install/Config.pm
@@ -7,6 +7,7 @@ use Carp;
 use JSON qw(from_json to_json);
 
 use Proxmox::Install::ISOEnv;
+use Proxmox::Sys::Net;
 
 my sub init_cfg {
     my $iso_env = Proxmox::Install::ISOEnv::get();
@@ -43,6 +44,9 @@ my sub init_cfg {
        mngmt_nic_id => undef,
        hostname => 'proxmox',
        domain => 'example.invalid',
+       cidr => undef,
+       gateway => undef,
+       dns => undef,
     };
 
     # TODO add disksel$i => undef entries
@@ -166,4 +170,23 @@ sub get_fqdn { # virtual config
     return defined($hostname) && defined($domain) ? "${hostname}.${domain}" : undef;
 }
 
+sub set_cidr { set_key('cidr', $_[0]); }
+sub get_cidr { return get('cidr'); }
+
+sub get_ip_addr { #'virtual config
+    my $cidr = get('cidr') // return;
+    my ($ip, $mask) = split('/', $cidr);
+    return $ip;
+}
+sub get_ip_version { # virtual config
+    my $ip = get_ip_addr() // return;
+    return Proxmox::Sys::Net::parse_ip_address($ip);
+}
+
+sub set_gateway { set_key('gateway', $_[0]); }
+sub get_gateway { return get('gateway'); }
+
+sub set_dns { set_key('dns', $_[0]); }
+sub get_dns { return get('dns'); }
+
 1;

diff --git a/proxinstall b/proxinstall
index fb365d4759e98441aa6c09c3573e08d71614b397..542472c5d919501994db6f21b256f6f547c08bc5 100755 (executable)
--- a/proxinstall
+++ b/proxinstall
@@ -100,21 +100,9 @@ my $gtk_state = {};
 
 my $target_hd;
 
-my ($ipversion, $ipaddress, $cidr, $ipconf_entry_addr);
-my ($netmask, $ipconf_entry_mask);
-my ($gateway, $ipconf_entry_gw);
-my ($dnsserver, $ipconf_entry_dns);
 my $ipconf;
 my $autoreboot_seconds = 5;
 
-# TODO: single source of config state
-my $config = {
-    # TODO: add all the user-provided options for previous button
-    ipaddress => undef,
-    netmask => undef,
-    gateway => undef,
-};
-
 my $config_options = Proxmox::Install::Config::parse_kernel_cmdline();
 
 my $postfix_main_cf = <<_EOD;
@@ -846,10 +834,11 @@ sub extract_data {
        # configure hosts
        my $hostname = Proxmox::Install::Config::get_hostname();
        my $domain = Proxmox::Install::Config::get_domain();
+       my $ip_addr = Proxmox::Install::Config::get_ip_addr();
 
        my $hosts =
            "127.0.0.1 localhost.localdomain localhost\n" .
-           "$ipaddress $hostname.$domain $hostname\n\n" .
+           "$ip_addr $hostname.$domain $hostname\n\n" .
            "# The following lines are desirable for IPv6 capable hosts\n\n" .
            "::1     ip6-localhost ip6-loopback\n" .
            "fe00::0 ip6-localnet\n" .
@@ -868,9 +857,12 @@ sub extract_data {
 
        my $ifaces = "auto lo\niface lo inet loopback\n\n";
 
-       my $ntype = $ipversion == 4 ? 'inet' : 'inet6';
+       my $ip_version = Proxmox::Install::Config::get_ip_version();
+       my $ntype = $ip_version == 4 ? 'inet' : 'inet6';
 
        my $ethdev = Proxmox::Install::Config::get_mngmt_nic();
+       my $cidr = Proxmox::Install::Config::get_cidr();
+       my $gateway = Proxmox::Install::Config::get_gateway();
 
        if ($iso_env->{cfg}->{bridged_network}) {
            $ifaces .= "iface $ethdev $ntype manual\n";
@@ -900,6 +892,7 @@ sub extract_data {
 
        # configure dns
 
+       my $dnsserver = Proxmox::Install::Config::get_dns();
        my $resolvconf = "search $domain\nnameserver $dnsserver\n";
        file_write_all("$targetdir/etc/resolv.conf", $resolvconf);
 
@@ -1454,7 +1447,9 @@ sub create_text_input {
     return ($hbox, $e1);
 }
 sub create_cidr_inputs {
-    my ($default_ip, $default_mask) = @_;
+    my ($cidr) = @_;
+
+    my ($default_ip, $default_mask) = split('/', $cidr);
 
     my $hbox = Gtk3::Box->new('horizontal', 0);
 
@@ -1494,11 +1489,9 @@ sub create_ipconf_view {
     my $vbox =  Gtk3::Box->new('vertical', 0);
     $hcontainer->add($vbox);
 
-    my $ipaddr_text = $config->{ipaddress} // "192.168.100.2";
-    my $netmask_text = $config->{netmask} // "24";
-    my $cidr_box;
-    ($cidr_box, $ipconf_entry_addr, $ipconf_entry_mask) =
-       create_cidr_inputs($ipaddr_text, $netmask_text);
+    my $cidr = Proxmox::Install::Config::get_cidr() // '192.168.100.2/24';
+
+    my ($cidr_box, $ipconf_entry_addr, $ipconf_entry_mask) = create_cidr_inputs($cidr);
 
     my $device_cb = Gtk3::ComboBoxText->new();
     $device_cb->set_active(0);
@@ -1565,19 +1558,16 @@ sub create_ipconf_view {
 
     $vbox->pack_start($cidr_box, 0, 0, 2);
 
-    $gateway = $config->{gateway} // $ipconf->{gateway} || '192.168.100.1';
-
-    my $gwbox;
-    ($gwbox, $ipconf_entry_gw) =
-       create_text_input($gateway, 'Gateway:');
+    my $cfg_gateway = Proxmox::Install::Config::get_gateway();
+    my $gateway = $cfg_gateway // $ipconf->{gateway} || '192.168.100.1';
 
+    my ($gwbox, $ipconf_entry_gw) = create_text_input($gateway, 'Gateway:');
     $vbox->pack_start($gwbox, 0, 0, 2);
 
-    $dnsserver = $config->{dnsserver} // $ipconf->{dnsserver} || $gateway;
+    my $cfg_dns = Proxmox::Install::Config::get_dns();
+    my $dnsserver = $cfg_dns // $ipconf->{dnsserver} || $gateway;
 
-    my $dnsbox;
-    ($dnsbox, $ipconf_entry_dns) =
-       create_text_input($dnsserver, 'DNS Server:');
+    my ($dnsbox, $ipconf_entry_dns) = create_text_input($dnsserver, 'DNS Server:');
 
     $vbox->pack_start($dnsbox, 0, 0, 0);
 
@@ -1609,23 +1599,21 @@ sub create_ipconf_view {
 
        # verify ip address
        $text = $ipconf_entry_addr->get_text();
-       ($ipaddress, $ipversion) = parse_ip_address($text);
+       my ($ipaddress, $ipversion) = parse_ip_address($text);
        if (!defined($ipaddress)) {
            Proxmox::UI::message("IP address is not valid.");
            $ipconf_entry_addr->grab_focus();
            return;
        }
-       $config->{ipaddress} = $ipaddress;
 
        $text = $ipconf_entry_mask->get_text();
-       $netmask = parse_ip_mask($text, $ipversion);
+       my $netmask = parse_ip_mask($text, $ipversion);
        if (!defined($netmask)) {
            Proxmox::UI::message("Netmask is not valid.");
            $ipconf_entry_mask->grab_focus();
            return;
        }
-       $cidr = "$ipaddress/$netmask";
-       $config->{netmask} = $netmask;
+       Proxmox::Install::Config::set_cidr("$ipaddress/$netmask");
 
        $text = $ipconf_entry_gw->get_text();
        my ($gateway_ip, $gateway_ip_version) = parse_ip_address($text);
@@ -1637,7 +1625,7 @@ sub create_ipconf_view {
            $ipconf_entry_gw->grab_focus();
            return;
        }
-       $config->{gateway} = $gateway = $gateway_ip;
+       Proxmox::Install::Config::set_gateway($gateway_ip);
 
        $text = $ipconf_entry_dns->get_text();
        my ($dns_ip, $dns_ip_version) = parse_ip_address($text);
@@ -1649,9 +1637,9 @@ sub create_ipconf_view {
            $ipconf_entry_dns->grab_focus();
            return;
        }
-       $config->{dnsserver} = $dnsserver = $dns_ip;
+       Proxmox::Install::Config::set_dns($dns_ip);
 
-       #print STDERR "TEST $ipaddress $netmask $gateway $dnsserver\n";
+       #print STDERR "TEST $ipaddress/$netmask $gateway_ip $dns_ip\n";
 
        $step_number++;
        create_ack_view();
@@ -1690,11 +1678,9 @@ sub create_ack_view {
        __mailto__ => Proxmox::Install::Config::get_mailto(),
        __interface__ =>  Proxmox::Install::Config::get_mngmt_nic(),
        __hostname__ => Proxmox::Install::Config::get_hostname(),
-       __ip__ => $ipaddress,
-       __cidr__ => $cidr,
-       __netmask__ => $netmask,
-       __gateway__ => $gateway,
-       __dnsserver__ => $dnsserver,
+       __cidr__ => Proxmox::Install::Config::get_cidr(),
+       __gateway__ => Proxmox::Install::Config::get_gateway(),
+       __dnsserver__ => Proxmox::Install::Config::get_dns(),
     );
 
     while (my ($k, $v) = each %config_values) {
@@ -2792,7 +2778,10 @@ sub create_extract_view {
     my $success_transform = sub {
        my ($raw_html, $iso_env) = @_;
 
-       my $addr = $ipversion == 6 ? "[${ipaddress}]" : "$ipaddress";
+       my $ip_addr = Proxmox::Install::Config::get_ip_addr();
+       my $ip_version = Proxmox::Install::Config::get_ip_version();
+
+       my $addr = $ip_version == 6 ? "[${ip_addr}]" : "$ip_addr";
        $raw_html =~ s/__IPADDR__/$addr/g;
        $raw_html =~ s/__PORT__/$iso_env->{cfg}->{port}/g;