X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=proxinstall;h=2c44567f4dc9d6eee437d5e8223fc36733ab4031;hb=c5c6fe94509ed383ea5e7cf6bda88b6d6bf6d402;hp=b33fe9849970c74c108a1b29501ab4a30f43caff;hpb=038552a1577be1400420c4b8f93fc1f2875a38d3;p=pve-installer.git

diff --git a/proxinstall b/proxinstall
index b33fe98..2c44567 100755
--- a/proxinstall
+++ b/proxinstall
@@ -13,7 +13,7 @@ use IO::File;
 use IO::Select;
 use Cwd 'abs_path';
 use Gtk3 '-init';
-use Gtk3::WebKit;
+use Gtk3::WebKit2;
 use Encode;
 use String::ShellQuote;
 use Data::Dumper;
@@ -24,26 +24,20 @@ use ProxmoxInstallerSetup;
 
 my $setup = ProxmoxInstallerSetup::setup();
 
-my $release = $setup->{release};
-
-my $kapi = `uname -r`;
-chomp $kapi;
-
-my $enable_btrfs = $setup->{enable_btrfs};
-
 my $opt_testmode;
 
 if (!$ENV{G_SLICE} ||  $ENV{G_SLICE} ne "always-malloc") {
     die "do not use slice allocator (run with 'G_SLICE=always-malloc ./proxinstall ...')\n";
 }
 
-if (!GetOptions ('testmode=s' => \$opt_testmode)) {
+if (!GetOptions('testmode=s' => \$opt_testmode)) {
     die "usage error\n";
     exit (-1);
 }
 
 my $zfstestpool = "test_rpool";
 my $zfspoolname = $opt_testmode ? $zfstestpool : 'rpool';
+my $zfsrootvolname = "$setup->{product}-1";
 
 my $storage_cfg_zfs = <<__EOD__;
 dir: local
@@ -78,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) = @_;
@@ -90,7 +89,7 @@ sub file_read_firstline {
     return $res;
 }
 
-my $logfd = IO::File->new (">/tmp/install.log");
+my $logfd = IO::File->new(">/tmp/install.log");
 
 my $proxmox_libdir = $opt_testmode ?
     Cwd::cwd() . "/testdir/var/lib/pve-installer" : "/var/lib/pve-installer";
