X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=proxinstall;h=b9e96fa99747947df9c370639da9fdd07f83be26;hb=754abb4437f8b6a1b5a4cb17ce1bf0d2d539615d;hp=b08a5d37a2d62ff6a6f296e77a388fc90b018839;hpb=b8f4f0f9502646c70eb067a4367d749c465ae225;p=pve-installer.git

diff --git a/proxinstall b/proxinstall
index b08a5d3..b9e96fa 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.2';
-
-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
@@ -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) = @_;
@@ -86,11 +91,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,9 +149,47 @@ 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 = [
+    '0.0.0.0',
+    '128.0.0.0',
+    '192.0.0.0',
+    '224.0.0.0',
+    '240.0.0.0',
+    '248.0.0.0',
+    '252.0.0.0',
+    '254.0.0.0',
+    '255.0.0.0',
+    '255.128.0.0',
+    '255.192.0.0',
+    '255.224.0.0',
+    '255.240.0.0',
+    '255.248.0.0',
+    '255.252.0.0',
+    '255.254.0.0',
+    '255.255.0.0',
+    '255.255.128.0',
+    '255.255.192.0',
+    '255.255.224.0',
+    '255.255.240.0',
+    '255.255.248.0',
+    '255.255.252.0',
+    '255.255.254.0',
+    '255.255.255.0',
+    '255.255.255.128',
+    '255.255.255.192',
+    '255.255.255.224',
+    '255.255.255.240',
+    '255.255.255.248',
+    '255.255.255.252',
+    '255.255.255.254',
+    '255.255.255.255',
+];
+
 my ($window, $cmdbox, $inbox, $htmlview);
 my ($next, $next_fctn, $target_hd);
 my ($progress, $progress_status);
@@ -187,9 +233,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;
@@ -343,10 +391,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;
@@ -498,8 +548,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 = {};
@@ -564,6 +613,7 @@ sub hd_size {
 
     foreach my $hd (@$hds) {
 	my ($disk, $devname, $size, $model) = @$hd;
+	# size is always in 512B "sectors"! convert to KB
 	return int($size/2) if $devname eq $dev;
     }
 
@@ -573,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";
@@ -623,6 +675,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();
 }
 
