fix #1853: spelling errors

[pve-installer.git] / proxinstall

diff --git a/proxinstall b/proxinstall
index c6f65b46f73a05cefa018150e5f42453b9718256..8a1476b23bef2bcf535850a38ff74ca5f0d65ecf 100755 (executable)
--- a/proxinstall
+++ b/proxinstall
@@ -72,6 +72,11 @@ lvmthin: local-lvm
        content rootdir,images
 __EOD__
 
+my $storage_cfg_local = <<__EOD__;
+dir: local
+       path /var/lib/vz
+       content iso,vztmpl,backup,rootdir,images
+__EOD__
 
 sub file_read_firstline {
     my ($filename) = @_;
@@ -618,7 +623,9 @@ sub hd_size {
 sub get_partition_dev {
     my ($dev, $partnum) = @_;
 
-    if ($dev =~ m|^/dev/[hxsev]d[a-z]$|) {
+    if ($dev =~ m|^/dev/sd([a-h]?[a-z]\|i[a-v])$|) {
+       return "${dev}$partnum";
+    } elsif ($dev =~ m|^/dev/[hxev]d[a-z]$|) {
        return "${dev}$partnum";
     } elsif ($dev =~ m|^/dev/[^/]+/c\d+d\d+$|) {
        return "${dev}p$partnum";
@@ -1089,6 +1096,7 @@ sub extract_data {
 
     my $swapfile;
     my $rootdev;
+    my $datadev;
 
     my $use_zfs = 0;
     my $use_btrfs = 0;
@@ -1231,7 +1239,7 @@ sub extract_data {
                                  osdev => $osdev, by_id => $by_id };
 
            my $swap_size = compute_swapsize($os_size);
-           ($rootdev, $swapfile) =
+           ($rootdev, $swapfile, $datadev) =
                create_lvm_volumes($osdev, $os_size, $swap_size);
 
            # trigger udev to create /dev/disk/by-uuid
@@ -1654,13 +1662,15 @@ _EOD
                          "$tmpdir/user.cfg");
 
            # write storage.cfg
-           my $strorage_cfg_fn = "$tmpdir/storage.cfg";
+           my $storage_cfg_fn = "$tmpdir/storage.cfg";
            if ($use_zfs) {
-               write_config ($storage_cfg_zfs, $strorage_cfg_fn);
+               write_config ($storage_cfg_zfs, $storage_cfg_fn);
            } elsif ($use_btrfs) {
-               write_config ($storage_cfg_btrfs, $strorage_cfg_fn);
+               write_config ($storage_cfg_btrfs, $storage_cfg_fn);
+           } elsif ($datadev) {
+               write_config ($storage_cfg_lvmthin, $storage_cfg_fn);
            } else {
-               write_config ($storage_cfg_lvmthin, $strorage_cfg_fn);
+               write_config ($storage_cfg_local, $storage_cfg_fn);
            }
 
            run_command("chroot $targetdir /usr/bin/create_pmxcfs_db /tmp/pve /var/lib/pve-cluster/config.db");