@@ -99,7 +98,7 @@ 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)";
@@ -150,7 +149,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 = [
@@ -189,9 +190,54 @@ my $ipv4_reverse_mask = [
     '255.255.255.255',
 ];
 
+my $step_number = 0; # Init number for global function list
+
+my @steps = (
+    {
+	step => 'intro',
+	html => 'license.htm',
+	next_button => 'I a_gree',
+	function => \&create_intro_view,
+    },
+    {
+	step => 'intro',
+	html => 'page1.htm',
+	function => \&create_hdsel_view,
+    },
+    {
+	step => 'country',
+	html => 'country.htm',
+	function => \&create_country_view,
+    },
+    {
+	step => 'password',
+	html => 'passwd.htm',
+	function => \&create_password_view,
+    },
+    {
+	step => 'ipconf',
+	html => 'ipconf.htm',
+	function => \&create_ipconf_view,
+    },
+    {
+	step => 'ack',
+	html => 'ack.htm',
+	next_button => '_Install',
+	function => \&create_ack_view,
+    },
+    {
+	step => 'extract',
+	next_button => '_Reboot',
+	function => \&create_extract_view,
+    },
+);
+
+# GUI global variables
 my ($window, $cmdbox, $inbox, $htmlview);
+my $prev_btn;
 my ($next, $next_fctn, $target_hd);
 my ($progress, $progress_status);
+
 my ($ipversion, $ipaddress, $ipconf_entry_addr);
 my ($netmask, $ipconf_entry_mask);
 my ($gateway, $ipconf_entry_gw);
@@ -202,11 +248,28 @@ my $cmdline = file_read_firstline("/proc/cmdline");
 my $ipconf;
 my $country;
 my $timezone = 'Europe/Vienna';
-my $password;
-my $mailto;
 my $keymap = 'en-us';
+my $password;
+my $mailto = 'mail@example.invalid';
 my $cmap;
 
+my $config = {
+    # TODO: add all the user-provided options for previous button
+    country => $country,
+    timezone => $timezone,
+    keymap => $keymap,
+
+    password => $password,
+    mailto => $mailto,
+
+    mngmt_nic => undef,
+    hostname => $hostname,
+    fqdn => undef,
+    ipaddress => undef,
+    netmask => undef,
+    gateway => undef,
+};
+
 # parse command line args
 
 my $config_options = {};
@@ -232,9 +295,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;
@@ -283,7 +348,7 @@ sub cmd2string {
 sub syscmd {
     my ($cmd) = @_;
 
-    return run_command ($cmd, undef, undef, 1);
+    return run_command($cmd, undef, undef, 1);
 }
 
 sub run_command {
@@ -326,7 +391,7 @@ sub run_command {
 
     my $pid;
     eval {
-	$pid = open3 ($writer, $reader, $error, @$cmd) || die $!;
+	$pid = open3($writer, $reader, $error, @$cmd) || die $!;
     };
 
     my $err = $@;
@@ -343,8 +408,8 @@ sub run_command {
     close $writer;
 
     my $select = new IO::Select;
-    $select->add ($reader);
-    $select->add ($error);
+    $select->add($reader);
+    $select->add($error);
 
     my ($ostream, $logout) = ('', '', '');
 
@@ -364,7 +429,7 @@ sub run_command {
 		waitpid ($pid, 0);
 		die "command '$cmd' failed: $err";
 	    }
-	    $select->remove ($h) if !$count;
+	    $select->remove($h) if !$count;
 	    if ($h eq $reader) {
 		$ostream .= $buf if !($noout || $func);
 		$logout .= $buf;
@@ -475,7 +540,7 @@ sub find_stable_path {
     my ($stabledir, $bdev) = @_;
 
     foreach my $path (<$stabledir/*>) {
-	if (link_points_to ($path, $bdev)) {
+	if (link_points_to($path, $bdev)) {
 	    return wantarray ? ($path, basename($path)) : $path;
 	}
     }
@@ -484,7 +549,7 @@ sub find_stable_path {
 sub find_dev_by_uuid {
     my $bdev = shift;
 
-    my ($full_path, $name) = find_stable_path ("/dev/disk/by-uuid", $bdev);
+    my ($full_path, $name) = find_stable_path("/dev/disk/by-uuid", $bdev);
 
     return $name;
 }
@@ -494,7 +559,11 @@ sub hd_list {
     my $res = ();
 
     if ($opt_testmode) {
-	push @$res, [-1, $opt_testmode, int((-s $opt_testmode)/512), "TESTDISK"];
+	my @disks = split /,/, $opt_testmode;
+
+	for my $disk (@disks) {
+	    push @$res, [-1, $disk, int((-s $disk)/512), "TESTDISK"];
+	}
 	return $res;
     }
 
@@ -603,7 +672,7 @@ sub read_cmap {
 }
 
 # search for Harddisks
-my $hds = hd_list ();
+my $hds = hd_list();
 
 sub hd_size {
     my ($dev) = @_;
@@ -620,7 +689,12 @@ 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/xvd[a-z]$|) {
+	# Citrix Hypervisor blockdev
+	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";
@@ -654,7 +728,7 @@ sub file_get_contents {
 sub write_config {
     my ($text, $filename) = @_;
 
-    my $fd = IO::File->new (">$filename") ||
+    my $fd = IO::File->new(">$filename") ||
 	die "unable to open file '$filename' - $!\n";
     print $fd $text;
     $fd->close();
@@ -670,6 +744,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();
 }
 
@@ -704,20 +780,20 @@ 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 {
+    update_progress(0, $rs, $re, "creating $name filesystem");
+
+    run_command("$fsdata->{mkfs} $opts $dev", sub {
 	my $line = shift;
 
 	if ($line =~ m/Writing inode tables:\s+(\d+)\/(\d+)/) {
 	    $max = $2;
 	} elsif ($max && $line =~ m/(\d+)\/$max/) {
-	    update_progress (($1/$max)*0.9, $rs, $re);
+	    update_progress(($1/$max)*0.9, $rs, $re);
 	} elsif ($line =~ m/Creating journal.*done/) {
-	    update_progress (0.95, $rs, $re);
+	    update_progress(0.95, $rs, $re);
 	} elsif ($line =~ m/Writing superblocks and filesystem.*done/) {
-	    update_progress (1, $rs, $re);
+	    update_progress(1, $rs, $re);
 	}
     });
 }
@@ -726,29 +802,29 @@ sub debconfig_set {
     my ($targetdir, $dcdata) = @_;
 
     my $cfgfile = "/tmp/debconf.txt";
-    write_config ($dcdata, "$targetdir/$cfgfile");
-    syscmd ("chroot $targetdir debconf-set-selections $cfgfile");
+    write_config($dcdata, "$targetdir/$cfgfile");
+    syscmd("chroot $targetdir debconf-set-selections $cfgfile");
     unlink "$targetdir/$cfgfile";
 }
 
 sub diversion_add {
     my ($targetdir, $cmd, $new_cmd) = @_;
 
-    syscmd ("chroot $targetdir dpkg-divert --package proxmox " .
-	    "--add --rename $cmd") == 0 ||
-	    die "unable to exec dpkg-divert\n";
+    syscmd("chroot $targetdir dpkg-divert --package proxmox " .
+	   "--add --rename $cmd") == 0 ||
+	   die "unable to exec dpkg-divert\n";
 
-    syscmd ("ln -sf ${new_cmd} $targetdir/$cmd") == 0 ||
+    syscmd("ln -sf ${new_cmd} $targetdir/$cmd") == 0 ||
 	die "unable to link diversion to ${new_cmd}\n";
 }
 
 sub diversion_remove {
     my  ($targetdir, $cmd) = @_;
 
-    syscmd ("mv $targetdir/${cmd}.distrib $targetdir/${cmd};") == 0 ||
+    syscmd("mv $targetdir/${cmd}.distrib $targetdir/${cmd};") == 0 ||
 	die "unable to remove $cmd diversion\n";
 
-    syscmd ("chroot $targetdir dpkg-divert --remove $cmd") == 0 ||
+    syscmd("chroot $targetdir dpkg-divert --remove $cmd") == 0 ||
 	die "unable to remove $cmd diversion\n";
 }
 
@@ -776,73 +852,45 @@ sub zfs_create_rpool {
     $cmd .= " -o ashift=$config_options->{ashift}"
         if defined($config_options->{ashift});
 
-    syscmd ("$cmd $zfspoolname $vdev") == 0 ||
+    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")  == 0 ||
+        die "unable to create zfs $zfspoolname/ROOT 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 install
-    syscmd ("zfs set atime=off $zfspoolname") == 0 ||
+    syscmd("zfs set atime=off $zfspoolname") == 0 ||
 	die "unable to set zfs properties\n";
 
     my $value = $config_options->{compress};
-    syscmd ("zfs set compression=$value $zfspoolname")
+    syscmd("zfs set compression=$value $zfspoolname")
         if defined($value) && $value ne 'off';
 
     $value = $config_options->{checksum};
-    syscmd ("zfs set checksum=$value $zfspoolname")
+    syscmd("zfs set checksum=$value $zfspoolname")
         if defined($value) && $value ne 'on';
 
     $value = $config_options->{copies};
-    syscmd ("zfs set copies=$value $zfspoolname")
+    syscmd("zfs set copies=$value $zfspoolname")
         if defined($value) && $value != 1;
 }
 
-sub zfs_create_swap {
-    my ($swapsize) = @_;
-
-    my $cmd = "zfs create -V ${swapsize}K -b 4K";
-
-    $cmd .= " -o com.sun:auto-snapshot=false";
-
-    # copies for swap does not make sense
-    $cmd .= " -o copies=1";
-
-    # reduces memory pressure
-    $cmd .= " -o sync=always";
-
-    # cheapest compression to drop zero pages
-    $cmd .= " -o compression=zle";
-
-    # skip log devices
-    $cmd .= " -o logbias=throughput";
-    # only cache metadata in RAM (caching swap content does not make sense)
-    $cmd .= " -o primarycache=metadata";
-    # don't cache anything in L2ARC
-    $cmd .= " -o secondarycache=none";
-
-    $cmd .= " $zfspoolname/swap";
-    syscmd ($cmd)  == 0 ||
-	die "unable to create zfs swap device\n";
-
-    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");
+    syscmd("udevadm trigger --subsystem-match block");
+    syscmd("udevadm settle --timeout 10");
 };
 
 my $clean_disk = sub {
@@ -858,27 +906,30 @@ my $clean_disk = sub {
 };
 
 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 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 - BIOS boot partition (Grub Stage2): first free 1M
-    # 2 - EFI ESP: next free 256M
+    # 2 - EFI ESP: next free 512M
     # 3 - OS/Data partition: rest, up to $maxhdsize in MB
 
     my $grubbootdev = get_partition_dev($target_dev, 1);
@@ -887,22 +938,25 @@ sub partition_bootable_disk {
 
     my $pcmd = ['sgdisk'];
 
-    my $pnum = 1;
-    push @$pcmd, "-n${pnum}:1M:+1M", "-t$pnum:EF02";
-
-    $pnum = 2;
-    push @$pcmd, "-n${pnum}:2M:+256M", "-t$pnum:EF00";
+    my $pnum = 2;
+    push @$pcmd, "-n${pnum}:1M:+512M", "-t$pnum:EF00";
 
     $pnum = 3;
-    push @$pcmd, "-n${pnum}:258M:${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 - 258*1024; # 256M + 1M + 1M alignment
+    my $os_size = $hdsize - 513*1024; # 512M efi + 1M bios_boot + 1M alignment
 
     syscmd($pcmd) == 0 ||
 	die "unable to partition harddisk '${target_dev}'\n";
 
+    $pnum = 1;
+    $pcmd = ['sgdisk', '-a1', "-n$pnum:34:2047", "-t$pnum:EF02" , $target_dev];
+
+    syscmd($pcmd) == 0 ||
+	die "unable to create bios_boot partition '${target_dev}'\n";
+
     &$udevadm_trigger_block();
 
     foreach my $part ($efibootdev, $osdev) {
@@ -912,116 +966,97 @@ sub partition_bootable_disk {
     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)
-
-    my $hdgb = int($hdsize/(1024*1024));
-    die "hardisk '$target_dev' too small (${hdsize}GB)\n" if $hdgb < 8;
+sub create_lvm_volumes {
+    my ($lvmdev, $os_size, $swap_size) = @_;
 
-    # 1 - GRUB boot partition: 1M 
-    # 2 - OS/Data partition
-    # 9 - ZFS reserved partition
+    my $vgname = $setup->{product};
 
-    my $grubbootdev = get_partition_dev($target_dev, 1);
-    my $osdev = get_partition_dev ($target_dev, 2);
-
-    my $pcmd = ['sgdisk', '-a1'];
+    my $rootdev = "/dev/$vgname/root";
+    my $datadev = "/dev/$vgname/data";
+    my $swapfile;
 
-    my $pnum = 1;
-    push @$pcmd, "-n$pnum:34:2047", "-t$pnum:EF02";
+    # 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 $vgname $lvmdev") == 0 ||
+	die "unable to create volume group '$vgname'\n";
 
-    $pnum = 9;
-    push @$pcmd, "-n$pnum:-8M:0", "-t$pnum:BF07";
+    my $hdgb = int($os_size/(1024*1024));
+    my $space = (($hdgb > 128) ? 16 : ($hdgb/8))*1024*1024;
 
-    $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;
+    my $rootsize;
+    my $datasize;
 
-    syscmd($pcmd) == 0 ||
-	die "unable to partition harddisk '${target_dev}'\n";
+    if ($setup->{product} eq 'pve') {
 
-    &$udevadm_trigger_block();
+	my $maxroot;
+	if ($config_options->{maxroot}) {
+	    $maxroot = $config_options->{maxroot};
+	} else {
+	    $maxroot = 96;
+	}
 
-    syscmd("dd if=/dev/zero of=$osdev bs=1M count=16") if -b $osdev;
+	$rootsize = (($hdgb > ($maxroot*4)) ? $maxroot : $hdgb/4)*1024*1024;
 
-    return ($os_size, $osdev);
-}
+	my $rest = $os_size - $swap_size - $rootsize; # in KB
 
-sub create_lvm_volumes {
-    my ($lvmdev, $os_size, $swap_size) = @_;
+	my $minfree;
+	if (defined($config_options->{minfree})) {
+	    $minfree = (($config_options->{minfree}*1024*1024) >= $rest ) ? $space :
+		$config_options->{minfree}*1024*1024 ;
+	} else {
+	    $minfree = $space;
+	}
 
-    my $rootdev = '/dev/pve/root';
-    my $datadev = '/dev/pve/data';
-    my $swapfile = '/dev/pve/swap';
+	$rest = $rest - $minfree;
 
-    # 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";
+	if (defined($config_options->{maxvz})) {
+	    $rest = (($config_options->{maxvz}*1024*1024) <= $rest) ?
+		$config_options->{maxvz}*1024*1024 : $rest;
+	}
 
-    my $hdgb = int($os_size/(1024*1024));
-    my $space = (($hdgb > 128) ? 16 : ($hdgb/8))*1024*1024;
+	$datasize = $rest;
 
-    my $maxroot;
-    if ($config_options->{maxroot}) {
-	$maxroot = $config_options->{maxroot};
     } else {
-	$maxroot = 96;
+	my $minfree = defined($config_options->{minfree}) ? $config_options->{minfree}*1024*1024 : $space;
+	$rootsize = $os_size - $minfree - $swap_size; # in KB
     }
 
-    my $rootsize = (($hdgb > ($maxroot*4)) ? $maxroot : $hdgb/4)*1024*1024;
-
-    my $rest = $os_size - $swap_size - $rootsize; # in KB
+    if ($swap_size) {
+	syscmd("/sbin/lvcreate -L${swap_size}K -nswap $vgname") == 0 ||
+	    die "unable to create swap volume\n";
 
-    my $minfree;
-    if ($config_options->{minfree}) {
-	$minfree = (($config_options->{minfree}*1024*1024) >= $rest ) ? $space : 
-	    $config_options->{minfree}*1024*1024 ;
-    } else {
-	$minfree = $space;
+	$swapfile = "/dev/$vgname/swap";
     }
 
-    $rest = $rest - $minfree;
+    syscmd("/sbin/lvcreate -L${rootsize}K -nroot $vgname") == 0 ||
+	die "unable to create root volume\n";
 
-    if ($config_options->{maxvz}) {
-	$rest = (($config_options->{maxvz}*1024*1024) <= $rest) ? 
-	    $config_options->{maxvz}*1024*1024 : $rest;
-    }
+    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
 
-    syscmd ("/sbin/lvcreate -L${swap_size}K -nswap pve") == 0 ||
-	die "unable to create swap volume\n";
+	# otherwise the metadata is taken out of $minfree
+	$datasize -= 2*$metadatasize;
 
-    syscmd ("/sbin/lvcreate -L${rootsize}K -nroot pve") == 0 ||
-	die "unable to create root volume\n";
+	# 1 4MB PE to allow for rounding
+	$datasize -= 4*1024;
 
-    syscmd ("/sbin/lvcreate -L${rest}K -ndata pve") == 0 ||
-	die "unable to create data volume\n";
+	syscmd("/sbin/lvcreate -L${datasize}K -ndata $vgname") == 0 ||
+	    die "unable to create data volume\n";
 
-    syscmd ("/sbin/lvconvert --yes --type thin-pool pve/data") == 0 ||
-	die "unable to create data thin-pool\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 {
@@ -1030,7 +1065,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);
@@ -1053,9 +1088,9 @@ sub extract_data {
 
     my $bootdevinfo = [];
 
-    my $datadev;
     my $swapfile;
     my $rootdev;
+    my $datadev;
 
     my $use_zfs = 0;
     my $use_btrfs = 0;
@@ -1065,12 +1100,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--) {
@@ -1087,7 +1122,7 @@ sub extract_data {
 
 	my $maxper = 0.25;
 
-	update_progress (0, 0, $maxper, "create partitions");
+	update_progress(0, 0, $maxper, "create partitions");
 
 	syscmd("vgchange -an") if !$opt_testmode; # deactivate all detected VGs
 
@@ -1098,7 +1133,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');
@@ -1108,10 +1143,10 @@ sub extract_data {
 		die "unsupported zfs mode (for testing environment)\n"
 		    if $filesys ne 'zfs (RAID0)';
 
-		syscmd ("zpool destroy $zfstestpool");
+		syscmd("zpool destroy $zfstestpool");
 
 		zfs_create_rpool($rootdev);
-	    
+
 	    } else {
 
 		# nothing to do
@@ -1149,8 +1184,9 @@ sub extract_data {
 	    }
 	    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;
@@ -1161,7 +1197,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};
@@ -1171,34 +1207,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
@@ -1207,21 +1234,21 @@ sub extract_data {
 
 	if ($use_zfs) {
 	    # to be fast during installation
-	    syscmd ("zfs set sync=disabled $zfspoolname") == 0 ||
+	    syscmd("zfs set sync=disabled $zfspoolname") == 0 ||
 		die "unable to set zfs properties\n";
 	}
 
-	update_progress (0.03, 0, $maxper, "create swap space");
+	update_progress(0.03, 0, $maxper, "create swap space");
 	if ($swapfile) {
-	    syscmd ("mkswap -f $swapfile") == 0 ||
+	    syscmd("mkswap -f $swapfile") == 0 ||
 		die "unable to create swap space\n";
 	}
 
-	update_progress (0.05, 0, $maxper, "creating filesystems");
+	update_progress(0.05, 0, $maxper, "creating filesystems");
 
 	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";
 	}
 
@@ -1230,10 +1257,10 @@ sub extract_data {
 	} elsif ($use_btrfs) {
 	    # do nothing
 	} else {
-	    create_filesystem ($rootdev, 'root', $filesys, 0.05, $maxper, 0, 1);
+	    create_filesystem($rootdev, 'root', $filesys, 0.05, $maxper, 0, 1);
 	}
 
-	update_progress (1, 0.05, $maxper, "mounting target $rootdev");
+	update_progress(1, 0.05, $maxper, "mounting target $rootdev");
 
 	if ($use_zfs) {
 	    # do nothing
@@ -1251,16 +1278,23 @@ 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");
+	mkdir "$targetdir/mnt";
+	mkdir "$targetdir/mnt/hostrun";
+	syscmd("mount --bind /run $targetdir/mnt/hostrun") == 0 ||
+	    die "unable to bindmount run on $targetdir/mnt/hostrun\n";
+
+	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";
@@ -1271,7 +1305,7 @@ sub extract_data {
 	my $per = 0;
 	my $count = 0;
 
-	run_command ("unsquashfs -f -dest $targetdir -i $basefile", sub {
+	run_command("unsquashfs -f -dest $targetdir -i $basefile", sub {
 	    my $line = shift;
 	    return if $line !~ m/^$targetdir/;
 	    $count++;
@@ -1279,25 +1313,26 @@ sub extract_data {
 	    if ($nper != $per) {
 		$per = $nper;
 		my $frac = $per > 100 ? 1 : $per/100;
-		update_progress ($frac, $maxper, 0.5);
+		update_progress($frac, $maxper, 0.5);
 	    }
 	});
 
-	syscmd ("mount -n -t tmpfs tmpfs $targetdir/tmp") == 0 ||
+	syscmd("mount -n -t tmpfs tmpfs $targetdir/tmp") == 0 ||
 	    die "unable to mount tmpfs on $targetdir/tmp\n";
-	syscmd ("mount -n -t proc proc $targetdir/proc") == 0 ||
+	syscmd("mount -n -t proc proc $targetdir/proc") == 0 ||
 	    die "unable to mount proc on $targetdir/proc\n";
-	syscmd ("mount -n -t sysfs sysfs $targetdir/sys") == 0 ||
+	syscmd("mount -n -t sysfs sysfs $targetdir/sys") == 0 ||
 	    die "unable to mount sysfs on $targetdir/sys\n";
+	syscmd("chroot $targetdir mount --bind /mnt/hostrun /run") == 0 ||
+	    die "unable to re-bindmount hostrun on /run in chroot\n";
 
-	display_html ("extract3-spam.htm");
-	update_progress (1, $maxper, 0.5, "configuring base system");
+	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" .
@@ -1306,11 +1341,11 @@ sub extract_data {
 	    "ff02::2 ip6-allrouters\n" .
 	    "ff02::3 ip6-allhosts\n";
 
-	write_config ($hosts, "$targetdir/etc/hosts");
+	write_config($hosts, "$targetdir/etc/hosts");
 
-	write_config ("$hostname\n", "$targetdir/etc/hostname");
+	write_config("$hostname\n", "$targetdir/etc/hostname");
 
-	syscmd ("/bin/hostname $hostname") if !$opt_testmode;
+	syscmd("/bin/hostname $hostname") if !$opt_testmode;
 
 	# configure interfaces
 
@@ -1318,32 +1353,40 @@ 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";
 	}
 
-	write_config ($ifaces, "$targetdir/etc/network/interfaces");
+	write_config($ifaces, "$targetdir/etc/network/interfaces");
 
 	# configure dns
 
 	my $resolvconf = "search $domain\nnameserver $dnsserver\n";
-	write_config ($resolvconf, "$targetdir/etc/resolv.conf");
+	write_config($resolvconf, "$targetdir/etc/resolv.conf");
 
 	# configure fstab
 
@@ -1382,7 +1425,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";
 		}
 	    }
@@ -1393,21 +1436,21 @@ sub extract_data {
 
 	$fstab .= "proc /proc proc defaults 0 0\n";
 
-	write_config ($fstab, "$targetdir/etc/fstab");
-	write_config ("", "$targetdir/etc/mtab");
+	write_config($fstab, "$targetdir/etc/fstab");
+	write_config("", "$targetdir/etc/mtab");
 
-	syscmd ("cp ${proxmox_libdir}/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_libdir}/fake-start-stop-daemon " .
+	syscmd("cp ${proxmox_libdir}/fake-start-stop-daemon " .
 		"$targetdir/sbin/") == 0 ||
 		die "unable to copy start-stop-daemon\n";
 
-	diversion_add ($targetdir, "/sbin/start-stop-daemon", "/sbin/fake-start-stop-daemon");
-	diversion_add ($targetdir, "/usr/sbin/update-grub", "/bin/true");
-	diversion_add ($targetdir, "/usr/sbin/update-initramfs", "/bin/true");
+	diversion_add($targetdir, "/sbin/start-stop-daemon", "/sbin/fake-start-stop-daemon");
+	diversion_add($targetdir, "/usr/sbin/update-grub", "/bin/true");
+	diversion_add($targetdir, "/usr/sbin/update-initramfs", "/bin/true");
 
-	syscmd ("touch  $targetdir/proxmox_install_mode");
+	syscmd("touch  $targetdir/proxmox_install_mode");
 
 	my $grub_install_devices_txt = '';
 	foreach my $di (@$bootdevinfo) {
@@ -1417,13 +1460,13 @@ sub extract_data {
 
 	# 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
+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
@@ -1444,101 +1487,115 @@ _EOD
 #		$count++;
 #		next;
 #	    }
-	    update_progress ($count/$pkg_count, 0.5, 0.75, "extracting $deb");
+	    update_progress($count/$pkg_count, 0.5, 0.75, "extracting $deb");
 	    print "extracting: $deb\n";
-	    syscmd ("cp $path $targetdir/tmp/$deb") == 0 ||
+	    syscmd("cp $path $targetdir/tmp/$deb") == 0 ||
 		die "installation of package $deb failed\n";
-	    syscmd ("chroot $targetdir dpkg $dpkg_opts --force-depends --no-triggers --unpack /tmp/$deb") == 0 ||
+	    syscmd("chroot $targetdir dpkg $dpkg_opts --force-depends --no-triggers --unpack /tmp/$deb") == 0 ||
 		die "installation of package $deb failed\n";
-	    update_progress ((++$count)/$pkg_count, 0.5, 0.75);
+	    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;
-	run_command ($cmd, sub {
+	run_command($cmd, sub {
 	    my $line = shift;
 	    if ($line =~ m/Setting up\s+(\S+)/) {
-		update_progress ((++$count)/$pkg_count, 0.75, 0.95,
-				 "configuring $1");
+		update_progress((++$count)/$pkg_count, 0.75, 0.95,
+				"configuring $1");
 	    }
 	});
 
-	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");
+	write_config($postfix_main_cf, "$targetdir/etc/postfix/main.cf");
 
 	# make sure we have all postfix directories
-	syscmd ("chroot $targetdir /usr/sbin/postfix check");
+	syscmd("chroot $targetdir /usr/sbin/postfix check");
 	# cleanup mail queue
-	syscmd ("chroot $targetdir /usr/sbin/postsuper -d ALL");
+	syscmd("chroot $targetdir /usr/sbin/postsuper -d ALL");
 
 	# enable NTP (timedatectl set-ntp true  does not work without DBUS)
-	syscmd ("chroot $targetdir /bin/systemctl enable systemd-timesyncd.service");
+	syscmd("chroot $targetdir /bin/systemctl enable systemd-timesyncd.service");
 
 	unlink  "$targetdir/proxmox_install_mode";
 
 	# set timezone
 	unlink ("$targetdir/etc/localtime");
 	symlink ("/usr/share/zoneinfo/$timezone", "$targetdir/etc/localtime");
-	write_config ("$timezone\n", "$targetdir/etc/timezone");
+	write_config("$timezone\n", "$targetdir/etc/timezone");
 
 	# set apt mirror
 	if (my $mirror = $cmap->{country}->{$country}->{mirror}) {
 	    my $fn = "$targetdir/etc/apt/sources.list";
-	    syscmd ("sed -i 's/ftp\\.debian\\.org/$mirror/' '$fn'");
+	    syscmd("sed -i 's/ftp\\.debian\\.org/$mirror/' '$fn'");
 	}
 
 	# create extended_states for apt (avoid cron job warning if that
 	# file does not exist)
-	write_config ('', "$targetdir/var/lib/apt/extended_states");
+	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";
+	}
 
-	update_progress (0.8, 0.95, 1, "make system bootable");
+	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");
+	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");
 	    symlink ("/proc/mounts", "$targetdir/etc/mtab");
-	    syscmd ("mount -n --bind /dev $targetdir/dev");
+	    syscmd("mount -n --bind /dev $targetdir/dev");
 
-	    syscmd ("chroot $targetdir /usr/sbin/update-initramfs -c -k $kapi") == 0 ||
+	    syscmd("chroot $targetdir /usr/sbin/update-initramfs -c -k $kapi") == 0 ||
 		die "unable to install initramfs\n";
 
 	    foreach my $di (@$bootdevinfo) {
 		my $dev = $di->{devname};
-		syscmd ("chroot $targetdir /usr/sbin/grub-install --target i386-pc --no-floppy --bootloader-id='proxmox' $dev") == 0 ||
+		syscmd("chroot $targetdir /usr/sbin/grub-install --target i386-pc --no-floppy --bootloader-id='proxmox' $dev") == 0 ||
 			die "unable to install the i386-pc boot loader on '$dev'\n";
 
 		if ($di->{esp}) {
-		    syscmd ("mount -n $di->{esp} -t vfat $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");
+		    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";
@@ -1551,36 +1608,32 @@ _EOD
 		    syscmd("cp $targetdir/boot/efi/EFI/proxmox/grubx64.efi $targetdir/boot/efi/EFI/BOOT/BOOTx64.EFI") == 0 ||
 			die "unable to copy efi boot loader\n";
 
-		    syscmd ("umount $targetdir/boot/efi") == 0 ||
+		    syscmd("umount $targetdir/boot/efi") == 0 ||
 			die "unable to umount $targetdir/boot/efi\n";
 		}
 	    }
 
-	    syscmd ("chroot $targetdir /usr/sbin/update-grub") == 0 ||
+	    syscmd("chroot $targetdir /usr/sbin/update-grub") == 0 ||
 		die "unable to update boot loader config\n";
 
-	    syscmd ("umount $targetdir/dev");
+	    syscmd("umount $targetdir/dev");
 	}
 
 	# cleanup
 
-	# hack: remove dead.letter from sshd installation
-	syscmd ("rm -rf $targetdir/dead.letter");
-
 	unlink "$targetdir/usr/sbin/policy-rc.d";
 
-	diversion_remove ($targetdir, "/sbin/start-stop-daemon");
+	diversion_remove($targetdir, "/sbin/start-stop-daemon");
 
 	# set root password
 	my $octets = encode("utf-8", $password);
-	run_command ("chroot $targetdir /usr/sbin/chpasswd", undef,
-		     "root:$octets\n");
+	run_command("chroot $targetdir /usr/sbin/chpasswd", undef,
+		    "root:$octets\n");
 
 	if ($setup->{product} eq 'pmg') {
-	    mkdir "/etc/pmg";
 	    # save admin email
-	    write_config ("#Unix Superuser\nroot:1:0::root:${mailto}:::\n",
-			  "/etc/pmg/user.conf");
+	    write_config("section: admin\n\temail ${mailto}\n",
+			 "$targetdir/etc/pmg/pmg.conf");
 
 	} elsif ($setup->{product} eq 'pve') {
 
@@ -1591,32 +1644,34 @@ _EOD
 
 	    # write vnc keymap to datacenter.cfg
 	    my $vnckmap = $cmap->{kmap}->{$keymap}->{kvm} || 'en-us';
-	    write_config ("keyboard: $vnckmap\n",
-			  "$tmpdir/datacenter.cfg");
+	    write_config("keyboard: $vnckmap\n",
+			 "$tmpdir/datacenter.cfg");
 
 	    # save admin email
-	    write_config ("user:root\@pam:1:0:::${mailto}::\n",
-			  "$tmpdir/user.cfg");
+	    write_config("user:root\@pam:1:0:::${mailto}::\n",
+			 "$tmpdir/user.cfg");
 
 	    # write storage.cfg
-	    my $strorage_cfg_fn = "$tmpdir/storage.cfg";
+	    my $storage_cfg_fn = "$tmpdir/storage.cfg";
 	    if ($use_zfs) {
-		write_config ($storage_cfg_zfs, $strorage_cfg_fn);
+		write_config($storage_cfg_zfs, $storage_cfg_fn);
 	    } elsif ($use_btrfs) {
-		write_config ($storage_cfg_btrfs, $strorage_cfg_fn);
+		write_config($storage_cfg_btrfs, $storage_cfg_fn);
+	    } elsif ($datadev) {
+		write_config($storage_cfg_lvmthin, $storage_cfg_fn);
 	    } else {
-		write_config ($storage_cfg_lvmthin, $strorage_cfg_fn);
+		write_config($storage_cfg_local, $storage_cfg_fn);
 	    }
 
 	    run_command("chroot $targetdir /usr/bin/create_pmxcfs_db /tmp/pve /var/lib/pve-cluster/config.db");
 
-	    syscmd ("rm -rf $tmpdir");
+	    syscmd("rm -rf $tmpdir");
 	}
     };
 
     my $err = $@;
 
-    update_progress (1, 0, 1, "");
+    update_progress(1, 0, 1, "");
 
     print $err if $err;
 
@@ -1624,39 +1679,68 @@ _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");
+    syscmd("umount $targetdir/run");
+    syscmd("umount $targetdir/mnt/hostrun");
+    syscmd("umount $targetdir/tmp");
+    syscmd("umount $targetdir/proc");
+    syscmd("umount $targetdir/sys");
 
     if ($use_zfs) {
-	syscmd ("zfs umount -a") == 0 ||
+	syscmd("zfs umount -a") == 0 ||
 	    die "unable to unmount zfs\n";
     } else {
-	syscmd ("umount -d $targetdir");
+	syscmd("umount -d $targetdir");
     }
 
     if (!$err && $use_zfs) {
-	syscmd ("zfs set sync=standard $zfspoolname") == 0 ||
+	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");
+	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) = @_;
 
+    $filename = $steps[$step_number]->{html} if !$filename;
+
     my $path = "${proxmox_libdir}/html/$filename";
 
     my $url = "file://$path";
@@ -1664,89 +1748,118 @@ sub display_html {
     my $data = file_get_contents($path);
 
     if ($filename eq 'license.htm') {
-	my $license = decode('utf8', file_get_contents("${proxmox_cddir}/EULA"));
+	my $license = eval { decode('utf8', file_get_contents("${proxmox_cddir}/EULA")) };
+	if (my $err = $@) {
+	    die $err if !$opt_testmode;
+	    $license = "TESTMODE: Ignore non existent EULA...\n";
+	}
 	my $title = "END USER LICENSE AGREEMENT (EULA)";
 	$data =~ s/__LICENSE__/$license/;
 	$data =~ s/__LICENSE_TITLE__/$title/;
     }
 
-    $htmlview->load_html_string($data, $url);
+    $htmlview->load_html($data, $url);
+
+    $last_display_change = time();
+}
+
+sub prev_function {
+
+    my ($text, $fctn) = @_;
+
+    $fctn = $step_number if !$fctn;
+    $text = "_Previous" if !$text;
+    $prev_btn->set_label ($text);
+
+    $step_number--;
+    $steps[$step_number]->{function}();
+
+    $prev_btn->grab_focus();
 }
 
 sub set_next {
     my ($text, $fctn) = @_;
 
     $next_fctn = $fctn;
-    $text = "_Next" if !$text;
-    $next->set_label ($text);
+    my $step = $steps[$step_number];
+    $text //= $steps[$step_number]->{next_button} // '_Next';
+    $next->set_label($text);
 
-    $next->grab_focus ();
+    $next->grab_focus();
 }
 
 sub create_main_window {
 
-    $window = Gtk3::Window->new ();
-    $window->set_default_size (1024, 768);
+    $window = Gtk3::Window->new();
+    $window->set_default_size(1024, 768);
     $window->set_has_resize_grip(0);
-    $window->set_decorated (0) if !$opt_testmode;
+    $window->set_decorated(0) if !$opt_testmode;
 
-    my $vbox = Gtk3::VBox->new (0, 0);
+    my $vbox = Gtk3::VBox->new(0, 0);
 
-    my $image = Gtk3::Image->new_from_file  ("${proxmox_libdir}/proxlogo.png");
-    $vbox->pack_start ($image, 0, 0, 0);
+    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);
-    $vbox->pack_start ($hbox, 1, 1, 0);
+    my $hbox = Gtk3::HBox->new(0, 0);
+    $vbox->pack_start($hbox, 1, 1, 0);
 
  #  my $f1 = Gtk3::Frame->new ('test');
  #  $f1->set_shadow_type ('none');
  #  $hbox->pack_start ($f1, 1, 1, 0);
 
-    my $sep1 = Gtk3::HSeparator->new;
-    $vbox->pack_start ($sep1, 0, 0, 0);
+    my $sep1 = Gtk3::HSeparator->new();
+    $vbox->pack_start($sep1, 0, 0, 0);
+
+    $cmdbox = Gtk3::HBox->new();
+    $vbox->pack_start($cmdbox, 0, 0, 10);
+
+    $next = Gtk3::Button->new('_Next');
+    $next->signal_connect(clicked => sub { $last_display_change = 0; &$next_fctn (); });
+    $cmdbox->pack_end($next, 0, 0, 10);
+
+
+    $prev_btn = Gtk3::Button->new('_Previous');
+    $prev_btn->signal_connect(clicked => sub { $last_display_change = 0; &prev_function (); });
+    $cmdbox->pack_end($prev_btn, 0, 0, 10);
 
-    $cmdbox = Gtk3::HBox->new ();
-    $vbox->pack_start ($cmdbox, 0, 0, 10);
 
-    $next = Gtk3::Button->new ('_Next');
-    $next->signal_connect (clicked => sub { &$next_fctn (); });
-    $cmdbox->pack_end ($next, 0, 0, 10);
-    my $abort = Gtk3::Button->new ('_Abort');
-    $abort->set_can_focus (0);
-    $cmdbox->pack_start ($abort, 0, 0, 10);
-    $abort->signal_connect (clicked => sub { exit (-1); });
+    my $abort = Gtk3::Button->new('_Abort');
+    $abort->set_can_focus(0);
+    $cmdbox->pack_start($abort, 0, 0, 10);
+    $abort->signal_connect(clicked => sub { exit (-1); });
 
-    my $vbox2 = Gtk3::VBox->new (0, 0);
-    $hbox->add ($vbox2);
+    my $vbox2 = Gtk3::VBox->new(0, 0);
+    $hbox->add($vbox2);
 
-    $htmlview = Gtk3::WebKit::WebView->new();
+    $htmlview = Gtk3::WebKit2::WebView->new();
     my $scrolls = Gtk3::ScrolledWindow->new();
     $scrolls->add($htmlview);
-   
-    my $hbox2 = Gtk3::HBox->new (0, 0);
-    $hbox2->pack_start ($scrolls, 1, 1, 0);
 
-    $vbox2->pack_start ($hbox2, 1, 1, 0);
+    my $hbox2 = Gtk3::HBox->new(0, 0);
+    $hbox2->pack_start($scrolls, 1, 1, 0);
 
-    my $vbox3 = Gtk3::VBox->new (0, 0);
-    $vbox2->pack_start ($vbox3, 0, 0, 0);
+    $vbox2->pack_start($hbox2, 1, 1, 0);
+
+    my $vbox3 = Gtk3::VBox->new(0, 0);
+    $vbox2->pack_start($vbox3, 0, 0, 0);
 
     my $sep2 = Gtk3::HSeparator->new;
-    $vbox3->pack_start ($sep2, 0, 0, 0);
+    $vbox3->pack_start($sep2, 0, 0, 0);
 
-    $inbox = Gtk3::HBox->new (0, 0);
-    $vbox3->pack_start ($inbox, 0, 0, 0);
+    $inbox = Gtk3::HBox->new(0, 0);
+    $vbox3->pack_start($inbox, 0, 0, 0);
 
-    $window->add ($vbox);
+    $window->add($vbox);
 
     $window->show_all;
-    $window->realize ();
+    $window->realize();
 }
 
-sub cleanup_view { 
+sub cleanup_view {
     $inbox->foreach(sub {
 	my $child = shift;
-	$inbox->remove ($child);	
+	$inbox->remove ($child);
     });
 }
 
@@ -1790,16 +1903,16 @@ sub check_number {
 sub create_text_input {
     my ($default, $text) = @_;
 
-    my $hbox = Gtk3::HBox->new (0, 0);
+    my $hbox = Gtk3::HBox->new(0, 0);
 
-    my $label = Gtk3::Label->new ($text);
-    $label->set_size_request (150, -1);
-    $label->set_alignment (1, 0.5);
-    $hbox->pack_start ($label, 0, 0, 10);
-    my $e1 = Gtk3::Entry->new ();
-    $e1->set_width_chars (30);
-    $hbox->pack_start ($e1, 0, 0, 0);
-    $e1->set_text ($default);
+    my $label = Gtk3::Label->new($text);
+    $label->set_size_request(150, -1);
+    $label->set_alignment(1, 0.5);
+    $hbox->pack_start($label, 0, 0, 10);
+    my $e1 = Gtk3::Entry->new();
+    $e1->set_width_chars(30);
+    $hbox->pack_start($e1, 0, 0, 0);
+    $e1->set_text($default);
 
     return ($hbox, $e1);
 }
@@ -1870,8 +1983,8 @@ sub get_ip_config {
 sub display_message {
     my ($msg) = @_;
 
-    my $dialog = Gtk3::MessageDialog->new ($window, 'modal',
-					   'info', 'ok', $msg);
+    my $dialog = Gtk3::MessageDialog->new($window, 'modal',
+					  'info', 'ok', $msg);
     $dialog->run();
     $dialog->destroy();
 }
@@ -1879,8 +1992,8 @@ sub display_message {
 sub display_error {
     my ($msg) = @_;
 
-    my $dialog = Gtk3::MessageDialog->new ($window, 'modal',
-					   'error', 'ok', $msg);
+    my $dialog = Gtk3::MessageDialog->new($window, 'modal',
+					  'error', 'ok', $msg);
     $dialog->run();
     $dialog->destroy();
 }
@@ -1889,23 +2002,25 @@ my $ipconf_first_view = 1;
 
 sub create_ipconf_view {
 
-    cleanup_view ();
-    display_html ("ipconf.htm");
+    cleanup_view();
+    display_html();
 
-    my $vbox =  Gtk3::VBox->new (0, 0);
-    $inbox->pack_start ($vbox, 1, 0, 0);
-    my $hbox =  Gtk3::HBox->new (0, 0);
-    $vbox->pack_start ($hbox, 0, 0, 10);
-    my $vbox2 =  Gtk3::VBox->new (0, 0);
-    $hbox->add ($vbox2);
+    my $vbox =  Gtk3::VBox->new(0, 0);
+    $inbox->pack_start($vbox, 1, 0, 0);
+    my $hbox =  Gtk3::HBox->new(0, 0);
+    $vbox->pack_start($hbox, 0, 0, 10);
+    my $vbox2 =  Gtk3::VBox->new(0, 0);
+    $hbox->add($vbox2);
 
+    my $ipaddr_text = $config->{ipaddress} // "192.168.100.2";
     my $ipbox;
     ($ipbox, $ipconf_entry_addr) =
-	create_text_input ("192.168.100.2", 'IP Address:');
+	create_text_input($ipaddr_text, 'IP Address:');
 
+    my $netmask_text = $config->{netmask} // "255.255.255.0";
     my $maskbox;
     ($maskbox, $ipconf_entry_mask) =
-	create_text_input ("255.255.255.0", 'Netmask:');
+	create_text_input($netmask_text, 'Netmask:');
 
     my $device_cb = Gtk3::ComboBoxText->new();
     $device_cb->set_active(0);
@@ -1917,11 +2032,17 @@ sub create_ipconf_view {
     };
 
     my $device_active_map = {};
+    my $device_active_reverse_map = {};
 
     my $device_change_handler = sub {
 	my $current = shift;
-	$ipconf->{selected} = $device_active_map->{$current->get_active()};
+
+	my $new = $device_active_map->{$current->get_active()};
+	return if $new eq $ipconf->{selected};
+
+	$ipconf->{selected} = $new;
 	my $iface = $ipconf->{ifaces}->{$ipconf->{selected}};
+	$config->{mngmt_nic} = $iface->{name};
 	$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})
@@ -1931,64 +2052,70 @@ sub create_ipconf_view {
     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;
+	$device_active_map->{$i} = $index;
+	$device_active_reverse_map->{$ipconf->{ifaces}->{$index}->{name}} = $i;
 	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);
+	$device_cb->signal_connect('changed' => $device_change_handler);
 	$i++;
     }
 
-    $device_cb->set_active(0)
-	if !($ipconf->{selected});
+    if (my $nic = $config->{mngmt_nic}) {
+	$device_cb->set_active($device_active_reverse_map->{$nic} // 0);
+    } else {
+	$device_cb->set_active(0);
+    }
+
+    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);
 
-    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);
 
-    $vbox2->pack_start ($devicebox, 0, 0, 2);
+    my $hn = $config->{fqdn} //  "$setup->{product}." . ($ipconf->{domain} // "example.invalid");
 
-    my $hn = $ipconf->{domain} ? "pve.$ipconf->{domain}" : 'pve.example.invalid';
-   
     my ($hostbox, $hostentry) =
-	create_text_input ($hn, 'Hostname (FQDN):');
-    $vbox2->pack_start ($hostbox, 0, 0, 2);
+	create_text_input($hn, 'Hostname (FQDN):');
+    $vbox2->pack_start($hostbox, 0, 0, 2);
 
-    $vbox2->pack_start ($ipbox, 0, 0, 2);
+    $vbox2->pack_start($ipbox, 0, 0, 2);
 
-    $vbox2->pack_start ($maskbox, 0, 0, 2);
+    $vbox2->pack_start($maskbox, 0, 0, 2);
 
-    $gateway = $ipconf->{gateway} || '192.168.100.1';
+    $gateway = $config->{gateway} // $ipconf->{gateway} || '192.168.100.1';
 
     my $gwbox;
     ($gwbox, $ipconf_entry_gw) =
-	create_text_input ($gateway, 'Gateway:');
+	create_text_input($gateway, 'Gateway:');
 
-    $vbox2->pack_start ($gwbox, 0, 0, 2);
+    $vbox2->pack_start($gwbox, 0, 0, 2);
 
-    $dnsserver = $ipconf->{dnsserver} || $gateway;
+    $dnsserver = $config->{dnsserver} // $ipconf->{dnsserver} || $gateway;
 
     my $dnsbox;
     ($dnsbox, $ipconf_entry_dns) =
-	create_text_input ($dnsserver, 'DNS Server:');
+	create_text_input($dnsserver, 'DNS Server:');
 
-    $vbox2->pack_start ($dnsbox, 0, 0, 0);
+    $vbox2->pack_start($dnsbox, 0, 0, 0);
 
     $inbox->show_all;
-    set_next (undef, sub {
+    set_next(undef, sub {
 
 	# verify hostname
-	
+
 	my $text = $hostentry->get_text();
 
 	$text =~ s/^\s+//;
 	$text =~ s/\s+$//;
 
+	$config->{fqdn} = $text;
+
 	my $namere = "([a-zA-Z0-9]([a-zA-Z0-9\-]*[a-zA-Z0-9])?)";
 
 	# Debian does not support purely numeric hostnames
@@ -2003,7 +2130,7 @@ sub create_ipconf_view {
 	    $hostname = $1;
 	    $domain = $2;
 	} else {
-	    display_message ("Hostname does not look like a fully qualified domain name.");
+	    display_message("Hostname does not look like a fully qualified domain name.");
 	    $hostentry->grab_focus();
 	    return;
 	}
@@ -2017,13 +2144,14 @@ 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.");
+	    display_message("IP address is not valid.");
 	    $ipconf_entry_addr->grab_focus();
 	    return;
 	}
+	$config->{ipaddress} = $ipaddress;
 
 	$text = $ipconf_entry_mask->get_text();
 	$text =~ s/^\s+//;
@@ -2033,10 +2161,11 @@ sub create_ipconf_view {
 	} elsif (($ipversion == 4) && defined($ipv4_mask_hash->{$text})) {
 	    $netmask = $text;
 	} else {
-	    display_message ("Netmask is not valid.");
+	    display_message("Netmask is not valid.");
 	    $ipconf_entry_mask->grab_focus();
 	    return;
 	}
+	$config->{netmask} = $netmask;
 
 	$text = $ipconf_entry_gw->get_text();
 	$text =~ s/^\s+//;
@@ -2046,11 +2175,12 @@ sub create_ipconf_view {
 	} elsif (($ipversion == 6) && ($text =~ m!^($IPV6RE)$!)) {
 	    $gateway = $text;
 	} else {
-	    display_message ("Gateway is not valid.");
+	    display_message("Gateway is not valid.");
 	    $ipconf_entry_gw->grab_focus();
 	    return;
 	}
-	
+	$config->{gateway} = $gateway;
+
 	$text = $ipconf_entry_dns->get_text();
 	$text =~ s/^\s+//;
 	$text =~ s/\s+$//;
@@ -2059,19 +2189,58 @@ sub create_ipconf_view {
 	} elsif (($ipversion == 6) && ($text =~ m!^($IPV6RE)$!)) {
 	    $dnsserver = $text;
 	} else {
-	    display_message ("DNS server is not valid.");
+	    display_message("DNS server is not valid.");
 	    $ipconf_entry_dns->grab_focus();
 	    return;
 	}
-	
+	$config->{dnsserver} = $dnsserver;
+
 	#print "TEST $ipaddress $netmask $gateway $dnsserver\n";
-	
-	create_extract_view ();
+
+	$step_number++;
+	create_ack_view();
     });
 
     $hostentry->grab_focus();
 }
 
+sub create_ack_view {
+
+    cleanup_view();
+
+    my $ack_template = "${proxmox_libdir}/html/ack_template.htm";
+    my $ack_html = "${proxmox_libdir}/html/$steps[$step_number]->{html}";
+    my $html_data = file_get_contents($ack_template);
+
+    my %config_values = (
+	__target_hd__ => join(' | ', @{$config_options->{target_hds}}),
+	__target_fs__ => $config_options->{filesys},
+	__country__ => $cmap->{country}->{$country}->{name},
+	__timezone__ => $timezone,
+	__keymap__ => $keymap,
+	__mailto__ => $mailto,
+	__interface__ => $ipconf->{ifaces}->{$ipconf->{selected}}->{name},
+	__hostname__ => $hostname,
+	__ip__ => $ipaddress,
+	__netmask__ => $netmask,
+	__gateway__ => $gateway,
+	__dnsserver__ => $dnsserver,
+    );
+
+    while ( my ($k, $v) = each %config_values) {
+	$html_data =~ s/$k/$v/g;
+    }
+
+    write_config($html_data, $ack_html);
+
+    display_html();
+
+    set_next(undef, sub {
+	$step_number++;
+	create_extract_view();
+    });
+}
+
 sub get_device_desc {
     my ($devname, $size, $model) = @_;
 
@@ -2107,7 +2276,7 @@ sub update_layout {
 	$i++;
     }
 
-    $cb->set_active ($ind || $def || 0);
+    $cb->set_active($ind || $def || 0);
 }
 
 my $lastzonecb;
@@ -2126,9 +2295,9 @@ sub update_zonelist {
     }
 
     my $cb = $lastzonecb = Gtk3::ComboBoxText->new();
-    $cb->set_size_request (200, -1);
+    $cb->set_size_request(200, -1);
 
-    $cb->signal_connect ('changed' => sub {
+    $cb->signal_connect('changed' => sub {
 	$timezone = $cb->get_active_text();
     });
 
@@ -2142,63 +2311,65 @@ sub update_zonelist {
     my $i = 0;
     foreach my $zone (sort @za) {
 	$ind = $i if $sel && $zone eq $sel;
-	$cb->append_text ($zone);
+	$cb->append_text($zone);
 	$i++;
     }
 
-    $cb->set_active ($ind || 0);
+    $cb->set_active($ind || 0);
 
     $cb->show;
-    $box->pack_start ($cb, 0, 0, 0);
+    $box->pack_start($cb, 0, 0, 0);
 }
 
 sub create_password_view {
 
-    cleanup_view ();
-
-    my $vbox2 =  Gtk3::VBox->new (0, 0);
-    $inbox->pack_start ($vbox2, 1, 0, 0);
-    my $vbox =  Gtk3::VBox->new (0, 0);
-    $vbox2->pack_start ($vbox, 0, 0, 10);
-
-    my $hbox1 = Gtk3::HBox->new (0, 0);
-    my $label = Gtk3::Label->new ("Password");
-    $label->set_size_request (150, -1);
-    $label->set_alignment (1, 0.5);
-    $hbox1->pack_start ($label, 0, 0, 10);
-    my $pwe1 = Gtk3::Entry->new ();
-    $pwe1->set_visibility (0);
-    $pwe1->set_size_request (200, -1);
-    $hbox1->pack_start ($pwe1, 0, 0, 0);
-
-    my $hbox2 = Gtk3::HBox->new (0, 0);
-    $label = Gtk3::Label->new ("Confirm");
-    $label->set_size_request (150, -1);
-    $label->set_alignment (1, 0.5);
-    $hbox2->pack_start ($label, 0, 0, 10);
-    my $pwe2 = Gtk3::Entry->new ();
-    $pwe2->set_visibility (0);
-    $pwe2->set_size_request (200, -1);
-    $hbox2->pack_start ($pwe2, 0, 0, 0);
-
-    my $hbox3 = Gtk3::HBox->new (0, 0);
-    $label = Gtk3::Label->new ("E-Mail");
-    $label->set_size_request (150, -1);
-    $label->set_alignment (1, 0.5);
-    $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);
-
-
-    $vbox->pack_start ($hbox1, 0, 0, 5);
-    $vbox->pack_start ($hbox2, 0, 0, 5);
-    $vbox->pack_start ($hbox3, 0, 0, 15);
+    cleanup_view();
+
+    my $vbox2 =  Gtk3::VBox->new(0, 0);
+    $inbox->pack_start($vbox2, 1, 0, 0);
+    my $vbox =  Gtk3::VBox->new(0, 0);
+    $vbox2->pack_start($vbox, 0, 0, 10);
+
+    my $hbox1 = Gtk3::HBox->new(0, 0);
+    my $label = Gtk3::Label->new("Password");
+    $label->set_size_request(150, -1);
+    $label->set_alignment(1, 0.5);
+    $hbox1->pack_start($label, 0, 0, 10);
+    my $pwe1 = Gtk3::Entry->new();
+    $pwe1->set_visibility(0);
+    $pwe1->set_text($password) if $password;
+    $pwe1->set_size_request(200, -1);
+    $hbox1->pack_start($pwe1, 0, 0, 0);
+
+    my $hbox2 = Gtk3::HBox->new(0, 0);
+    $label = Gtk3::Label->new("Confirm");
+    $label->set_size_request(150, -1);
+    $label->set_alignment(1, 0.5);
+    $hbox2->pack_start($label, 0, 0, 10);
+    my $pwe2 = Gtk3::Entry->new();
+    $pwe2->set_visibility(0);
+    $pwe2->set_text($password) if $password;
+    $pwe2->set_size_request(200, -1);
+    $hbox2->pack_start($pwe2, 0, 0, 0);
+
+    my $hbox3 = Gtk3::HBox->new(0, 0);
+    $label = Gtk3::Label->new("E-Mail");
+    $label->set_size_request(150, -1);
+    $label->set_alignment(1, 0.5);
+    $hbox3->pack_start($label, 0, 0, 10);
+    my $eme = Gtk3::Entry->new();
+    $eme->set_size_request(200, -1);
+    $eme->set_text($mailto);
+    $hbox3->pack_start($eme, 0, 0, 0);
+
+
+    $vbox->pack_start($hbox1, 0, 0, 5);
+    $vbox->pack_start($hbox2, 0, 0, 5);
+    $vbox->pack_start($hbox3, 0, 0, 15);
 
     $inbox->show_all;
 
-    display_html ("passwd.htm");
+    display_html();
 
     set_next (undef,  sub {
 
@@ -2206,27 +2377,27 @@ sub create_password_view {
 	my $t2 = $pwe2->get_text;
 
 	if (length ($t1) < 5) {
-	    display_message ("Password is too short.");
+	    display_message("Password is too short.");
 	    $pwe1->grab_focus();
 	    return;
 	}
 
 	if ($t1 ne $t2) {
-	    display_message ("Password does not match.");
+	    display_message("Password does not match.");
 	    $pwe1->grab_focus();
 	    return;
 	}
 
 	my $t3 = $eme->get_text;
 	if ($t3 !~ m/^\S+\@\S+\.\S+$/) {
-	    display_message ("E-Mail does not look like a valid 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");
+	    display_message("Please enter a valid E-Mail address");
 	    $eme->grab_focus();
 	    return;
 	}
@@ -2234,6 +2405,7 @@ sub create_password_view {
 	$password = $t1;
 	$mailto = $t3;
 
+	$step_number++;
 	create_ipconf_view();
     });
 
@@ -2243,37 +2415,37 @@ sub create_password_view {
 
 sub create_country_view {
 
-    cleanup_view ();
+    cleanup_view();
 
     my $countryhash = $cmap->{countryhash};
     my $ctr = $cmap->{country};
 
-    my $vbox2 =  Gtk3::VBox->new (0, 0);
-    $inbox->pack_start ($vbox2, 1, 0, 0);
-    my $vbox =  Gtk3::VBox->new (0, 0);
-    $vbox2->pack_start ($vbox, 0, 0, 10);
+    my $vbox2 =  Gtk3::VBox->new(0, 0);
+    $inbox->pack_start($vbox2, 1, 0, 0);
+    my $vbox =  Gtk3::VBox->new(0, 0);
+    $vbox2->pack_start($vbox, 0, 0, 10);
 
-    my $w = Gtk3::Entry->new ();
-    $w->set_size_request (200, -1);
+    my $w = Gtk3::Entry->new();
+    $w->set_size_request(200, -1);
 
-    my $c = Gtk3::EntryCompletion->new ();
-    $c->set_text_column (0);
+    my $c = Gtk3::EntryCompletion->new();
+    $c->set_text_column(0);
     $c->set_minimum_key_length(0);
-    $c->set_popup_set_width (1);
-    $c->set_inline_completion (1);
-
-    my $hbox2 = Gtk3::HBox->new (0, 0);
-    my $label = Gtk3::Label->new ("Time zone");
-    $label->set_size_request (150, -1);
-    $label->set_alignment (1, 0.5);
-    $hbox2->pack_start ($label, 0, 0, 10);
+    $c->set_popup_set_width(1);
+    $c->set_inline_completion(1);
+
+    my $hbox2 = Gtk3::HBox->new(0, 0);
+    my $label = Gtk3::Label->new("Time zone");
+    $label->set_size_request(150, -1);
+    $label->set_alignment(1, 0.5);
+    $hbox2->pack_start($label, 0, 0, 10);
     update_zonelist ($hbox2);
 
-    my $hbox3 = Gtk3::HBox->new (0, 0);
-    $label = Gtk3::Label->new ("Keyboard Layout");
-    $label->set_size_request (150, -1);
-    $label->set_alignment (1, 0.5);
-    $hbox3->pack_start ($label, 0, 0, 10);
+    my $hbox3 = Gtk3::HBox->new(0, 0);
+    $label = Gtk3::Label->new("Keyboard Layout");
+    $label->set_size_request(150, -1);
+    $label->set_alignment(1, 0.5);
+    $hbox3->pack_start($label, 0, 0, 10);
 
     my $kmapcb = Gtk3::ComboBoxText->new();
     $kmapcb->set_size_request (200, -1);
@@ -2281,7 +2453,7 @@ sub create_country_view {
 	$kmapcb->append_text ($layout);
     }
 
-    update_layout ($kmapcb);
+    update_layout($kmapcb);
     $hbox3->pack_start ($kmapcb, 0, 0, 0);
 
     $kmapcb->signal_connect ('changed' => sub {
@@ -2299,9 +2471,9 @@ sub create_country_view {
 	my $text = $entry->get_text;
 
 	if (my $cc = $countryhash->{lc($text)}) {
-	    update_zonelist ($hbox2, $cc);
+	    update_zonelist($hbox2, $cc);
 	    my $kmap = $ctr->{$cc}->{kmap} || 'en-us';
-	    update_layout ($kmapcb, $kmap);
+	    update_layout($kmapcb, $kmap);
 	}
     });
 
@@ -2313,7 +2485,7 @@ sub create_country_view {
 
 	if ($val == Gtk3::Gdk::KEY_Tab) {
 	    my $cc = $countryhash->{lc($text)};
-	    
+
 	    my $found = 0;
 	    my $compl;
 
@@ -2350,7 +2522,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();
@@ -2360,17 +2532,17 @@ sub create_country_view {
 
     $w->set_completion ($c);
 
-    my $hbox =  Gtk3::HBox->new (0, 0);
+    my $hbox =  Gtk3::HBox->new(0, 0);
 
-    $label = Gtk3::Label->new ("Country");
-    $label->set_alignment (1, 0.5);
-    $label->set_size_request (150, -1);
-    $hbox->pack_start ($label, 0, 0, 10);
-    $hbox->pack_start ($w, 0, 0, 0);
+    $label = Gtk3::Label->new("Country");
+    $label->set_alignment(1, 0.5);
+    $label->set_size_request(150, -1);
+    $hbox->pack_start($label, 0, 0, 10);
+    $hbox->pack_start($w, 0, 0, 0);
 
-    $vbox->pack_start ($hbox, 0, 0, 5);
-    $vbox->pack_start ($hbox2, 0, 0, 5);
-    $vbox->pack_start ($hbox3, 0, 0, 5);
+    $vbox->pack_start($hbox, 0, 0, 5);
+    $vbox->pack_start($hbox2, 0, 0, 5);
+    $vbox->pack_start($hbox3, 0, 0, 5);
 
     if ($country && $ctr->{$country}) {
 	$w->set_text ($ctr->{$country}->{name});
@@ -2378,17 +2550,18 @@ sub create_country_view {
 
     $inbox->show_all;
 
-    display_html ("country.htm");
+    display_html();
     set_next (undef,  sub {
 
 	my $text = $w->get_text;
 
 	if (my $cc = $countryhash->{lc($text)}) {
 	    $country = $cc;
+	    $step_number++;
 	    create_password_view();
 	    return;
 	} else {
-	    display_message ("Please select a country first.");
+	    display_message("Please select a country first.");
 	    $w->grab_focus();
 	}
     });
@@ -2399,7 +2572,7 @@ sub create_country_view {
 my $target_hd_combo;
 my $target_hd_label;
 
-my $hdopion_first_setup = 1;
+my $hdoption_first_setup = 1;
 
 my $create_basic_grid = sub {
     my $grid =  Gtk3::Grid->new();
@@ -2455,7 +2628,7 @@ my $create_raid_disk_grid = sub {
 	    });
 	}
 
-	if ($hdopion_first_setup) {
+	if ($hdoption_first_setup) {
 	    $disk_selector->set_active ($i+1) if $hds->[$i];
 	} else {
 	    my $hdind = 0;
@@ -2483,6 +2656,29 @@ my $create_raid_disk_grid = sub {
 #    &$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;
+
+    $hdsize_entry_buffer //= Gtk3::EntryBuffer->new(undef, 1);
+
+    if (defined($hdsize)) {
+	$hdsize_size_adj = Gtk3::Adjustment->new($config_options->{hdsize} || $hdsize, 0, $hdsize+1, 1, 1, 1);
+    } else {
+	die "called get_hdsize_spinbtn with \$hdsize_size_adj not defined but did not pass hdsize!\n"
+	    if !defined($hdsize_size_adj);
+    }
+
+    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);
@@ -2537,6 +2733,7 @@ my $create_raid_advanced_grid = sub {
     $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);;
 };
 
@@ -2556,17 +2753,17 @@ 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;
 
     # Filesystem type
 
-    my $label0 = Gtk3::Label->new ("Filesystem");
+    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',
@@ -2575,7 +2772,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) {
@@ -2606,34 +2803,37 @@ 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)");
+    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};
+    $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)");
     $entry_minfree->signal_connect (key_press_event => \&check_float);
-    $entry_minfree->set_text($config_options->{minfree}) if $config_options->{minfree};
+    $entry_minfree->set_text($config_options->{minfree}) if defined($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);
@@ -2651,7 +2851,7 @@ sub create_hdoption_view {
     $grid->attach($options_stack, 0, $row, 2, 1);
     $row++;
 
-    $hdopion_first_setup = 0;
+    $hdoption_first_setup = 0;
 
     my $switch_view = sub {
 	my $raid = $config_options->{filesys} =~ m/zfs|btrfs/;
@@ -2725,7 +2925,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};
@@ -2742,7 +2942,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;
@@ -2789,7 +2989,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) {
@@ -2848,119 +3048,135 @@ sub get_btrfs_raid_setup {
     return ($devlist, $mode);
 }
 
+my $last_hd_selected = 0;
 sub create_hdsel_view {
 
-    cleanup_view ();
+    $prev_btn->set_sensitive(1); # enable previous button at this point
 
-    my $vbox =  Gtk3::VBox->new (0, 0);
-    $inbox->pack_start ($vbox, 1, 0, 0);
-    my $hbox =  Gtk3::HBox->new (0, 0);
-    $vbox->pack_start ($hbox, 0, 0, 10);
+    cleanup_view();
+
+    my $vbox =  Gtk3::VBox->new(0, 0);
+    $inbox->pack_start($vbox, 1, 0, 0);
+    my $hbox =  Gtk3::HBox->new(0, 0);
+    $vbox->pack_start($hbox, 0, 0, 10);
 
     my ($disk, $devname, $size, $model) = @{@$hds[0]};
-    $target_hd = $devname;
+    $target_hd = $devname if !defined($target_hd);
 
-    $target_hd_label = Gtk3::Label->new ("Target Harddisk: ");
-    $hbox->pack_start ($target_hd_label, 0, 0, 0);
+    $target_hd_label = Gtk3::Label->new("Target Harddisk: ");
+    $hbox->pack_start($target_hd_label, 0, 0, 0);
 
     $target_hd_combo = Gtk3::ComboBoxText->new();
 
     foreach my $hd (@$hds) {
 	($disk, $devname, $size, $model) = @$hd;
-	$target_hd_combo->append_text (get_device_desc ($devname, $size, $model));
+	$target_hd_combo->append_text (get_device_desc($devname, $size, $model));
     }
 
-    $target_hd_combo->set_active (0);
-    $target_hd_combo->signal_connect (changed => sub {
+    my $raid = $config_options->{filesys} =~ m/zfs|btrfs/;
+    if ($raid) {
+	$target_hd_label->set_text("Target: $config_options->{filesys} ");
+	$target_hd_combo->set_visible(0);
+	$target_hd_combo->set_no_show_all(1);
+    }
+    $target_hd_combo->set_active($last_hd_selected);
+    $target_hd_combo->signal_connect(changed => sub {
 	$a = shift->get_active;
 	my ($disk, $devname) = @{@$hds[$a]};
+	$last_hd_selected = $a;
 	$target_hd = $devname;
     });
-    
-    $hbox->pack_start ($target_hd_combo, 0, 0, 10);
 
-    my $options = Gtk3::Button->new ('_Options');
+    $hbox->pack_start($target_hd_combo, 0, 0, 10);
+
+    my $options = Gtk3::Button->new('_Options');
     $options->signal_connect (clicked => \&create_hdoption_view);
     $hbox->pack_start ($options, 0, 0, 0);
 
 
     $inbox->show_all;
 
-    display_html ("page1.htm");
+    display_html();
 
-    set_next (undef, sub {
+    set_next(undef, sub {
 
 	if ($config_options->{filesys} =~ m/zfs/) {
-	    eval { get_zfs_raid_setup(); };
+	    my ($devlist) = eval { get_zfs_raid_setup() };
 	    if (my $err = $@) {
-		display_message ("Warning: $err\n" .
-				 "Please fix ZFS setup first.");
-	    } else {
-		create_country_view();
+		display_message("Warning: $err\nPlease fix ZFS setup first.");
+		return;
 	    }
+	    $config_options->{target_hds} = [ map { $_->[1] } @$devlist ];
 	} elsif ($config_options->{filesys} =~ m/btrfs/) {
-	    eval { get_btrfs_raid_setup(); };
+	    my ($devlist) = eval { get_btrfs_raid_setup() };
 	    if (my $err = $@) {
-		display_message ("Warning: $err\n" .
-				 "Please fix BTRFS setup first.");
-	    } else {
-		create_country_view();
+		display_message("Warning: $err\nPlease fix BTRFS setup first.");
+		return;
 	    }
+	    $config_options->{target_hds} = [ map { $_->[1] } @$devlist ];
 	} else {
-	    create_country_view();
+	    $config_options->{target_hds} = [ $target_hd ];
 	}
+
+	$step_number++;
+	create_country_view();
     });
 }
 
 sub create_extract_view {
 
-    cleanup_view ();
+    cleanup_view();
 
-    display_html ("extract1-license.htm");
-    $next->set_sensitive (0);
+    display_info();
 
-    my $vbox =  Gtk3::VBox->new (0, 0);
+    $next->set_sensitive(0);
+    $prev_btn->set_sensitive(0);
+    $prev_btn->hide();
+
+    my $vbox =  Gtk3::VBox->new(0, 0);
     $inbox->pack_start ($vbox, 1, 0, 0);
-    my $hbox =  Gtk3::HBox->new (0, 0);
+    my $hbox =  Gtk3::HBox->new(0, 0);
     $vbox->pack_start ($hbox, 0, 0, 10);
 
-    my $vbox2 =  Gtk3::VBox->new (0, 0);
+    my $vbox2 =  Gtk3::VBox->new(0, 0);
     $hbox->pack_start ($vbox2, 0, 0, 0);
 
-    $progress_status = Gtk3::Label->new ('');
+    $progress_status = Gtk3::Label->new('');
     $vbox2->pack_start ($progress_status, 1, 1, 0);
 
     $progress = Gtk3::ProgressBar->new;
     $progress->set_show_text(1);
     $progress->set_size_request (600, -1);
 
-    $vbox2->pack_start ($progress, 0, 0, 0);
+    $vbox2->pack_start($progress, 0, 0, 0);
 
-    $inbox->show_all;
+    $inbox->show_all();
 
     my $tdir = $opt_testmode ? "target" : "/target";
     mkdir $tdir;
     my $base = "${proxmox_cddir}/$setup->{product}-base.squashfs";
 
-    eval  { extract_data ($base, $tdir); };
+    eval  { extract_data($base, $tdir); };
     my $err = $@;
 
-    $next->set_sensitive (1);
+    $next->set_sensitive(1);
 
-    set_next ("_Reboot", sub { exit (0); } );
+    set_next("_Reboot", sub { exit (0); } );
 
     if ($err) {
-	display_html ("fail.htm");
-	display_error ($err);
+	display_html("fail.htm");
+	display_error($err);
     } else {
-	cleanup_view ();
-	display_html ("success.htm");
+	cleanup_view();
+	display_html("success.htm");
     }
 }
 
 sub create_intro_view {
 
-    cleanup_view ();
+    $prev_btn->set_sensitive(0);
+
+    cleanup_view();
 
     if ($setup->{product} eq 'pve') {
 	eval {
@@ -2972,17 +3188,18 @@ sub create_intro_view {
 	};
     }
 
-    display_html ("license.htm");
+    display_html();
 
-    set_next ("I a_gree", \&create_hdsel_view);
+    $step_number++;
+    set_next("I a_gree", \&create_hdsel_view);
 }
 
-$ipconf = get_ip_config ();
+$ipconf = get_ip_config();
 
 $country = detect_country() if $ipconf->{default} || $opt_testmode;
 
 # read country, kmap and timezone infos
-$cmap = read_cmap ();
+$cmap = read_cmap();
 
 if (!defined($cmap->{country}->{$country})) {
     print $logfd "ignoring detected country '$country', invalid or unknown\n";
@@ -2996,8 +3213,8 @@ 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); } );
+    display_html("nohds.htm");
+    set_next("Reboot", sub { exit(0); } );
 } else {
     foreach my $hd (@$hds) {
 	my ($disk, $devname) = @$hd;
@@ -3009,8 +3226,8 @@ if (!defined ($hds) || (scalar (@$hds) <= 0)) {
 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); } );
+    display_html("nonics.htm");
+    set_next("Reboot", sub { exit(0); } );
 }
 
 create_intro_view () if !$initial_error;