@@ -657,7 +711,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 {
@@ -724,199 +778,216 @@ sub btrfs_create {
 sub zfs_create_rpool {
     my ($vdev) = @_;
 
-   syscmd ("zpool create -f -o ashift=12 -o cachefile=none $zfspoolname $vdev") == 0 ||
+    my $cmd = "zpool create -f -o cachefile=none";
+
+    $cmd .= " -o ashift=$config_options->{ashift}"
+        if defined($config_options->{ashift});
+
+    syscmd ("$cmd $zfspoolname $vdev") == 0 ||
 	die "unable to create zfs root pool\n";
 
     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";
+    }
+
+    syscmd ("zfs create $zfspoolname/ROOT/$zfsrootvolname")  == 0 ||
+	die "unable to create zfs $zfspoolname/ROOT/$zfsrootvolname volume\n";
 
-    # disable atime during insatll
+    # disable atime during install
     syscmd ("zfs set atime=off $zfspoolname") == 0 ||
 	die "unable to set zfs properties\n";
-    syscmd ("zfs set compression=lz4 $zfspoolname") == 0 ||
-	die "unable to set zfs properties\n";
+
+    my $value = $config_options->{compress};
+    syscmd ("zfs set compression=$value $zfspoolname")
+        if defined($value) && $value ne 'off';
+
+    $value = $config_options->{checksum};
+    syscmd ("zfs set checksum=$value $zfspoolname")
+        if defined($value) && $value ne 'on';
+
+    $value = $config_options->{copies};
+    syscmd ("zfs set copies=$value $zfspoolname")
+        if defined($value) && $value != 1;
 }
 
-sub zfs_create_swap {
-    my ($swapsize) = @_;
+my $udevadm_trigger_block = sub {
+    my ($nowait) = @_;
 
-    syscmd ("zfs create -V ${swapsize}K -b 4K $zfspoolname/swap")  == 0 ||
-	die "unable to create zfs swap device\n";
+    sleep(1) if !$nowait; # give kernel time to reread part table
 
-    syscmd ("zfs set com.sun:auto-snapshot=false $zfspoolname/swap") == 0 ||
-	die "unable to set zfs properties\n";
+    # trigger udev to create /dev/disk/by-uuid
+    syscmd ("udevadm trigger --subsystem-match block");
+    syscmd ("udevadm settle --timeout 10");
+};
 
-    # reduces memory pressure
-    syscmd ("zfs set sync=always $zfspoolname/swap") == 0 ||
-	die "unable to set zfs properties\n";
+my $clean_disk = sub {
+    my ($disk) = @_;
 
-    return "/dev/zvol/$zfspoolname/swap";
-}
+    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) = @_;
+    my ($target_dev, $maxhdsizegb, $ptype) = @_;
 
     die "too dangerous" if $opt_testmode;
 
     die "unknown partition type '$ptype'"
-	if !($ptype eq '8E00' || $ptype eq '8300');
+	if !($ptype eq '8E00' || $ptype eq '8300' || $ptype eq 'BF01');
 
     syscmd("sgdisk -Z ${target_dev}");
-    my $hdsize = hd_size($target_dev); # size in blocks (1024 bytes)
+    my $hdsize = hd_size($target_dev); # size in KB (1024 bytes)
 
     my $restricted_hdsize_mb = 0; # 0 ==> end of partition
-    if ($maxhdsize && ($maxhdsize < $hdsize)) {
-	$hdsize = $maxhdsize;
-	$restricted_hdsize_mb = int($hdsize/1024) . 'M';
+    if ($maxhdsizegb) {
+	my $maxhdsize = $maxhdsizegb * 1024 * 1024;
+	if ($maxhdsize < $hdsize) {
+	    $hdsize = $maxhdsize;
+	    $restricted_hdsize_mb = int($hdsize/1024) . 'M';
+	}
     }
 
     my $hdgb = int($hdsize/(1024*1024));
-    die "hardisk '$target_dev' too small (${hdsize}GB)\n" if $hdgb < 8;
+    die "hardisk '$target_dev' too small (${hdgb}GB)\n" if $hdgb < 8;
 
-    # 1 - GRUB boot partition: 1M 
-    # 2 - EFI ESP: 128M 
-    # 3 - OS/Data partition
+    # 1 - BIOS boot partition (Grub Stage2): first free 1M
+    # 2 - EFI ESP: next free 512M
+    # 3 - OS/Data partition: rest, up to $maxhdsize in MB
 
     my $grubbootdev = get_partition_dev($target_dev, 1);
     my $efibootdev = get_partition_dev($target_dev, 2);
     my $osdev = get_partition_dev ($target_dev, 3);
 
-    my $pcmd = ['sgdisk', '-a1'];
-
-    my $pnum = 1;
-    push @$pcmd, "-n$pnum:34:2047", "-t$pnum:EF02";
+    my $pcmd = ['sgdisk'];
 
-    $pnum = 2;
-    # Note: from sector 2048 to 128M
-    my $endsec = 128*1024*2 - 1;
-    push @$pcmd, "-n$pnum:2048:$endsec", "-t$pnum:EF00";
+    my $pnum = 2;
+    push @$pcmd, "-n${pnum}:1M:+512M", "-t$pnum:EF00";
 
     $pnum = 3;
-    # Note: from 128M to end
-    push @$pcmd, "-n$pnum:128M:${restricted_hdsize_mb}", "-t$pnum:$ptype";
+    push @$pcmd, "-n${pnum}:513M:${restricted_hdsize_mb}", "-t$pnum:$ptype";
 
     push @$pcmd, $target_dev;
 
-    my $os_size = $hdsize - 128*1024;
+    my $os_size = $hdsize - 513*1024; # 512M efi + 1M bios_boot + 1M alignment
 
     syscmd($pcmd) == 0 ||
 	die "unable to partition harddisk '${target_dev}'\n";
 
-    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.  
-#
-# Note: zfs people think this is just a waste of space an not
-# required.  Instead, you should put the ESP on another disk (log,
-# ..).
-
-sub partition_bootable_zfs_disk {
-    my ($target_dev) = @_;
-
-    die "too dangerous" if $opt_testmode;
-
-    syscmd("sgdisk -Z ${target_dev}");
-    my $hdsize = hd_size($target_dev); # size in blocks (1024 bytes)
+    $pnum = 1;
+    $pcmd = ['sgdisk', '-a1', "-n$pnum:34:2047", "-t$pnum:EF02" , $target_dev];
 
-    my $hdgb = int($hdsize/(1024*1024));
-    die "hardisk '$target_dev' too small (${hdsize}GB)\n" if $hdgb < 8;
-
-    # 1 - GRUB boot partition: 1M 
-    # 2 - OS/Data partition
-    # 9 - ZFS reserved partition
-
-    my $grubbootdev = get_partition_dev($target_dev, 1);
-    my $osdev = get_partition_dev ($target_dev, 2);
-
-    my $pcmd = ['sgdisk', '-a1'];
-
-    my $pnum = 1;
-    push @$pcmd, "-n$pnum:34:2047", "-t$pnum:EF02";
-
-    $pnum = 9;
-    push @$pcmd, "-n$pnum:-8M:0", "-t$pnum:BF07";
+    syscmd($pcmd) == 0 ||
+	die "unable to create bios_boot partition '${target_dev}'\n";
 
-    $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;
+    &$udevadm_trigger_block();
 
-    syscmd($pcmd) == 0 ||
-	die "unable to partition harddisk '${target_dev}'\n";
+    foreach my $part ($efibootdev, $osdev) {
+	syscmd("dd if=/dev/zero of=$part bs=1M count=256") if -b $part;
+    }
 
-    return ($os_size, $osdev);
+    return ($os_size, $osdev, $efibootdev);
 }
 
 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;
+	}
 
-    my $rootsize = (($hdgb > ($maxroot*4)) ? $maxroot : $hdgb/4)*1024*1024;
+	$rootsize = (($hdgb > ($maxroot*4)) ? $maxroot : $hdgb/4)*1024*1024;
 
-    my $rest = $os_size - $swap_size - $rootsize; # in KB
+	my $rest = $os_size - $swap_size - $rootsize; # in KB
+
+	my $minfree;
+	if (defined($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;
+	}
+
+	$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 = defined($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/vgchange -a y pve") == 0 ||
+	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 $vgname") == 0 ||
 	die "unable to activate volume group\n";
 
-    return ($rootdev, $datadev, $swapfile);
+    return ($rootdev, $swapfile, $datadev);
 }
 
 sub compute_swapsize {
@@ -925,7 +996,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);
@@ -934,17 +1005,10 @@ sub compute_swapsize {
 	$ss = 8 if $ss > 8;
 	$swapsize = $ss*1024*1024;
     }
-}
 
-my $udevadm_trigger_block = sub {
-    my ($nowait) = @_;
+    return $swapsize;
+}
 
-    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) = @_;
@@ -955,9 +1019,9 @@ sub extract_data {
 
     my $bootdevinfo = [];
 
-    my $datadev;
     my $swapfile;
     my $rootdev;
+    my $datadev;
 
     my $use_zfs = 0;
     my $use_btrfs = 0;
@@ -967,12 +1031,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--) {
@@ -991,6 +1055,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);
@@ -998,7 +1064,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');
@@ -1011,7 +1077,7 @@ sub extract_data {
 		syscmd ("zpool destroy $zfstestpool");
 
 		zfs_create_rpool($rootdev);
-	    
+
 	    } else {
 
 		# nothing to do
@@ -1024,6 +1090,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
@@ -1043,10 +1110,14 @@ 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) =
-		    partition_bootable_zfs_disk($devname);
+		    partition_bootable_disk($devname, $config_options->{hdsize}, 'BF01');
 		zfs_mirror_size_check($disksize, $size) if $disksize;
 		push @$bootdevinfo, { devname => $devname, osdev => $osdev};
 		$disksize = $size;
