unconfigured: mount /dev/shm as tmpfs inside chroot

[pve-installer.git] / proxinstall

diff --git a/proxinstall b/proxinstall
index 5053d0636a5759ad8c3169f5120408ab2a72daf6..fc6b2061c38ffe1033d184f291036aa3e25daf17 100755 (executable)
--- a/proxinstall
+++ b/proxinstall
@@ -691,6 +691,9 @@ sub get_partition_dev {
 
     if ($dev =~ m|^/dev/sd([a-h]?[a-z]\|i[a-v])$|) {
        return "${dev}$partnum";
+    } elsif ($dev =~ m|^/dev/xvd[a-z]$|) {
+       # Citrix Hypervisor blockdev
+       return "${dev}$partnum";
     } elsif ($dev =~ m|^/dev/[hxev]d[a-z]$|) {
        return "${dev}$partnum";
     } elsif ($dev =~ m|^/dev/[^/]+/c\d+d\d+$|) {
@@ -2023,7 +2026,11 @@ sub create_ipconf_view {
 
     my $device_change_handler = sub {
        my $current = shift;
-       $ipconf->{selected} = $device_active_map->{$current->get_active()};
+
+       my $new = $device_active_map->{$current->get_active()};
+       return if $new eq $ipconf->{selected};
+
+       $ipconf->{selected} = $new;
        my $iface = $ipconf->{ifaces}->{$ipconf->{selected}};
        $config->{mngmt_nic} = $iface->{name};
        $ipconf_entry_addr->set_text($iface->{inet}->{addr} || $iface->{inet6}->{addr})
@@ -3031,6 +3038,7 @@ sub get_btrfs_raid_setup {
     return ($devlist, $mode);
 }
 
+my $last_hd_selected = 0;
 sub create_hdsel_view {
 
     $prev_btn->set_sensitive(1); # enable previous button at this point
@@ -3061,10 +3069,11 @@ sub create_hdsel_view {
        $target_hd_combo->set_visible(0);
        $target_hd_combo->set_no_show_all(1);
     }
-    $target_hd_combo->set_active($config_options->{chosen_hd} // 0);
+    $target_hd_combo->set_active($last_hd_selected);
     $target_hd_combo->signal_connect(changed => sub {
        $a = shift->get_active;
        my ($disk, $devname) = @{@$hds[$a]};
+       $last_hd_selected = $a;
        $target_hd = $devname;
     });