bump version to 5.0-14

[pve-installer.git] / proxinstall

diff --git a/proxinstall b/proxinstall
index c4b506c1be5b7ba489e4f94c6c35cc9b57466a91..bfa9e4b767e6f89787ad0415f22d8d49df50299d 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") {
@@ -1509,12 +1505,12 @@ _EOD
        write_config ('', "$targetdir/var/lib/apt/extended_states");
 
        # allow ssh root login
-       syscmd ("sed -i 's/^PermitRootLogin.*/PermitRootLogin yes/' '$targetdir/etc/ssh/sshd_config'");
+       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.cvd", "safebrowsing.cvd") {
+           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";
            }
@@ -1539,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");
@@ -1595,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') {