@@ -1057,7 +1128,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};
@@ -1067,32 +1138,25 @@ sub extract_data {
 	    }
 
 	    zfs_create_rpool($vdev);
-	    
-	    my $swap_size = compute_swapsize($disksize);
-	    $swapfile = zfs_create_swap($swap_size);
 
 	} else {
 
 	    die "target '$target_hd' is not a valid block device\n" if ! -b $target_hd;
 
-	    my $maxhdsize;
-	    if ($config_options->{hdsize}) {
-		# max hdsize passed on cmdline (GB)
-		$maxhdsize = $config_options->{hdsize}*1024*1024;
-	    }
+	    &$clean_disk($target_hd);
 
-	    my ($os_size, $osdev, $efidev); 
-	    ($os_size, $osdev, $efidev) = 
-		partition_bootable_disk($target_hd, $maxhdsize, '8E00');
+	    my ($os_size, $osdev, $efidev);
+	    ($os_size, $osdev, $efidev) =
+		partition_bootable_disk($target_hd, $config_options->{hdsize}, '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, $datadev) =
 		create_lvm_volumes($osdev, $os_size, $swap_size);
 
 	    # trigger udev to create /dev/disk/by-uuid
@@ -1115,7 +1179,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";
 	}
 
@@ -1131,11 +1195,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";
 	}
 
@@ -1144,26 +1209,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;
@@ -1187,14 +1250,13 @@ 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
 
 	my $hosts =
 	    "127.0.0.1 localhost.localdomain localhost\n" .
-	    "$ipaddress $hostname.$domain $hostname pvelocalhost\n\n" .
+	    "$ipaddress $hostname.$domain $hostname\n\n" .
 	    "# The following lines are desirable for IPv6 capable hosts\n\n" .
 	    "::1     ip6-localhost ip6-loopback\n" .
 	    "fe00::0 ip6-localnet\n" .
@@ -1215,21 +1277,40 @@ sub extract_data {
 
 	my $ntype = $ipversion == 4 ? 'inet' : 'inet6';
 
-	 $ifaces .=
-	     "auto vmbr0\niface vmbr0 $ntype static\n" .
-	     "\taddress $ipaddress\n" .
-	     "\tnetmask $netmask\n" .
-	     "\tgateway $gateway\n" .
-	     "\tbridge_ports eth0\n" .
-	     "\tbridge_stp off\n" .
-	     "\tbridge_fd 0\n";
+	my $ethdev = $ipconf->{ifaces}->{$ipconf->{selected}}->{name};
+
+	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 $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 $ethdev;
+
+	    $ifaces .= "\niface $name $ntype manual\n";
+	}
 
 	write_config ($ifaces, "$targetdir/etc/network/interfaces");
 
 	# configure dns
 
-	my $resolfconf = "search $domain\nnameserver $dnsserver\n";
-	write_config ($resolfconf, "$targetdir/etc/resolv.conf");
+	my $resolvconf = "search $domain\nnameserver $dnsserver\n";
+	write_config ($resolvconf, "$targetdir/etc/resolv.conf");
 
 	# configure fstab
 
@@ -1268,7 +1349,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";
 		}
 	    }
@@ -1282,10 +1363,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";
 
@@ -1301,31 +1382,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;
@@ -1339,7 +1420,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;
@@ -1351,10 +1433,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");
@@ -1385,25 +1463,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");
@@ -1419,10 +1517,16 @@ _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";
-		    syscmd ("chroot $targetdir /usr/sbin/grub-install --target x86_64-efi --no-floppy --bootloader-id='proxmox' $dev") == 0 ||
-			die "unable to install the EFI boot loader on '$dev'\n";
+		    my $rc = syscmd ("chroot $targetdir /usr/sbin/grub-install --target x86_64-efi --no-floppy --bootloader-id='proxmox' $dev");
+		    if ($rc != 0) {
+			if (-d '/sys/firmware/efi') {
+			    die "unable to install the EFI boot loader on '$dev'\n";
+			} else {
+			    warn "unable to install the EFI boot loader on '$dev', ignoring (not booted using UEFI)\n";
+			}
+		    }
 		    # also install fallback boot file (OVMF does not boot without)
 		    mkdir("$targetdir/boot/efi/EFI/BOOT");
 		    syscmd("cp $targetdir/boot/efi/EFI/proxmox/grubx64.efi $targetdir/boot/efi/EFI/BOOT/BOOTx64.EFI") == 0 ||
