bump version to 5.0-13

[pve-installer.git] / proxinstall

diff --git a/proxinstall b/proxinstall
index 40923b582de859c1a6caac5d64eb9f5877a6cc3d..65b0188d22fabf588ac8b142799ba3e88907b607 100755 (executable)
--- a/proxinstall
+++ b/proxinstall
@@ -24,10 +24,6 @@ use ProxmoxInstallerSetup;
 
 my $setup = ProxmoxInstallerSetup::setup();
 
-
-my $kapi = `uname -r`;
-chomp $kapi;
-
 my $opt_testmode;
 
 if (!$ENV{G_SLICE} ||  $ENV{G_SLICE} ne "always-malloc") {
@@ -964,16 +960,18 @@ sub partition_bootable_zfs_disk {
 sub create_lvm_volumes {
     my ($lvmdev, $os_size, $swap_size) = @_;
 
-    my $rootdev = '/dev/pve/root';
-    my $datadev = '/dev/pve/data';
-    my $swapfile = '/dev/pve/swap';
+    my $vgname = $setup->{product};
+
+    my $rootdev = "/dev/$vgname/root";
+    my $datadev = "/dev/$vgname/data";
+    my $swapfile = "/dev/$vgname/swap";
 
     # we use --metadatasize 250k, which results in "pe_start = 512"
     # so pe_start is aligned on a 128k boundary (advantage for SSDs)
     syscmd ("/sbin/pvcreate --metadatasize 250k -y -ff $lvmdev") == 0 ||
        die "unable to initialize physical volume $lvmdev\n";
-    syscmd ("/sbin/vgcreate pve $lvmdev") == 0 ||
-       die "unable to create volume group 'pve'\n";
+    syscmd ("/sbin/vgcreate $vgname $lvmdev") == 0 ||
+       die "unable to create volume group '$vgname'\n";
 
     my $hdgb = int($os_size/(1024*1024));
     my $space = (($hdgb > 128) ? 16 : ($hdgb/8))*1024*1024;
@@ -1004,19 +1002,19 @@ sub create_lvm_volumes {
            $config_options->{maxvz}*1024*1024 : $rest;
     }
 
-    syscmd ("/sbin/lvcreate -L${swap_size}K -nswap pve") == 0 ||
+    syscmd ("/sbin/lvcreate -L${swap_size}K -nswap $vgname") == 0 ||
        die "unable to create swap volume\n";
 
-    syscmd ("/sbin/lvcreate -L${rootsize}K -nroot pve") == 0 ||
+    syscmd ("/sbin/lvcreate -L${rootsize}K -nroot $vgname") == 0 ||
        die "unable to create root volume\n";
 
-    syscmd ("/sbin/lvcreate -L${rest}K -ndata pve") == 0 ||
+    syscmd ("/sbin/lvcreate -L${rest}K -ndata $vgname") == 0 ||
        die "unable to create data volume\n";
 
-    syscmd ("/sbin/lvconvert --yes --type thin-pool pve/data") == 0 ||
+    syscmd ("/sbin/lvconvert --yes --type thin-pool $vgname/data") == 0 ||
        die "unable to create data thin-pool\n";
 
-    syscmd ("/sbin/vgchange -a y pve") == 0 ||
+    syscmd ("/sbin/vgchange -a y $vgname") == 0 ||
        die "unable to activate volume group\n";
 
     return ($rootdev, $datadev, $swapfile);
@@ -1249,12 +1247,15 @@ sub extract_data {
 
        mkdir "$targetdir/var";
        mkdir "$targetdir/var/lib";
-       mkdir "$targetdir/var/lib/vz";
-       mkdir "$targetdir/var/lib/pve";
 
-       if ($use_btrfs) {
-           syscmd("btrfs subvolume create $targetdir/var/lib/pve/local-btrfs") == 0 ||
-               die "unable to create btrfs subvolume\n";
+       if ($setup->{product} eq 'pve') {
+           mkdir "$targetdir/var/lib/vz";
+           mkdir "$targetdir/var/lib/pve";
+
+           if ($use_btrfs) {
+               syscmd("btrfs subvolume create $targetdir/var/lib/pve/local-btrfs") == 0 ||
+                   die "unable to create btrfs subvolume\n";
+           }
        }
 
        display_html ("extract2-rulesystem.htm");
@@ -1505,7 +1506,18 @@ _EOD
 
        # allow ssh root login
        syscmd ("sed -i 's/^PermitRootLogin.*/PermitRootLogin yes/' '$targetdir/etc/ssh/sshd_config'");
-       
+
+       if ($setup->{product} eq 'pmg') {
+           # install initial clamav DB
+           my $srcdir = "${proxmox_cddir}/proxmox/clamav";
+           foreach my $fn ("main.cvd", "bytecode.cvd", "daily.cld", "safebrowsing.cvd") {
+               syscmd ("cp \"$srcdir/$fn\" \"$targetdir/var/lib/clamav\"") == 0 ||
+                   die "installation of clamav db file '$fn' failed\n";
+           }
+           syscmd("chroot $targetdir /bin/chown clamav:clamav -R /var/lib/clamav") == 0 ||
+               die "unable to set owner for clamav database files\n";
+       }
+
        if ($setup->{product} eq 'pve') {
            # save installer settings
            my $ucc = uc ($country);
@@ -1523,6 +1535,15 @@ _EOD
        diversion_remove ($targetdir, "/usr/sbin/update-grub");
        diversion_remove ($targetdir, "/usr/sbin/update-initramfs");
 
+       my $kapi;
+       foreach my $fn (<$targetdir/lib/modules/*>) {
+           if ($fn =~ m!/(\d+\.\d+\.\d+-\d+-pve)$!) {
+               die "found multiple kernels\n" if defined($kapi);
+               $kapi = $1;
+           }
+       }
+       die "unable to detect kernel version\n" if !defined($kapi);
+
        if (!$opt_testmode) {
 
            unlink ("$targetdir/etc/mtab");
@@ -1579,10 +1600,9 @@ _EOD
                     "root:$octets\n");
 
        if ($setup->{product} eq 'pmg') {
-           mkdir "/etc/pmg";
            # save admin email
-           write_config ("#Unix Superuser\nroot:1:0::root:${mailto}:::\n",
-                         "/etc/pmg/user.conf");
+           write_config ("section: admin\n\temail ${mailto}\n",
+                         "$targetdir/etc/pmg/pmg.conf");
 
        } elsif ($setup->{product} eq 'pve') {