X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=proxinstall;h=d6b96b392d255b1f8595b699fe5e8a6754f8ba67;hb=2ba9752e99ac09946ec267a5121d93c197f52159;hp=d9256aff5e7557e472c1e41785e0885324311e4e;hpb=991ec37f168aecdab35cec2c4bab4fc0b2663234;p=pve-installer.git

diff --git a/proxinstall b/proxinstall
index d9256af..d6b96b3 100755
--- a/proxinstall
+++ b/proxinstall
@@ -1,9 +1,11 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 $ENV{DEBIAN_FRONTEND} = 'noninteractive';
 $ENV{LC_ALL} = 'C';
 
 use strict;
+use warnings;
+
 use Getopt::Long;
 use IPC::Open2;
 use IPC::Open3;
@@ -18,12 +20,9 @@ use Data::Dumper;
 use File::Basename;
 use Time::HiRes;
 
-my $release = '4.4';
-
-my $kapi = `uname -r`;
-chomp $kapi;
+use ProxmoxInstallerSetup;
 
-my $enable_btrfs = 0;
+my $setup = ProxmoxInstallerSetup::setup();
 
 my $opt_testmode;
 
@@ -38,6 +37,7 @@ if (!GetOptions ('testmode=s' => \$opt_testmode)) {
 
 my $zfstestpool = "test_rpool";
 my $zfspoolname = $opt_testmode ? $zfstestpool : 'rpool';
+my $zfsrootvolname = "$setup->{product}-1";
 
 my $storage_cfg_zfs = <<__EOD__;
 dir: local
@@ -86,11 +86,14 @@ sub file_read_firstline {
 
 my $logfd = IO::File->new (">/tmp/install.log");
 
-my $proxmox_dir = $opt_testmode ? Cwd::cwd() : "/var/lib/pve-installer";
+my $proxmox_libdir = $opt_testmode ?
+    Cwd::cwd() . "/testdir/var/lib/pve-installer" : "/var/lib/pve-installer";
+my $proxmox_cddir = $opt_testmode ? "../pve-cd-builder/tmp/data-gz/" : "/cdrom";
+my $proxmox_pkgdir = "${proxmox_cddir}/proxmox/packages/";
 
 my $grub_plattform = "pc"; # pc, efi-amd64 or efi-ia32
 
-$grub_plattform = "efi-amd64" if -d "/sys/firmware/efi"; 
+$grub_plattform = "efi-amd64" if -d "/sys/firmware/efi";
 
 my $IPV4OCTET = "(?:25[0-5]|(?:2[0-4]|1[0-9]|[1-9])?[0-9])";
 my $IPV4RE = "(?:(?:$IPV4OCTET\\.){3}$IPV4OCTET)";
@@ -141,7 +144,9 @@ my $ipv4_mask_hash = {
     '255.255.255.224' => 27,
     '255.255.255.240' => 28,
     '255.255.255.248' => 29,
-    '255.255.255.252' => 30
+    '255.255.255.252' => 30,
+    '255.255.255.254' => 31,
+    '255.255.255.255' => 32
 };
 
 my $ipv4_reverse_mask = [
@@ -223,9 +228,11 @@ if ($cmdline =~ m/maxroot=(\d+(\.\d+)?)[\s\n]/i) {
 if ($cmdline =~ m/minfree=(\d+(\.\d+)?)[\s\n]/i) {
     $config_options->{minfree} = $1;
 }
- 
-if ($cmdline =~ m/maxvz=(\d+(\.\d+)?)[\s\n]/i) {
-    $config_options->{maxvz} = $1;
+
+if ($setup->{product} eq 'pve') {
+    if ($cmdline =~ m/maxvz=(\d+(\.\d+)?)[\s\n]/i) {
+	$config_options->{maxvz} = $1;
+    }
 }
 
 my $postfix_main_cf = <<_EOD;
@@ -379,10 +386,12 @@ sub run_command {
 
     return $? if $noout; # behave like standard system();
 
-    my $ec = ($? >> 8);
-
-    if ($ec) {
-	die "command '$cmdstr' failed with exit code $ec";
+    if ($? == -1) {
+	die "command '$cmdstr' failed to execute\n";
+    } elsif (my $sig = ($? & 127)) {
+	die "command '$cmdstr' failed - got signal $sig\n";
+    } elsif (my $exitcode = ($? >> 8)) {
+	die "command '$cmdstr' failed with exit code $exitcode";
     }
 
     return $ostream;
@@ -534,8 +543,7 @@ sub hd_list {
 }
 
 sub read_cmap {
-    my $countryfn = $opt_testmode ? "/usr/share/pve-manager/country.dat" :
-	"/cdrom/proxmox/country.dat";
+    my $countryfn = "${proxmox_libdir}/country.dat";
     open (TMP, "<$countryfn") || die "unable to open '$countryfn' - $!\n";
     my $line;
     my $country = {};
@@ -660,6 +668,8 @@ sub update_progress {
     $progress->set_text (sprintf ("%d%%", int ($res*100)));
     $progress_status->set_text ($text) if defined ($text);
 
+    display_info() if $res < 0.9;
+
     Gtk3::main_iteration() while Gtk3::events_pending();
 }
 
@@ -694,7 +704,7 @@ sub create_filesystem {
 
     my $fsdata = $fssetup->{$type} || die "internal error - unknown file system '$type'";
     my $opts = $name eq 'root' ? $fsdata->{mkfs_root_opt} : $fsdata->{mkfs_data_opt};
-    
+
     update_progress (0, $rs, $re, "creating $name filesystem");
 
     run_command ("$fsdata->{mkfs} $opts $dev", sub {
@@ -771,14 +781,16 @@ sub zfs_create_rpool {
 
     syscmd ("zfs create $zfspoolname/ROOT")  == 0 ||
 	die "unable to create zfs $zfspoolname/ROOT volume\n";
-    
-    syscmd ("zfs create $zfspoolname/data")  == 0 ||
-	die "unable to create zfs $zfspoolname/data volume\n";
 
-    syscmd ("zfs create $zfspoolname/ROOT/pve-1")  == 0 ||
-	die "unable to create zfs $zfspoolname/ROOT/pve-1 volume\n";
+    if ($setup->{product} eq 'pve') {
+	syscmd ("zfs create $zfspoolname/data")  == 0 ||
+	    die "unable to create zfs $zfspoolname/data volume\n";
+    }
 
-    # disable atime during insatll
+    syscmd ("zfs create $zfspoolname/ROOT/$zfsrootvolname")  == 0 ||
+	die "unable to create zfs $zfspoolname/ROOT/$zfsrootvolname volume\n";
+
+    # disable atime during install
     syscmd ("zfs set atime=off $zfspoolname") == 0 ||
 	die "unable to set zfs properties\n";
 
@@ -825,6 +837,28 @@ sub zfs_create_swap {
     return "/dev/zvol/$zfspoolname/swap";
 }
 
+my $udevadm_trigger_block = sub {
+    my ($nowait) = @_;
+
+    sleep(1) if !$nowait; # give kernel time to reread part table
+
+    # trigger udev to create /dev/disk/by-uuid
+    syscmd ("udevadm trigger --subsystem-match block");
+    syscmd ("udevadm settle --timeout 10");
+};
+
+my $clean_disk = sub {
+    my ($disk) = @_;
+
+    my $partitions = `lsblk --output kname --noheadings --path --list $disk`;
+    foreach my $part (split "\n", $partitions) {
+	next if $part eq $disk;
+	next if $part !~ /^\Q$disk\E/;
+	eval { syscmd("pvremove -ff -y $part"); };
+	eval { syscmd("dd if=/dev/zero of=$part bs=1M count=16"); };
+    }
+};
+
 sub partition_bootable_disk {
     my ($target_dev, $maxhdsize, $ptype) = @_;
 
@@ -871,12 +905,18 @@ sub partition_bootable_disk {
     syscmd($pcmd) == 0 ||
 	die "unable to partition harddisk '${target_dev}'\n";
 
+    &$udevadm_trigger_block();
+
+    foreach my $part ($efibootdev, $osdev) {
+	syscmd("dd if=/dev/zero of=$part bs=1M count=256") if -b $part;
+    }
+
     return ($os_size, $osdev, $efibootdev);
 }
 
 # ZFS has this use_whole_disk concept, so we try to partition the same
 # way as zfs does by default. There is room at start of disk to insert
-# a grub boot partition. But adding a EFI ESP is not possible.  
+# a grub boot partition. But adding a EFI ESP is not possible.
 #
 # Note: zfs people think this is just a waste of space an not
 # required.  Instead, you should put the ESP on another disk (log,
@@ -893,7 +933,7 @@ sub partition_bootable_zfs_disk {
     my $hdgb = int($hdsize/(1024*1024));
     die "hardisk '$target_dev' too small (${hdsize}GB)\n" if $hdgb < 8;
 
-    # 1 - GRUB boot partition: 1M 
+    # 1 - GRUB boot partition: 1M
     # 2 - OS/Data partition
     # 9 - ZFS reserved partition
 
@@ -910,76 +950,112 @@ sub partition_bootable_zfs_disk {
 
     $pnum = 2;
     push @$pcmd, "-n$pnum:2048:0", "-t$pnum:BF01", '-c', "$pnum:zfs";
-   
+
     push @$pcmd, $target_dev;
-	
+
     my $os_size = $hdsize - 1024 - 1024*8;
 
     syscmd($pcmd) == 0 ||
 	die "unable to partition harddisk '${target_dev}'\n";
 
+    &$udevadm_trigger_block();
+
+    syscmd("dd if=/dev/zero of=$osdev bs=1M count=16") if -b $osdev;
+
     return ($os_size, $osdev);
 }
 
 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};
 
-    # we use --metadatasize 250k, which reseults in "pe_start = 512"
+    my $rootdev = "/dev/$vgname/root";
+    my $datadev = "/dev/$vgname/data";
+    my $swapfile;
+
+    # 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;
 
-    my $maxroot;
-    if ($config_options->{maxroot}) {
-	$maxroot = $config_options->{maxroot};
-    } else {
-	$maxroot = 96;
-    }
+    my $rootsize;
+    my $datasize;
+
+    if ($setup->{product} eq 'pve') {
+
+	my $maxroot;
+	if ($config_options->{maxroot}) {
+	    $maxroot = $config_options->{maxroot};
+	} else {
+	    $maxroot = 96;
+	}
+
+	$rootsize = (($hdgb > ($maxroot*4)) ? $maxroot : $hdgb/4)*1024*1024;
+
+	my $rest = $os_size - $swap_size - $rootsize; # in KB
 
-    my $rootsize = (($hdgb > ($maxroot*4)) ? $maxroot : $hdgb/4)*1024*1024;
+	my $minfree;
+	if ($config_options->{minfree}) {
+	    $minfree = (($config_options->{minfree}*1024*1024) >= $rest ) ? $space :
+		$config_options->{minfree}*1024*1024 ;
+	} else {
+	    $minfree = $space;
+	}
+
+	$rest = $rest - $minfree;
+
+	if (defined($config_options->{maxvz})) {
+	    $rest = (($config_options->{maxvz}*1024*1024) <= $rest) ?
+		$config_options->{maxvz}*1024*1024 : $rest;
+	}
 
-    my $rest = $os_size - $swap_size - $rootsize; # in KB
+	$datasize = $rest;
 
-    my $minfree;
-    if ($config_options->{minfree}) {
-	$minfree = (($config_options->{minfree}*1024*1024) >= $rest ) ? $space : 
-	    $config_options->{minfree}*1024*1024 ;
     } else {
-	$minfree = $space;
+	my $minfree = $config_options->{minfree} ? $config_options->{minfree}*1024*1024 : $space;
+	$rootsize = $os_size - $minfree - $swap_size; # in KB
     }
 
-    $rest = $rest - $minfree;
+    if ($swap_size) {
+	syscmd ("/sbin/lvcreate -L${swap_size}K -nswap $vgname") == 0 ||
+	    die "unable to create swap volume\n";
 
-    if ($config_options->{maxvz}) {
-	$rest = (($config_options->{maxvz}*1024*1024) <= $rest) ? 
-	    $config_options->{maxvz}*1024*1024 : $rest;
+	$swapfile = "/dev/$vgname/swap";
     }
 
-    syscmd ("/sbin/lvcreate -L${swap_size}K -nswap pve") == 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 ||
-	die "unable to create data volume\n";
+    if ($datasize > 4*1024*1024) {
+	my $metadatasize = $datasize/100; # default 1% of data
+	$metadatasize = 1024*1024 if $metadatasize < 1024*1024; # but at least 1G
+	$metadatasize = 16*1024*1024 if $metadatasize > 16*1024*1024; # but at most 16G
+
+	# otherwise the metadata is taken out of $minfree
+	$datasize -= 2*$metadatasize;
+
+	# 1 4MB PE to allow for rounding
+	$datasize -= 4*1024;
 
-    syscmd ("/sbin/lvconvert --yes --type thin-pool pve/data") == 0 ||
-	die "unable to create data thin-pool\n";
+	syscmd ("/sbin/lvcreate -L${datasize}K -ndata $vgname") == 0 ||
+	    die "unable to create data volume\n";
+
+	syscmd ("/sbin/lvconvert --yes --type thin-pool --poolmetadatasize ${metadatasize}K $vgname/data") == 0 ||
+	    die "unable to create data thin-pool\n";
+    } else {
+	$datadev = undef;
+    }
 
-    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);
+    return ($rootdev, $swapfile, $datadev);
 }
 
 sub compute_swapsize {
@@ -988,7 +1064,7 @@ sub compute_swapsize {
     my $hdgb = int($hdsize/(1024*1024));
 
     my $swapsize;
-    if ($config_options->{swapsize}) {
+    if (defined($config_options->{swapsize})) {
 	$swapsize = $config_options->{swapsize}*1024*1024;
     } else {
 	my $ss = int ($total_memory / 1024);
@@ -1001,15 +1077,6 @@ sub compute_swapsize {
     return $swapsize;
 }
 
-my $udevadm_trigger_block = sub {
-    my ($nowait) = @_;
-
-    sleep(1) if !$nowait; # give kernel time to reread part table
-
-    # trigger udev to create /dev/disk/by-uuid
-    syscmd ("udevadm trigger --subsystem-match block");
-    syscmd ("udevadm settle --timeout 10");
-};
 
 sub extract_data {
     my ($basefile, $targetdir) = @_;
@@ -1020,7 +1087,6 @@ sub extract_data {
 
     my $bootdevinfo = [];
 
-    my $datadev;
     my $swapfile;
     my $rootdev;
 
@@ -1032,12 +1098,12 @@ sub extract_data {
     if ($filesys =~ m/zfs/) {
 	$target_hd = undef; # do not use this config
 	$use_zfs = 1;
-	$targetdir = "/$zfspoolname/ROOT/pve-1";
+	$targetdir = "/$zfspoolname/ROOT/$zfsrootvolname";
     } elsif ($filesys =~ m/btrfs/) {
 	$target_hd = undef; # do not use this config
 	$use_btrfs = 1;
     }
-    
+
     if ($use_zfs) {
 	my $i;
 	for ($i = 5; $i > 0; $i--) {
@@ -1056,6 +1122,8 @@ sub extract_data {
 
 	update_progress (0, 0, $maxper, "create partitions");
 
+	syscmd("vgchange -an") if !$opt_testmode; # deactivate all detected VGs
+
 	if ($opt_testmode) {
 
 	    $rootdev = abs_path($opt_testmode);
@@ -1063,7 +1131,7 @@ sub extract_data {
 
 	    if ($use_btrfs) {
 
-		die "unsupported btrfs mode (for testing environment)\n" 
+		die "unsupported btrfs mode (for testing environment)\n"
 		    if $filesys ne 'btrfs (RAID0)';
 
 		btrfs_create([$rootdev], 'single');
@@ -1076,7 +1144,7 @@ sub extract_data {
 		syscmd ("zpool destroy $zfstestpool");
 
 		zfs_create_rpool($rootdev);
-	    
+
 	    } else {
 
 		# nothing to do
@@ -1089,6 +1157,7 @@ sub extract_data {
 	    my $disksize;
 	    foreach my $hd (@$devlist) {
 		my $devname = @$hd[1];
+		&$clean_disk($devname);
 		my ($size, $osdev, $efidev) =
 		    partition_bootable_disk($devname, undef, '8300');
 		$rootdev = $osdev if !defined($rootdev); # simply point to first disk
@@ -1108,6 +1177,9 @@ sub extract_data {
 	    my ($devlist, $bootdevlist, $vdev) = get_zfs_raid_setup();
 
 	    my $disksize;
+	    foreach my $hd (@$devlist) {
+		&$clean_disk(@$hd[1]);
+	    }
 	    foreach my $hd (@$bootdevlist) {
 		my $devname = @$hd[1];
 		my ($size, $osdev) =
@@ -1122,7 +1194,7 @@ sub extract_data {
 	    foreach my $di (@$bootdevinfo) {
 		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};
@@ -1132,9 +1204,9 @@ sub extract_data {
 	    }
 
 	    zfs_create_rpool($vdev);
-	    
+
 	    my $swap_size = compute_swapsize($disksize);
-	    $swapfile = zfs_create_swap($swap_size);
+	    $swapfile = zfs_create_swap($swap_size) if $swap_size;
 
 	} else {
 
@@ -1146,18 +1218,20 @@ sub extract_data {
 		$maxhdsize = $config_options->{hdsize}*1024*1024;
 	    }
 
-	    my ($os_size, $osdev, $efidev); 
-	    ($os_size, $osdev, $efidev) = 
+	    &$clean_disk($target_hd);
+
+	    my ($os_size, $osdev, $efidev);
+	    ($os_size, $osdev, $efidev) =
 		partition_bootable_disk($target_hd, $maxhdsize, '8E00');
 
 	    &$udevadm_trigger_block();
 
 	    my $by_id = find_stable_path ("/dev/disk/by-id", $target_hd);
-	    push @$bootdevinfo, { esp => $efidev, devname => $target_hd, 
+	    push @$bootdevinfo, { esp => $efidev, devname => $target_hd,
 				  osdev => $osdev, by_id => $by_id };
 
 	    my $swap_size = compute_swapsize($os_size);
-	    ($rootdev, $datadev, $swapfile) = 
+	    ($rootdev, $swapfile) =
 		create_lvm_volumes($osdev, $os_size, $swap_size);
 
 	    # trigger udev to create /dev/disk/by-uuid
@@ -1180,7 +1254,7 @@ sub extract_data {
 
 	foreach my $di (@$bootdevinfo) {
 	    next if !$di->{esp};
-	    syscmd ("mkfs.vfat -F32 $di->{esp}") == 0 || 
+	    syscmd ("mkfs.vfat -F32 $di->{esp}") == 0 ||
 		die "unable to initialize EFI ESP on device $di->{esp}\n";
 	}
 
@@ -1196,11 +1270,12 @@ sub extract_data {
 
 	if ($use_zfs) {
 	    # do nothing
-	} elsif ($use_btrfs) {
-	    syscmd("mount -n $rootdev -o noatime,nobarrier $targetdir") == 0 ||
-		die "unable to mount $rootdev\n";
 	} else {
-	    syscmd ("mount -n $rootdev -o noatime,barrier=0 $targetdir") == 0 ||
+	    my $mount_opts = 'noatime';
+	    $mount_opts .= ',nobarrier'
+		if $use_btrfs || $filesys =~ /^ext\d$/;
+
+	    syscmd("mount -n $rootdev -o $mount_opts $targetdir") == 0 ||
 		die "unable to mount $rootdev\n";
 	}
 
@@ -1209,26 +1284,24 @@ 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");
 	update_progress (1, 0.05, $maxper, "extracting base system");
 
 	my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size) = stat ($basefile);
 	$ino || die "unable to open file '$basefile' - $!\n";
 
-	my $files;
-	if ($opt_testmode) {
-	    $files = file_read_firstline("/pve/$release/install/pve-base.cnt");
-	} else {
-	    $files = file_read_firstline("/cdrom/proxmox/pve-base.cnt");
-	}
+	my $files = file_read_firstline("${proxmox_cddir}/proxmox/$setup->{product}-base.cnt") ||
+	    die "unable to read base file count\n";
 
 	my $per = 0;
 	my $count = 0;
@@ -1252,7 +1325,6 @@ sub extract_data {
 	syscmd ("mount -n -t sysfs sysfs $targetdir/sys") == 0 ||
 	    die "unable to mount sysfs on $targetdir/sys\n";
 
-	display_html ("extract3-spam.htm");
 	update_progress (1, $maxper, 0.5, "configuring base system");
 
 	# configure hosts
@@ -1280,22 +1352,30 @@ sub extract_data {
 
 	my $ntype = $ipversion == 4 ? 'inet' : 'inet6';
 
-	my $bridge_port = $ipconf->{ifaces}->{$ipconf->{selected}}->{name};
+	my $ethdev = $ipconf->{ifaces}->{$ipconf->{selected}}->{name};
 
-	$ifaces .= "iface $bridge_port $ntype manual\n";
+	if ($setup->{bridged_network}) {
+	    $ifaces .= "iface $ethdev $ntype manual\n";
 
-	 $ifaces .=
-	     "\nauto vmbr0\niface vmbr0 $ntype static\n" .
-	     "\taddress $ipaddress\n" .
-	     "\tnetmask $netmask\n" .
-	     "\tgateway $gateway\n" .
-	     "\tbridge_ports $bridge_port\n" .
-	     "\tbridge_stp off\n" .
-	     "\tbridge_fd 0\n";
+	    $ifaces .=
+		"\nauto vmbr0\niface vmbr0 $ntype static\n" .
+		"\taddress $ipaddress\n" .
+		"\tnetmask $netmask\n" .
+		"\tgateway $gateway\n" .
+		"\tbridge_ports $ethdev\n" .
+		"\tbridge_stp off\n" .
+		"\tbridge_fd 0\n";
+	} else {
+	    $ifaces .= "auto $ethdev\n" .
+		"iface $ethdev $ntype static\n" .
+		"\taddress $ipaddress\n" .
+		"\tnetmask $netmask\n" .
+		"\tgateway $gateway\n";
+	}
 
 	foreach my $iface (sort keys %{$ipconf->{ifaces}}) {
 	    my $name = $ipconf->{ifaces}->{$iface}->{name};
-	    next if $name eq $bridge_port;
+	    next if $name eq $ethdev;
 
 	    $ifaces .= "\niface $name $ntype manual\n";
 	}
@@ -1344,7 +1424,7 @@ sub extract_data {
 		    if (my $uuid = find_dev_by_uuid ($di->{esp})) {
 			$efi_boot_uuid = "UUID=$uuid";
 		    }
-	    
+
 		    $fstab .= "${efi_boot_uuid} /boot/efi vfat defaults 0 1\n";
 		}
 	    }
@@ -1358,10 +1438,10 @@ sub extract_data {
 	write_config ($fstab, "$targetdir/etc/fstab");
 	write_config ("", "$targetdir/etc/mtab");
 
-	syscmd ("cp ${proxmox_dir}/policy-disable-rc.d " .
+	syscmd ("cp ${proxmox_libdir}/policy-disable-rc.d " .
 		"$targetdir/usr/sbin/policy-rc.d") == 0 ||
 		die "unable to copy policy-rc.d\n";
-	syscmd ("cp ${proxmox_dir}/fake-start-stop-daemon " .
+	syscmd ("cp ${proxmox_libdir}/fake-start-stop-daemon " .
 		"$targetdir/sbin/") == 0 ||
 		die "unable to copy start-stop-daemon\n";
 
@@ -1377,31 +1457,31 @@ sub extract_data {
 	    $grub_install_devices_txt .= $di->{by_id} || $di->{devname};
 	}
 
-	# Note: debian-installer/locale is used by console-setup
-	
+	# Note: keyboard-configuration/xbkb-keymap is used by console-setup
+	my $xkmap = $cmap->{kmap}->{$keymap}->{x11} // 'us';
+
 	debconfig_set ($targetdir, <<_EOD);
 locales locales/default_environment_locale select en_US.UTF-8
 locales locales/locales_to_be_generated select en_US.UTF-8 UTF-8
 samba-common samba-common/dhcp boolean false
 samba-common samba-common/workgroup string WORKGROUP
-postfix postfix/main_mailer_type select Local only
-keyboard-configuration keyboard-configuration/xkb-keymap select $keymap
+postfix postfix/main_mailer_type select No configuration
+keyboard-configuration keyboard-configuration/xkb-keymap select $xkmap
 d-i debian-installer/locale select en_US.UTF-8
 grub-pc grub-pc/install_devices select $grub_install_devices_txt
 _EOD
 
-	my $pkgdir = $opt_testmode ? "packages" : "/cdrom/proxmox/packages";
 	my $pkg_count = 0;
-	while (<$pkgdir/*.deb>) { $pkg_count++ };
+	while (<${proxmox_pkgdir}/*.deb>) { $pkg_count++ };
 
 	# btrfs/dpkg is extremely slow without --force-unsafe-io
 	my $dpkg_opts = $use_btrfs ? "--force-unsafe-io" : "";
 
 	$count = 0;
-	while (<$pkgdir/*.deb>) {
+	while (<${proxmox_pkgdir}/*.deb>) {
 	    chomp;
 	    my $path = $_;
-	    my ($deb) = $path =~ m/$pkgdir\/(.*\.deb)/;
+	    my ($deb) = $path =~ m/${proxmox_pkgdir}\/(.*\.deb)/;
 #	    if ($deb =~ m/^grub-efi-/ && $deb !~ m/^grub-${grub_plattform}/) {
 #		$count++;
 #		next;
@@ -1415,7 +1495,8 @@ _EOD
 	    update_progress ((++$count)/$pkg_count, 0.5, 0.75);
 	}
 
-	display_html ("extract4-virus.htm");
+	# needed for postfix postinst in case no other NIC is active
+	syscmd("chroot $targetdir ifup lo");
 
 	my $cmd = "chroot $targetdir dpkg $dpkg_opts --force-confold --configure -a";
 	$count = 0;
@@ -1427,10 +1508,6 @@ _EOD
 	    }
 	});
 
-	debconfig_set ($targetdir, <<_EOD);
-postfix postfix/main_mailer_type select No configuration
-_EOD
-
 	unlink "$targetdir/etc/mailname";
 	$postfix_main_cf =~ s/__FQDN__/${hostname}.${domain}/;
 	write_config ($postfix_main_cf, "$targetdir/etc/postfix/main.cf");
@@ -1461,25 +1538,45 @@ _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'");
-	
-	# save installer settings
-	my $ucc = uc ($country);
-	debconfig_set ($targetdir, <<_EOD);
-pve-manager pve-manager/country string $ucc
-_EOD
+	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") {
+		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);
+	    debconfig_set($targetdir, "pve-manager pve-manager/country string $ucc\n");
+	}
 
 	update_progress (0.8, 0.95, 1, "make system bootable");
 
 	if ($use_zfs) {
-	    syscmd ("sed -i -e 's/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"root=ZFS=$zfspoolname\\/ROOT\\/pve-1 boot=zfs\"/' $targetdir/etc/default/grub") == 0 ||
+	    syscmd ("sed -i -e 's/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"root=ZFS=$zfspoolname\\/ROOT\\/$zfsrootvolname boot=zfs\"/' $targetdir/etc/default/grub") == 0 ||
 		die "unable to update /etc/default/grub\n";
-   
+
 	}
 
 	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");
@@ -1495,7 +1592,7 @@ _EOD
 			die "unable to install the i386-pc boot loader on '$dev'\n";
 
 		if ($di->{esp}) {
-		    syscmd ("mount -n $di->{esp} $targetdir/boot/efi") == 0 ||
+		    syscmd ("mount -n $di->{esp} -t vfat $targetdir/boot/efi") == 0 ||
 			die "unable to mount $di->{esp}\n";
 		    my $rc = syscmd ("chroot $targetdir /usr/sbin/grub-install --target x86_64-efi --no-floppy --bootloader-id='proxmox' $dev");
 		    if ($rc != 0) {
@@ -1535,33 +1632,41 @@ _EOD
 	run_command ("chroot $targetdir /usr/sbin/chpasswd", undef,
 		     "root:$octets\n");
 
-	# create pmxcfs DB
+	if ($setup->{product} eq 'pmg') {
+	    # save admin email
+	    write_config ("section: admin\n\temail ${mailto}\n",
+			  "$targetdir/etc/pmg/pmg.conf");
 
-	my $tmpdir = "$targetdir/tmp/pve";
-	mkdir $tmpdir;
+	} elsif ($setup->{product} eq 'pve') {
 
-	# write vnc keymap to datacenter.cfg
-	my $vnckmap = $cmap->{kmap}->{$keymap}->{kvm} || 'en-us';
-	write_config ("keyboard: $vnckmap\n",
-		      "$tmpdir/datacenter.cfg");
+	    # create pmxcfs DB
 
-	# save admin email
-	write_config ("user:root\@pam:1:0:::${mailto}::\n",
-		      "$tmpdir/user.cfg");
+	    my $tmpdir = "$targetdir/tmp/pve";
+	    mkdir $tmpdir;
 
-	# write storage.cfg
-	my $strorage_cfg_fn = "$tmpdir/storage.cfg";
-	if ($use_zfs) {
-	    write_config ($storage_cfg_zfs, $strorage_cfg_fn);
-	} elsif ($use_btrfs) {
-	    write_config ($storage_cfg_btrfs, $strorage_cfg_fn);
-	} else {
-	    write_config ($storage_cfg_lvmthin, $strorage_cfg_fn);
-	}
+	    # write vnc keymap to datacenter.cfg
+	    my $vnckmap = $cmap->{kmap}->{$keymap}->{kvm} || 'en-us';
+	    write_config ("keyboard: $vnckmap\n",
+			  "$tmpdir/datacenter.cfg");
 
-	run_command("chroot $targetdir /usr/bin/create_pmxcfs_db /tmp/pve /var/lib/pve-cluster/config.db");
+	    # save admin email
+	    write_config ("user:root\@pam:1:0:::${mailto}::\n",
+			  "$tmpdir/user.cfg");
 
-	syscmd ("rm -rf $tmpdir");
+	    # write storage.cfg
+	    my $strorage_cfg_fn = "$tmpdir/storage.cfg";
+	    if ($use_zfs) {
+		write_config ($storage_cfg_zfs, $strorage_cfg_fn);
+	    } elsif ($use_btrfs) {
+		write_config ($storage_cfg_btrfs, $strorage_cfg_fn);
+	    } else {
+		write_config ($storage_cfg_lvmthin, $strorage_cfg_fn);
+	    }
+
+	    run_command("chroot $targetdir /usr/bin/create_pmxcfs_db /tmp/pve /var/lib/pve-cluster/config.db");
+
+	    syscmd ("rm -rf $tmpdir");
+	}
     };
 
     my $err = $@;
@@ -1574,10 +1679,9 @@ _EOD
 	my $elapsed = Time::HiRes::tv_interval($starttime);
 	print "Elapsed extract time: $elapsed\n";
 
-	syscmd ("chroot $targetdir /usr/bin/dpkg-query -W --showformat='\${package}\n'> pve-final.pkglist");
+	syscmd ("chroot $targetdir /usr/bin/dpkg-query -W --showformat='\${package}\n'> final.pkglist");
     }
 
-    syscmd ("umount $targetdir/var/lib/vz");
     syscmd ("umount $targetdir/tmp");
     syscmd ("umount $targetdir/proc");
     syscmd ("umount $targetdir/sys");
@@ -1593,36 +1697,62 @@ _EOD
 	syscmd ("zfs set sync=standard $zfspoolname") == 0 ||
 	    die "unable to set zfs properties\n";
 
-	syscmd ("zfs set mountpoint=/ $zfspoolname/ROOT/pve-1") == 0 ||
+	syscmd ("zfs set mountpoint=/ $zfspoolname/ROOT/$zfsrootvolname") == 0 ||
 	    die "zfs set mountpoint failed\n";
-	    
-	syscmd ("zpool set bootfs=$zfspoolname/ROOT/pve-1 $zfspoolname")  == 0 ||
+
+	syscmd ("zpool set bootfs=$zfspoolname/ROOT/$zfsrootvolname $zfspoolname")  == 0 ||
 	    die "zfs set bootfs failed\n";
+	syscmd ("zpool export $zfspoolname");
     }
 
     die $err if $err;
 }
 
+my $last_display_change = 0;
+
+my $display_info_counter = 0;
+
+my $display_info_items = [
+    "extract1-license.htm",
+    "extract2-rulesystem.htm",
+    "extract3-spam.htm",
+    "extract4-virus.htm",
+    ];
+
+sub display_info {
+
+    my $min_display_time = 15;
+
+    my $ctime = time();
+
+    return if ($ctime - $last_display_change) < $min_display_time;
+
+    my $page = $display_info_items->[$display_info_counter % scalar(@$display_info_items)];
+
+    $display_info_counter++;
+
+    display_html($page);
+}
+
 sub display_html {
     my ($filename) = @_;
 
-    my $path = "${proxmox_dir}/html/$filename";
+    my $path = "${proxmox_libdir}/html/$filename";
+
     my $url = "file://$path";
 
     my $data = file_get_contents($path);
 
     if ($filename eq 'license.htm') {
-	my $licensefn = -f "/EULA" ? "/EULA" : 
-	    $opt_testmode ? "./copyright" : 
-	    "/usr/share/doc/pve-installer/copyright";
-	my $license = decode('utf8', file_get_contents($licensefn));
-	$license =~ m/^\s+(.+\n)/;
-	my $title = $licensefn eq '/EULA' ? "END USER LICENSE AGREEMENT (EULA)": $1;
+	my $license = decode('utf8', file_get_contents("${proxmox_cddir}/EULA"));
+	my $title = "END USER LICENSE AGREEMENT (EULA)";
 	$data =~ s/__LICENSE__/$license/;
 	$data =~ s/__LICENSE_TITLE__/$title/;
     }
 
     $htmlview->load_html_string($data, $url);
+
+    $last_display_change = time();
 }
 
 sub set_next {
@@ -1635,27 +1765,6 @@ sub set_next {
     $next->grab_focus ();
 }
 
-sub url_requested {
-    my ($doc, $url, $stream) = @_;
-
-    $stream->set_cancel_func (sub {}); # hack: avoid warning
-
-    my $path = "${proxmox_dir}/html/$url";
-
-    if (-f $path) {
-	open (HTMLTMP, $path) ||
-	    die "unable to open file '$path' - $!\n";
-	my $buf;
-	while (my $i = read (HTMLTMP, $buf, 4096)) {
-	    $stream->write ($buf);
-	    Gtk3::main_iteration() while Gtk3::events_pending();
-	}
-	close (HTMLTMP);
-    }
-
-    #$stream->close(); # hack: dont close - avoid crash
-}
-
 sub create_main_window {
 
     $window = Gtk3::Window->new ();
@@ -1665,7 +1774,8 @@ sub create_main_window {
 
     my $vbox = Gtk3::VBox->new (0, 0);
 
-    my $image = Gtk3::Image->new_from_file  ("${proxmox_dir}/proxlogo.png");
+    my $logofn = "$setup->{product}-banner.png";
+    my $image = Gtk3::Image->new_from_file("${proxmox_libdir}/$logofn");
     $vbox->pack_start ($image, 0, 0, 0);
 
     my $hbox = Gtk3::HBox->new (0, 0);
@@ -1682,7 +1792,7 @@ sub create_main_window {
     $vbox->pack_start ($cmdbox, 0, 0, 10);
 
     $next = Gtk3::Button->new ('_Next');
-    $next->signal_connect (clicked => sub { &$next_fctn (); });
+    $next->signal_connect (clicked => sub { $last_display_change = 0; &$next_fctn (); });
     $cmdbox->pack_end ($next, 0, 0, 10);
     my $abort = Gtk3::Button->new ('_Abort');
     $abort->set_can_focus (0);
@@ -1695,7 +1805,7 @@ sub create_main_window {
     $htmlview = Gtk3::WebKit::WebView->new();
     my $scrolls = Gtk3::ScrolledWindow->new();
     $scrolls->add($htmlview);
-   
+
     my $hbox2 = Gtk3::HBox->new (0, 0);
     $hbox2->pack_start ($scrolls, 1, 1, 0);
 
@@ -1716,10 +1826,10 @@ sub create_main_window {
     $window->realize ();
 }
 
-sub cleanup_view { 
+sub cleanup_view {
     $inbox->foreach(sub {
 	my $child = shift;
-	$inbox->remove ($child);	
+	$inbox->remove ($child);
     });
 }
 
@@ -1802,6 +1912,7 @@ sub get_ip_config {
 	foreach my $a (split /\n/,$addresses) {
 	    my ($family, $ip, $prefix) = $a =~ m/^\Q$index\E:\s+\Q$name\E\s+(inet|inet6)\s+($IPRE)\/(\d+)\s+/;
 	    next if !$ip;
+	    next if $a =~ /scope\s+link/; # ignore link local
 
 	    my $mask = $prefix;
 
@@ -1889,26 +2000,33 @@ sub create_ipconf_view {
     };
 
     my $device_active_map = {};
+
+    my $device_change_handler = sub {
+	my $current = shift;
+	$ipconf->{selected} = $device_active_map->{$current->get_active()};
+	my $iface = $ipconf->{ifaces}->{$ipconf->{selected}};
+	$ipconf_entry_addr->set_text($iface->{inet}->{addr} || $iface->{inet6}->{addr})
+	    if $iface->{inet}->{addr} || $iface->{inet6}->{addr};
+	$ipconf_entry_mask->set_text($iface->{inet}->{mask} || $iface->{inet6}->{mask})
+	    if $iface->{inet}->{mask} || $iface->{inet6}->{mask};
+    };
+
     my $i = 0;
     foreach my $index (sort keys %{$ipconf->{ifaces}}) {
 	$device_cb->append_text(&$get_device_desc($ipconf->{ifaces}->{$index}));
         $device_active_map->{$i} = $index;
 	if ($ipconf_first_view && $index == $ipconf->{default}) {
 	    $device_cb->set_active($i);
+	    &$device_change_handler($device_cb);
 	    $ipconf_first_view = 0;
 	}
-	$device_cb->signal_connect ('changed' => sub {
-	    my $current = shift;
-	    $ipconf->{selected} = $device_active_map->{$current->get_active};
-	    my $iface = $ipconf->{ifaces}->{$ipconf->{selected}};
-	    $ipconf_entry_addr->set_text($iface->{inet}->{addr} || $iface->{inet6}->{addr})
-		if $iface->{inet}->{addr} || $iface->{inet6}->{addr};
-	    $ipconf_entry_mask->set_text($iface->{inet}->{mask} || $iface->{inet6}->{mask})
-		if $iface->{inet}->{mask} || $iface->{inet6}->{mask};
-	});
+	$device_cb->signal_connect ('changed' => $device_change_handler);
 	$i++;
     }
 
+    $device_cb->set_active(0)
+	if !($ipconf->{selected});
+
     my $devicebox = Gtk3::HBox->new (0, 0);
     my $label = Gtk3::Label->new ("Management Interface:");
     $label->set_size_request (150, -1);
@@ -1918,8 +2036,9 @@ sub create_ipconf_view {
 
     $vbox2->pack_start ($devicebox, 0, 0, 2);
 
-    my $hn = $ipconf->{domain} ? "pve.$ipconf->{domain}" : 'pve.example.invalid';
-   
+    my $hn = $ipconf->{domain} ?
+	"$setup->{product}.$ipconf->{domain}" : "$setup->{product}.example.invalid";
+
     my ($hostbox, $hostentry) =
 	create_text_input ($hn, 'Hostname (FQDN):');
     $vbox2->pack_start ($hostbox, 0, 0, 2);
@@ -1948,7 +2067,7 @@ sub create_ipconf_view {
     set_next (undef, sub {
 
 	# verify hostname
-	
+
 	my $text = $hostentry->get_text();
 
 	$text =~ s/^\s+//;
@@ -1982,7 +2101,7 @@ sub create_ipconf_view {
 	    $ipaddress = $text;
 	    $ipversion = 4;
 	} elsif ($text =~ m!^($IPV6RE)$!) {
-	    $ipaddress = $text; 
+	    $ipaddress = $text;
 	    $ipversion = 6;
 	} else {
 	    display_message ("IP address is not valid.");
@@ -2015,7 +2134,7 @@ sub create_ipconf_view {
 	    $ipconf_entry_gw->grab_focus();
 	    return;
 	}
-	
+
 	$text = $ipconf_entry_dns->get_text();
 	$text =~ s/^\s+//;
 	$text =~ s/\s+$//;
@@ -2028,9 +2147,9 @@ sub create_ipconf_view {
 	    $ipconf_entry_dns->grab_focus();
 	    return;
 	}
-	
+
 	#print "TEST $ipaddress $netmask $gateway $dnsserver\n";
-	
+
 	create_extract_view ();
     });
 
@@ -2278,7 +2397,7 @@ sub create_country_view {
 
 	if ($val == Gtk3::Gdk::KEY_Tab) {
 	    my $cc = $countryhash->{lc($text)};
-	    
+
 	    my $found = 0;
 	    my $compl;
 
@@ -2315,7 +2434,7 @@ sub create_country_view {
 
 	return undef;
     });
- 
+
     my $ls = Gtk3::ListStore->new('Glib::String');
     foreach my $cc (sort {$ctr->{$a}->{name} cmp $ctr->{$b}->{name} } keys %$ctr) {
 	my $iter = $ls->append();
@@ -2337,7 +2456,7 @@ sub create_country_view {
     $vbox->pack_start ($hbox2, 0, 0, 5);
     $vbox->pack_start ($hbox3, 0, 0, 5);
 
-    if ($country) {
+    if ($country && $ctr->{$country}) {
 	$w->set_text ($ctr->{$country}->{name});
     }
 
@@ -2440,6 +2559,7 @@ my $create_raid_disk_grid = sub {
 
     my $scrolled_window = Gtk3::ScrolledWindow->new();
     $scrolled_window->set_hexpand(1);
+    $scrolled_window->set_propagate_natural_height(1) if @$hds > 4;
     $scrolled_window->add(&$create_label_widget_grid($disk_labeled_widgets));
     $scrolled_window->set_policy('never', 'automatic');
 
@@ -2520,7 +2640,7 @@ sub create_hdoption_view {
     my $grid =  Gtk3::Grid->new();
     $grid->set_column_spacing(10);
     $grid->set_row_spacing(10);
-    
+
     $hbox2->pack_start($grid, 1, 0, 10);
 
     my $row = 0;
@@ -2530,7 +2650,7 @@ sub create_hdoption_view {
     my $label0 = Gtk3::Label->new ("Filesystem");
     $label0->set_alignment (1, 0.5);
     $grid->attach($label0, 0, $row, 1, 1);
-   
+
     my $fstypecb = Gtk3::ComboBoxText->new();
 
     my $fstype = ['ext3', 'ext4', 'xfs',
@@ -2539,7 +2659,7 @@ sub create_hdoption_view {
 		  'zfs (RAIDZ-2)', 'zfs (RAIDZ-3)'];
 
     push @$fstype, 'btrfs (RAID0)', 'btrfs (RAID1)', 'btrfs (RAID10)'
-	if $enable_btrfs;
+	if $setup->{enable_btrfs};
 
     my $tcount = 0;
     foreach my $tmp (@$fstype) {
@@ -2578,14 +2698,16 @@ sub create_hdoption_view {
     my $entry_swapsize = Gtk3::Entry->new();
     $entry_swapsize->set_tooltip_text("maximum SWAP size (GB)");
     $entry_swapsize->signal_connect (key_press_event => \&check_float);
-    $entry_swapsize->set_text($config_options->{swapsize}) if $config_options->{swapsize};
+    $entry_swapsize->set_text($config_options->{swapsize}) if defined($config_options->{swapsize});
     push @$hdsize_labeled_widgets, "swapsize", $entry_swapsize;
 
     my $entry_maxroot = Gtk3::Entry->new();
-    $entry_maxroot->set_tooltip_text("maximum size (GB) for LVM root volume");
-    $entry_maxroot->signal_connect (key_press_event => \&check_float);
-    $entry_maxroot->set_text($config_options->{maxroot}) if $config_options->{maxroot};
-    push @$hdsize_labeled_widgets, "maxroot", $entry_maxroot;
+    if ($setup->{product} eq 'pve') {
+	$entry_maxroot->set_tooltip_text("maximum size (GB) for LVM root volume");
+	$entry_maxroot->signal_connect (key_press_event => \&check_float);
+	$entry_maxroot->set_text($config_options->{maxroot}) if $config_options->{maxroot};
+	push @$hdsize_labeled_widgets, "maxroot", $entry_maxroot;
+    }
 
     my $entry_minfree = Gtk3::Entry->new();
     $entry_minfree->set_tooltip_text("minimum free LVM space (GB, required for LVM snapshots)");
@@ -2593,11 +2715,14 @@ sub create_hdoption_view {
     $entry_minfree->set_text($config_options->{minfree}) if $config_options->{minfree};
     push @$hdsize_labeled_widgets, "minfree", $entry_minfree;
 
-    my $entry_maxvz = Gtk3::Entry->new();
-    $entry_maxvz->set_tooltip_text("maximum size (GB) for LVM data volume");
-    $entry_maxvz->signal_connect (key_press_event => \&check_float);
-    $entry_maxvz->set_text($config_options->{maxvz}) if $config_options->{maxvz};
-    push @$hdsize_labeled_widgets, "maxvz", $entry_maxvz;
+    my $entry_maxvz;
+    if ($setup->{product} eq 'pve') {
+	$entry_maxvz = Gtk3::Entry->new();
+	$entry_maxvz->set_tooltip_text("maximum size (GB) for LVM data volume");
+	$entry_maxvz->signal_connect (key_press_event => \&check_float);
+	$entry_maxvz->set_text($config_options->{maxvz}) if defined($config_options->{maxvz});
+	push @$hdsize_labeled_widgets, "maxvz", $entry_maxvz;
+    }
 
     my $options_stack = Gtk3::Stack->new();
     $options_stack->set_visible(1);
@@ -2634,6 +2759,7 @@ sub create_hdoption_view {
 	}
 	my (undef, $pref_width) = $dialog->get_preferred_width();
 	my (undef, $pref_height) = $dialog->get_preferred_height();
+	$pref_height = 750 if $pref_height > 750;
 	$dialog->resize($pref_width, $pref_height);
     };
 
@@ -2688,7 +2814,7 @@ sub create_hdoption_view {
 	delete $config_options->{minfree};
     }
 
-    if (defined($tmp = &$get_float($entry_maxvz))) {
+    if ($entry_maxvz && defined($tmp = &$get_float($entry_maxvz))) {
 	$config_options->{maxvz} = $tmp;
     } else {
 	delete $config_options->{maxvz};
@@ -2705,7 +2831,7 @@ my $get_raid_devlist = sub {
     for (my $i = 0; $i < @$hds; $i++) {
 	if (my $hd = $config_options->{"disksel$i"}) {
 	    my ($disk, $devname, $size, $model) = @$hd;
-	    die "device '$devname' is used more than once\n" 
+	    die "device '$devname' is used more than once\n"
 		if $dev_name_hash->{$devname};
 	    $dev_name_hash->{$devname} = $hd;
 	    push @$devlist, $hd;
@@ -2752,7 +2878,7 @@ sub get_zfs_raid_setup {
     } elsif ($filesys eq 'zfs (RAID10)') {
 	die "zfs (RAID10) needs at least 4 device\n" if $diskcount < 4;
 	die "zfs (RAID10) needs an even number of devices\n" if $diskcount & 1;
-	
+
 	push @$bootdevlist, @$devlist[0], @$devlist[1];
 
 	for (my $i = 0; $i < $diskcount; $i+=2) {
@@ -2839,7 +2965,7 @@ sub create_hdsel_view {
 	my ($disk, $devname) = @{@$hds[$a]};
 	$target_hd = $devname;
     });
-    
+
     $hbox->pack_start ($target_hd_combo, 0, 0, 10);
 
     my $options = Gtk3::Button->new ('_Options');
@@ -2879,7 +3005,8 @@ sub create_extract_view {
 
     cleanup_view ();
 
-    display_html ("extract1-license.htm");
+    display_info();
+
     $next->set_sensitive (0);
 
     my $vbox =  Gtk3::VBox->new (0, 0);
@@ -2903,7 +3030,7 @@ sub create_extract_view {
 
     my $tdir = $opt_testmode ? "target" : "/target";
     mkdir $tdir;
-    my $base = $opt_testmode ? "/pve/$release/install/pve-base.squashfs" : "/cdrom/pve-base.squashfs";
+    my $base = "${proxmox_cddir}/$setup->{product}-base.squashfs";
 
     eval  { extract_data ($base, $tdir); };
     my $err = $@;
@@ -2925,6 +3052,16 @@ sub create_intro_view {
 
     cleanup_view ();
 
+    if ($setup->{product} eq 'pve') {
+	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" .
+			      "Check BIOS settings for Intel VT / AMD-V / SVM.")
+	    }
+	};
+    }
+
     display_html ("license.htm");
 
     set_next ("I a_gree", \&create_hdsel_view);
@@ -2932,28 +3069,42 @@ sub create_intro_view {
 
 $ipconf = get_ip_config ();
 
-$country = detect_country() if $ipconf->{default} || $opt_testmode;;
+$country = detect_country() if $ipconf->{default} || $opt_testmode;
 
 # read country, kmap and timezone infos
 $cmap = read_cmap ();
 
+if (!defined($cmap->{country}->{$country})) {
+    print $logfd "ignoring detected country '$country', invalid or unknown\n";
+    $country = undef;
+}
+
 create_main_window ();
 
+my $initial_error = 0;
+
 if (!defined ($hds) || (scalar (@$hds) <= 0)) {
     print "no hardisks found\n";
+    $initial_error = 1;
     display_html ("nohds.htm");
     set_next ("Reboot", sub { exit (0); } );
 } else {
-
     foreach my $hd (@$hds) {
 	my ($disk, $devname) = @$hd;
 	next if $devname =~ m|^/dev/md\d+$|;
 	print "found Disk$disk N:$devname\n";
     }
+}
 
-    create_intro_view ();
+if (!$initial_error && (scalar keys %{ $ipconf->{ifaces} } == 0)) {
+    print "no network interfaces found\n";
+    $initial_error = 1;
+    display_html ("nonics.htm");
+    set_next ("Reboot", sub { exit (0); } );
 }
 
+create_intro_view () if !$initial_error;
+
 Gtk3->main;
 
 exit 0;