@@ -1453,33 +1557,43 @@ _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 $storage_cfg_fn = "$tmpdir/storage.cfg";
+	    if ($use_zfs) {
+		write_config ($storage_cfg_zfs, $storage_cfg_fn);
+	    } elsif ($use_btrfs) {
+		write_config ($storage_cfg_btrfs, $storage_cfg_fn);
+	    } elsif ($datadev) {
+		write_config ($storage_cfg_lvmthin, $storage_cfg_fn);
+	    } else {
+		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");
+
+	    syscmd ("rm -rf $tmpdir");
+	}
     };
 
     my $err = $@;
@@ -1492,10 +1606,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");
@@ -1511,36 +1624,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 {
@@ -1553,27 +1692,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 ();
@@ -1583,7 +1701,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);
@@ -1600,7 +1719,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);
@@ -1613,7 +1732,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);
 
@@ -1634,22 +1753,34 @@ sub create_main_window {
     $window->realize ();
 }
 
-sub cleanup_view { 
+sub cleanup_view {
     $inbox->foreach(sub {
 	my $child = shift;
-	$inbox->remove ($child);	
+	$inbox->remove ($child);
     });
 }
 
 # fixme: newer GTK3 has special properties to handle numbers with Entry
 # only allow floating point numbers with Gtk3::Entry
+
 sub check_float {
     my ($entry, $event) = @_;
 
+    return check_number($entry, $event, 1);
+}
+
+sub check_int {
+    my ($entry, $event) = @_;
+
+    return check_number($entry, $event, 0);
+}
+
+sub check_number {
+    my ($entry, $event, $float) = @_;
 
     my $val = $event->get_keyval;
 
-    if ($val == ord '.' ||
+    if (($float && $val == ord '.') ||
 	$val == Gtk3::Gdk::KEY_ISO_Left_Tab ||
 	$val == Gtk3::Gdk::KEY_Shift_L ||
 	$val == Gtk3::Gdk::KEY_Tab ||
@@ -1685,21 +1816,61 @@ sub create_text_input {
 
 sub get_ip_config {
 
-    my $ifconfig = `ifconfig eth0`;
+    my $ifaces = {};
+    my $default;
+
+    my $links = `ip -o l`;
+    foreach my $l (split /\n/,$links) {
+	my ($index, $name, $flags, $state, $mac) = $l =~ m/^(\d+):\s+(\S+):\s+<(\S+)>.*\s+state\s+(\S+)\s+.*\s+link\/ether\s+(\S+)\s+/;
+	next if !$name || $name eq 'lo';
+
+	my $driver = readlink "/sys/class/net/$name/device/driver" || 'unknown';
+	$driver =~ s!^.*/!!;
+
+	$ifaces->{"$index"} = {
+	    name => $name,
+	    driver => $driver,
+	    flags => $flags,
+	    state => $state,
+	    mac => $mac,
+	};
+
+	my $addresses = `ip -o a s $name`;
+	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;
+
+	    if ($family eq 'inet') {
+		next if !$ip =~ /$IPV4RE/;
+		next if $prefix < 8 || $prefix > 32;
+		$mask = @$ipv4_reverse_mask[$prefix];
+	    } else {
+		next if !$ip =~ /$IPV6RE/;
+	    }
+
+	    $default = $index if !$default;
+
+	    $ifaces->{"$index"}->{"$family"} = {
+		mask => $mask,
+		addr => $ip,
+	    };
+	}
+    }
 
-    my ($addr) = $ifconfig =~ m/inet addr:(\S*)/m;
-    my ($mask) = $ifconfig =~ m/Mask:(\S*)/m;
 
-    my $route = `route -n`;
-    my ($gateway) = $route =~ m/^0\.0\.0\.0\s+(\d+\.\d+\.\d+\.\d+)\s+/m;
+    my $route = `ip route`;
+    my ($gateway) = $route =~ m/^default\s+via\s+(\S+)\s+/m;
 
     my $resolvconf = `cat /etc/resolv.conf`;
     my ($dnsserver) = $resolvconf =~ m/^nameserver\s+(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/m;
     my ($domain) = $resolvconf =~ m/^domain\s+(\S+)$/m;
 
     return {
-	addr => $addr,
-	mask => $mask,
+	default => $default,
+	ifaces => $ifaces,
 	gateway => $gateway,
 	dnsserver => $dnsserver,
 	domain => $domain,
@@ -1724,6 +1895,8 @@ sub display_error {
     $dialog->destroy();
 }
 
+my $ipconf_first_view = 1;
+
 sub create_ipconf_view {
 
     cleanup_view ();
@@ -1736,23 +1909,69 @@ sub create_ipconf_view {
     my $vbox2 =  Gtk3::VBox->new (0, 0);
     $hbox->add ($vbox2);
 
-    my $addr = $ipconf->{addr} || '192.168.100.2';
-    my $mask = $ipconf->{mask} || '255.255.255.0';
+    my $ipbox;
+    ($ipbox, $ipconf_entry_addr) =
+	create_text_input ("192.168.100.2", 'IP Address:');
+
+    my $maskbox;
+    ($maskbox, $ipconf_entry_mask) =
+	create_text_input ("255.255.255.0", 'Netmask:');
+
+    my $device_cb = Gtk3::ComboBoxText->new();
+    $device_cb->set_active(0);
+    $device_cb->set_visible(1);
+
+    my $get_device_desc = sub {
+	my $iface = shift;
+	return "$iface->{name} - $iface->{mac} ($iface->{driver})";
+    };
+
+    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' => $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);
+    $label->set_alignment (1, 0.5);
+    $devicebox->pack_start ($label, 0, 0, 10);
+    $devicebox->pack_start ($device_cb, 0, 0, 0);
+
+    $vbox2->pack_start ($devicebox, 0, 0, 2);
+
+    my $hn = $ipconf->{domain} ?
+	"$setup->{product}.$ipconf->{domain}" : "$setup->{product}.example.invalid";
 
-    my $hn = $ipconf->{domain} ? "pve.$ipconf->{domain}" : 'pve.domain.tld';
-   
     my ($hostbox, $hostentry) =
 	create_text_input ($hn, 'Hostname (FQDN):');
     $vbox2->pack_start ($hostbox, 0, 0, 2);
 
-    my $ipbox;
-    ($ipbox, $ipconf_entry_addr) =
-	create_text_input ($addr, 'IP Address:');
     $vbox2->pack_start ($ipbox, 0, 0, 2);
 
-    my $maskbox;
-    ($maskbox, $ipconf_entry_mask) =
-	create_text_input ($mask, 'Netmask:');
     $vbox2->pack_start ($maskbox, 0, 0, 2);
 
     $gateway = $ipconf->{gateway} || '192.168.100.1';
@@ -1775,7 +1994,7 @@ sub create_ipconf_view {
     set_next (undef, sub {
 
 	# verify hostname
-	
+
 	my $text = $hostentry->get_text();
 
 	$text =~ s/^\s+//;
@@ -1790,7 +2009,7 @@ sub create_ipconf_view {
 	    return;
 	}
 
- 	if ($text && $text =~ m/^(${namere}\.)*${namere}$/ && $text !~ m/.domain.tld$/ &&
+	if ($text && $text =~ m/^(${namere}\.)*${namere}$/ && $text !~ m/.example.invalid$/ &&
 	    $text =~ m/^([^\.]+)\.(\S+)$/) {
 	    $hostname = $1;
 	    $domain = $2;
@@ -1809,7 +2028,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.");
@@ -1842,7 +2061,7 @@ sub create_ipconf_view {
 	    $ipconf_entry_gw->grab_focus();
 	    return;
 	}
-	
+
 	$text = $ipconf_entry_dns->get_text();
 	$text =~ s/^\s+//;
 	$text =~ s/\s+$//;
@@ -1855,9 +2074,9 @@ sub create_ipconf_view {
 	    $ipconf_entry_dns->grab_focus();
 	    return;
 	}
-	
+
 	#print "TEST $ipaddress $netmask $gateway $dnsserver\n";
-	
+
 	create_extract_view ();
     });
 
@@ -1868,7 +2087,7 @@ sub get_device_desc {
     my ($devname, $size, $model) = @_;
 
     if ($size && ($size > 0)) {
-	$size = int($size/2048); # size in MB
+	$size = int($size/2048); # size in MB, from 512B "sectors"
 
 	my $text = "$devname (";
 	if ($size >= 1024) {
@@ -1980,6 +2199,7 @@ sub create_password_view {
     $hbox3->pack_start ($label, 0, 0, 10);
     my $eme = Gtk3::Entry->new ();
     $eme->set_size_request (200, -1);
+    $eme->set_text('mail@example.invalid');
     $hbox3->pack_start ($eme, 0, 0, 0);
 
 
@@ -2010,11 +2230,16 @@ sub create_password_view {
 
 	my $t3 = $eme->get_text;
 	if ($t3 !~ m/^\S+\@\S+\.\S+$/) {
-	    display_message ("E-Mail does not look like a vaild address" .
+	    display_message ("E-Mail does not look like a valid address" .
 			     " (user\@domain.tld)");
 	    $eme->grab_focus();
 	    return;
+	}
 
+	if ($t3 eq 'mail@example.invalid') {
+	    display_message ("Please enter a valid E-Mail address");
+	    $eme->grab_focus();
+	    return;
 	}
 
 	$password = $t1;
@@ -2099,7 +2324,7 @@ sub create_country_view {
 
 	if ($val == Gtk3::Gdk::KEY_Tab) {
 	    my $cc = $countryhash->{lc($text)};
-	    
+
 	    my $found = 0;
 	    my $compl;
 
@@ -2136,7 +2361,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();
@@ -2158,7 +2383,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});
     }
 
@@ -2187,6 +2412,167 @@ my $target_hd_label;
 
 my $hdopion_first_setup = 1;
 
+my $create_basic_grid = sub {
+    my $grid =  Gtk3::Grid->new();
+    $grid->set_visible(1);
+    $grid->set_column_spacing(10);
+    $grid->set_row_spacing(10);
+    $grid->set_hexpand(1);
+
+    $grid->set_margin_start(5);
+    $grid->set_margin_end(5);
+    $grid->set_margin_top(5);
+    $grid->set_margin_bottom(5);
+
+    return $grid;
+};
+
+my $create_label_widget_grid = sub {
+    my ($labeled_widgets) = @_;
+
+    my $grid = &$create_basic_grid();
+    my $row = 0;
+
+    for (my $i = 0; $i < @$labeled_widgets; $i += 2) {
+	my $widget = @$labeled_widgets[$i+1];
+	my $label = Gtk3::Label->new(@$labeled_widgets[$i]);
+	$label->set_visible(1);
+	$label->set_alignment (1, 0.5);
+	$grid->attach($label, 0, $row, 1, 1);
+	$widget->set_visible(1);
+	$grid->attach($widget, 1, $row, 1, 1);
+	$row++;
+    }
+
+    return $grid;
+};
+
+my $create_raid_disk_grid = sub {
+    my $disk_labeled_widgets = [];
+    for (my $i = 0; $i < @$hds; $i++) {
+	my $disk_selector = Gtk3::ComboBoxText->new();
+	$disk_selector->append_text("-- do not use --");
+	$disk_selector->set_active(0);
+	$disk_selector->set_visible(1);
+	foreach my $hd (@$hds) {
+	    my ($disk, $devname, $size, $model) = @$hd;
+	    $disk_selector->append_text(get_device_desc ($devname, $size, $model));
+	    $disk_selector->{pve_disk_id} = $i;
+	    $disk_selector->signal_connect (changed => sub {
+		my $w = shift;
+		my $diskid = $w->{pve_disk_id};
+		my $a = $w->get_active - 1;
+		$config_options->{"disksel${diskid}"} = ($a >= 0) ? $hds->[$a] : undef;
+	    });
+	}
+
+	if ($hdopion_first_setup) {
+	    $disk_selector->set_active ($i+1) if $hds->[$i];
+	} else {
+	    my $hdind = 0;
+	    if (my $cur_hd = $config_options->{"disksel$i"}) {
+		foreach my $hd (@$hds) {
+		    if (@$hd[1] eq @$cur_hd[1]) {
+			$disk_selector->set_active($hdind+1);
+			last;
+		    }
+		    $hdind++;
+		}
+	    }
+	}
+
+	push @$disk_labeled_widgets, "Harddisk $i", $disk_selector;
+    }
+
+    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');
+
+    return $scrolled_window;
+#    &$create_label_widget_grid($disk_labeled_widgets)
+};
+
+# shared between different ui parts (e.g., ZFS and "normal" single disk FS)
+my $hdsize_size_adj;
+my $hdsize_entry_buffer;
+
+my $get_hdsize_spinbtn = sub {
+    my $hdsize = shift;
+
+    if (!defined($hdsize_size_adj)) {
+	die "called get_hdsize_spinbtn with \$hdsize_size_adj not defined but did not pass hdsize!\n"
+	    if !defined($hdsize);
+	$hdsize_size_adj = Gtk3::Adjustment->new($config_options->{hdsize} || $hdsize, 0, $hdsize+1, 1, 1, 1);
+	$hdsize_entry_buffer = Gtk3::EntryBuffer->new(undef, 1);
+    }
+
+    my $spinbutton_hdsize = Gtk3::SpinButton->new($hdsize_size_adj, 1, 1);
+    $spinbutton_hdsize->set_buffer($hdsize_entry_buffer);
+    $spinbutton_hdsize->set_adjustment($hdsize_size_adj);
+    $spinbutton_hdsize->set_tooltip_text("only use specified size (GB) of the harddisk (rest left unpartitioned)");
+    return $spinbutton_hdsize;
+};
+
+my $create_raid_advanced_grid = sub {
+    my $labeled_widgets = [];
+    my $spinbutton_ashift = Gtk3::SpinButton->new_with_range(9,13,1);
+    $spinbutton_ashift->set_tooltip_text("zpool ashift property (pool sector size, default 2^12)");
+    $spinbutton_ashift->signal_connect ("value-changed" => sub {
+	my $w = shift;
+	$config_options->{ashift} = $w->get_value_as_int();
+    });
+    $config_options->{ashift} = 12 if ! defined($config_options->{ashift});
+    $spinbutton_ashift->set_value($config_options->{ashift});
+    push @$labeled_widgets, "ashift";
+    push @$labeled_widgets, $spinbutton_ashift;
+
+    my $combo_compress = Gtk3::ComboBoxText->new();
+    $combo_compress->set_tooltip_text("zfs compression algorithm for rpool dataset");
+    # note: gzip / lze not allowed for bootfs vdevs
+    my $comp_opts = ["on","off","lzjb","lz4"];
+    foreach my $opt (@$comp_opts) {
+	$combo_compress->append($opt, $opt);
+    }
+    $config_options->{compress} = "on" if !defined($config_options->{compress});
+    $combo_compress->set_active_id($config_options->{compress});
+    $combo_compress->signal_connect (changed => sub {
+	my $w = shift;
+	$config_options->{compress} = $w->get_active_text();
+    });
+    push @$labeled_widgets, "compress";
+    push @$labeled_widgets, $combo_compress;
+
+    my $combo_checksum = Gtk3::ComboBoxText->new();
+    $combo_checksum->set_tooltip_text("zfs checksum algorithm for rpool dataset");
+    my $csum_opts = ["on", "off","fletcher2", "fletcher4", "sha256"];
+    foreach my $opt (@$csum_opts) {
+	$combo_checksum->append($opt, $opt);
+    }
+    $config_options->{checksum} = "on" if !($config_options->{checksum});
+    $combo_checksum->set_active_id($config_options->{checksum});
+    $combo_checksum->signal_connect (changed => sub {
+	my $w = shift;
+	$config_options->{checksum} = $w->get_active_text();
+    });
+    push @$labeled_widgets, "checksum";
+    push @$labeled_widgets, $combo_checksum;
+
+    my $spinbutton_copies = Gtk3::SpinButton->new_with_range(1,3,1);
+    $spinbutton_copies->set_tooltip_text("zfs copies property for rpool dataset (in addition to RAID redundancy!)");
+    $spinbutton_copies->signal_connect ("value-changed" => sub {
+	my $w = shift;
+	$config_options->{copies} = $w->get_value_as_int();
+    });
+    $config_options->{copies} = 1 if !defined($config_options->{copies});
+    $spinbutton_copies->set_value($config_options->{copies});
+    push @$labeled_widgets, "copies", $spinbutton_copies;
+
+    push @$labeled_widgets, "hdsize", $get_hdsize_spinbtn->();
+    return &$create_label_widget_grid($labeled_widgets);;
+};
+
 sub create_hdoption_view {
 
     my $dialog = Gtk3::Dialog->new();
@@ -2203,7 +2589,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;
@@ -2213,7 +2599,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',
@@ -2222,7 +2608,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) {
@@ -2238,55 +2624,14 @@ sub create_hdoption_view {
 
     $row++;
 
-    my @disk_label;
-    my @disk_selector;
-    for (my $i = 0; $i < 8; $i++) {
-	$disk_label[$i] = Gtk3::Label->new ("Hardisk $i");
-	$disk_label[$i]->set_alignment (1, 0.5);
-	$grid->attach($disk_label[$i], 0, $row, 1, 1);
-	$disk_selector[$i] = Gtk3::ComboBoxText->new();
-	$disk_selector[$i]->append_text("-- do not use --");
-	$disk_selector[$i]->set_active(0);
- 	foreach my $hd (@$hds) {
-	    my ($disk, $devname, $size, $model) = @$hd;
-	    $disk_selector[$i]->append_text(get_device_desc ($devname, $size, $model));
-	    $disk_selector[$i]->{pve_disk_id} = $i;
-	    $disk_selector[$i]->signal_connect (changed => sub {
-		my $w = shift;
-		my $diskid = $w->{pve_disk_id};
-		my $a = $w->get_active - 1;
-		$config_options->{"disksel${diskid}"} = ($a >= 0) ? $hds->[$a] : undef;
-	    });
-	}
-
-	if ($hdopion_first_setup) {
-	    $disk_selector[$i]->set_active ($i+1) if $hds->[$i];
-	} else {
-	    my $hdind = 0;
-	    if (my $cur_hd = $config_options->{"disksel$i"}) {
-		foreach my $hd (@$hds) {
-		    if (@$hd[1] eq @$cur_hd[1]) {
-			$disk_selector[$i]->set_active($hdind+1);
-			last;
-		    }
-		    $hdind++;
-		}
-
-	    }
-	}
-
-	$grid->attach($disk_selector[$i], 1, $row, 1, 1);
-
-	$row++;
-    }
-
-    $hdopion_first_setup = 0;
+    my $sep = Gtk3::HSeparator->new();
+    $sep->set_visible(1);
+    $grid->attach($sep, 0, $row, 2, 1);
+    $row++;
 
-    my $label_hdsize = Gtk3::Label->new ("hdsize");
-    $label_hdsize->set_alignment (1, 0.5);
-    $grid->attach($label_hdsize, 0, $row, 1, 1);
+    my $hdsize_labeled_widgets = [];
 
-    # size compute 
+    # size compute
     my $hdsize = 0;
     if ( -b $target_hd) {
 	$hdsize = int(hd_size ($target_hd) / (1024*1024.0)); # size in GB
@@ -2294,88 +2639,82 @@ sub create_hdoption_view {
 	$hdsize = int((-s $target_hd) / (1024*1024*1024.0));
     }
 
-    my $hdsize_size_adj = Gtk3::Adjustment->new($config_options->{hdsize} || $hdsize, 0, $hdsize+1, 1, 1, 1);
-    my $spinbutton_hdsize = Gtk3::SpinButton->new($hdsize_size_adj, 1, 1);
-    $spinbutton_hdsize->set_tooltip_text("only use specified size (GB) of the harddisk (rest left unpartitioned)");
-    $grid->attach($spinbutton_hdsize, 1, $row, 1, 1);
-    $row++;
-
-    my $label_swapsize = Gtk3::Label->new ("swapsize");
-    $label_swapsize->set_alignment (1, 0.5);
-    $grid->attach($label_swapsize, 0, $row, 1, 1);
+    my $spinbutton_hdsize = $get_hdsize_spinbtn->($hdsize);
+    push @$hdsize_labeled_widgets, "hdsize", $spinbutton_hdsize;
 
     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};
-    $grid->attach($entry_swapsize, 1, $row, 1, 1);
-    $row++;
-
-    my $label_maxroot = Gtk3::Label->new ("maxroot");
-    $label_maxroot->set_alignment (1, 0.5);
-    $grid->attach($label_maxroot, 0, $row, 1, 1);
+    $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};
-    $grid->attach($entry_maxroot, 1, $row, 1, 1);
-    $row++;
-
-    my $label_minfree = Gtk3::Label->new ("minfree");
-    $label_minfree->set_alignment (1, 0.5);
-    $grid->attach($label_minfree, 0, $row, 1, 1);
+    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("minumum free LVM space (GB, required for LVM snapshots)");
+    $entry_minfree->set_tooltip_text("minimum free LVM space (GB, required for LVM snapshots)");
     $entry_minfree->signal_connect (key_press_event => \&check_float);
-    $entry_minfree->set_text($config_options->{minfree}) if $config_options->{minfree};
-    $grid->attach($entry_minfree, 1, $row, 1, 1);
-    $row++;
-
-    my $label_maxvz = Gtk3::Label->new ("maxvz");
-    $label_maxvz->set_alignment (1, 0.5);
-    $grid->attach($label_maxvz, 0, $row, 1, 1);
+    $entry_minfree->set_text($config_options->{minfree}) if defined($config_options->{minfree});
+    push @$hdsize_labeled_widgets, "minfree", $entry_minfree;
+
+    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 $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};
-    $grid->attach($entry_maxvz, 1, $row, 1, 1);
+    my $options_stack = Gtk3::Stack->new();
+    $options_stack->set_visible(1);
+    $options_stack->set_hexpand(1);
+    $options_stack->set_vexpand(1);
+    $options_stack->add_titled(&$create_raid_disk_grid(), "raiddisk", "Disk Setup");
+    $options_stack->add_titled(&$create_label_widget_grid($hdsize_labeled_widgets), "hdsize", "Size Options");
+    $options_stack->add_titled(&$create_raid_advanced_grid("zfs"), "raidzfsadvanced", "Advanced Options");
+    $options_stack->set_visible_child_name("raiddisk");
+    my $options_stack_switcher = Gtk3::StackSwitcher->new();
+    $options_stack_switcher->set_halign('center');
+    $options_stack_switcher->set_stack($options_stack);
+    $grid->attach($options_stack_switcher, 0, $row, 2, 1);
     $row++;
+    $grid->attach($options_stack, 0, $row, 2, 1);
+    $row++;
+
+    $hdopion_first_setup = 0;
 
-    my $set_sensitive_flag = sub {
-	my $enable_size_hints = $config_options->{filesys} !~ m/zfs|btrfs/;
+    my $switch_view = sub {
+	my $raid = $config_options->{filesys} =~ m/zfs|btrfs/;
+	my $enable_zfs_opts = $config_options->{filesys} =~ m/zfs/;
 
-	if ($config_options->{filesys} =~ m/zfs|btrfs/) {
-	    $target_hd_combo->set_visible(0);
+	$target_hd_combo->set_visible(!$raid);
+	$options_stack->get_child_by_name("hdsize")->set_visible(!$raid);
+	$options_stack->get_child_by_name("raiddisk")->set_visible($raid);
+	$options_stack_switcher->set_visible($enable_zfs_opts);
+	$options_stack->get_child_by_name("raidzfsadvanced")->set_visible($enable_zfs_opts);
+	if ($raid) {
 	    $target_hd_label->set_text("Target: $config_options->{filesys} ");
-	    foreach my $w (@disk_selector) { $w->set_visible(1); }
-	    foreach my $w (@disk_label) { $w->set_visible(1); }
+	    $options_stack->set_visible_child_name("raiddisk");
 	} else {
-	    $target_hd_combo->set_visible(1);
-	    foreach my $w (@disk_selector) { $w->set_visible(0); }
-	    foreach my $w (@disk_label) { $w->set_visible(0); }
 	    $target_hd_label->set_text("Target Harddisk: ");
 	}
-
-	$spinbutton_hdsize->set_visible($enable_size_hints);
-	$label_hdsize->set_visible($enable_size_hints);
-	$entry_swapsize->set_visible($enable_size_hints);
-	$label_swapsize->set_visible($enable_size_hints);
-	$entry_maxroot->set_visible($enable_size_hints);
-	$label_maxroot->set_visible($enable_size_hints);
-	$entry_minfree->set_visible($enable_size_hints);
-	$label_minfree->set_visible($enable_size_hints);
-	$entry_maxvz->set_visible($enable_size_hints);
-	$label_maxvz->set_visible($enable_size_hints);
+	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);
     };
 
-    &$set_sensitive_flag();
+    &$switch_view();
 
     $fstypecb->signal_connect (changed => sub {
 	$config_options->{filesys} = $fstypecb->get_active_text();
-	&$set_sensitive_flag();
+	&$switch_view();
     });
 
     $dialog->show();
@@ -2422,7 +2761,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};
@@ -2436,10 +2775,10 @@ my $get_raid_devlist = sub {
     my $dev_name_hash = {};
 
     my $devlist = [];
-    for (my $i = 0; $i < 8; $i++) {
+    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;
@@ -2486,7 +2825,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) {
@@ -2573,7 +2912,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');
@@ -2613,7 +2952,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);
@@ -2637,7 +2977,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 = $@;
@@ -2659,6 +2999,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);
@@ -2666,28 +3016,42 @@ sub create_intro_view {
 
 $ipconf = get_ip_config ();
 
-$country = detect_country() if $ipconf->{addr} || $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;