fix typo: s/virtualisation/virtualization/

[pve-installer.git] / proxinstall

diff --git a/proxinstall b/proxinstall
index 0cd8b5f4ad5e841afee7cd99c05e0e5e795fe966..db49d8d3993954897a6de83da2ae8f17e504e58d 100755 (executable)
--- a/proxinstall
+++ b/proxinstall
@@ -900,6 +900,7 @@ my $clean_disk = sub {
        next if $part eq $disk;
        next if $part !~ /^\Q$disk\E/;
        eval { syscmd("pvremove -ff -y $part"); };
+       eval { syscmd("zpool labelclear -f $part"); };
        eval { syscmd("dd if=/dev/zero of=$part bs=1M count=16"); };
     }
 };
@@ -1094,8 +1095,6 @@ sub prepare_systemd_boot_esp {
        die "unable to install systemd-boot loader\n";
     write_config("timeout 3\ndefault proxmox-*\n",
        "$targetdir/$espmp/loader/loader.conf");
-    syscmd("chroot $targetdir /etc/kernel/postinst.d/zz-pve-efiboot") == 0 ||
-       die "unable to generate systemd-boot config\n";
 
     syscmd("umount $targetdir/$espmp") == 0 ||
        die "unable to umount ESP $targetdir/$espmp\n";
@@ -1251,11 +1250,8 @@ sub extract_data {
                my $devname = $di->{devname};
                $di->{by_id} = find_stable_path ("/dev/disk/by-id", $devname);
 
-               # Note: using /dev/disk/by-id/ does not work for unknown reason, we get
-               # cannot create 'rpool': no such pool or dataset
-               #my $osdev = find_stable_path ("/dev/disk/by-id", $di->{osdev}) || $di->{osdev};
+               my $osdev = find_stable_path ("/dev/disk/by-id", $di->{osdev}) || $di->{osdev};
 
-               my $osdev = $di->{osdev};
                $vdev =~ s/ $devname/ $osdev/;
            }
 
@@ -1658,6 +1654,11 @@ _EOD
            syscmd("chroot $targetdir /usr/sbin/update-grub") == 0 ||
                die "unable to update boot loader config\n";
 
+           if ($use_zfs && $boot_type eq 'efi') {
+               syscmd("chroot $targetdir /etc/kernel/postinst.d/zz-pve-efiboot") == 0 ||
+                   die "unable to generate systemd-boot config\n";
+           }
+
            syscmd("umount $targetdir/dev");
        }
 
@@ -3235,7 +3236,7 @@ sub create_intro_view {
        eval {
            my $cpuinfo = file_get_contents('/proc/cpuinfo');
            if ($cpuinfo && !($cpuinfo =~ /^flags\s*:.*(vmx|svm)/m)) {
-               display_error("No support for KVM virtualisation detected.\n\n" .
+               display_error("No support for KVM virtualization detected.\n\n" .
                              "Check BIOS settings for Intel VT / AMD-V / SVM.")
            }
        };