ack template: s/Disk/Disk(s)/

[pve-installer.git] / proxinstall

diff --git a/proxinstall b/proxinstall
index ae4d1fed2d10bc096c477408f5f54b71c8e8ae46..6d30a807a454a7d737f8e5594ca4d2804ce5d14c 100755 (executable)
--- a/proxinstall
+++ b/proxinstall
@@ -2196,7 +2196,7 @@ sub create_ack_view {
     my $html_data = file_get_contents($ack_template);
 
     my %config_values = (
-       __target_hd__ => $target_hd,
+       __target_hd__ => join(' | ', @{$config_options->{target_hds}}),
        __target_fs__ => $config_options->{filesys},
        __country__ => $cmap->{country}->{$country}->{name},
        __timezone__ => $timezone,
@@ -3075,28 +3075,27 @@ sub create_hdsel_view {
 
     set_next(undef, sub {
 
+       my $devlist;
        if ($config_options->{filesys} =~ m/zfs/) {
-           eval { get_zfs_raid_setup(); };
+           my ($devlist) = eval { get_zfs_raid_setup() };
            if (my $err = $@) {
-               display_message("Warning: $err\n" .
-                               "Please fix ZFS setup first.");
-           } else {
-               $step_number++;
-               create_country_view();
+               display_message("Warning: $err\nPlease fix ZFS setup first.");
+               return;
            }
+           $config_options->{target_hds} = [ map { $_->[1] } @$devlist ];
        } elsif ($config_options->{filesys} =~ m/btrfs/) {
-           eval { get_btrfs_raid_setup(); };
+           my ($devlist) = eval { get_btrfs_raid_setup() };
            if (my $err = $@) {
-               display_message("Warning: $err\n" .
-                               "Please fix BTRFS setup first.");
-           } else {
-               $step_number++;
-               create_country_view();
+               display_message("Warning: $err\nPlease fix BTRFS setup first.");
+               return;
            }
+           $config_options->{target_hds} = [ map { $_->[1] } @$devlist ];
        } else {
-           $step_number++;
-           create_country_view();
+           $config_options->{target_hds} = [ $target_hd ];
        }
+
+       $step_number++;
+       create_country_view();
     });
 }