X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=proxinstall;h=5aece6b3074be050d2f02749eabdab00191a38f3;hb=201a512007db192b156f3234dbb258ee405450ab;hp=01243e01655c1415e9aabed4e8e7daadc8a5333f;hpb=4a0331ab411b2cd8de78993eff7c93763e5e7c92;p=pve-installer.git

diff --git a/proxinstall b/proxinstall
index 01243e0..5aece6b 100755
--- a/proxinstall
+++ b/proxinstall
@@ -24,10 +24,6 @@ use ProxmoxInstallerSetup;
 
 my $setup = ProxmoxInstallerSetup::setup();
 
-
-my $kapi = `uname -r`;
-chomp $kapi;
-
 my $opt_testmode;
 
 if (!$ENV{G_SLICE} ||  $ENV{G_SLICE} ne "always-malloc") {
@@ -41,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
@@ -75,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) = @_;
@@ -96,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)";
@@ -147,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 = [
@@ -186,9 +190,49 @@ 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',
+	next_button => '_Install',
+	html => 'ipconf.htm',
+	function => \&create_ipconf_view,
+    },
+    {
+	step => 'extract',
+	next_button => '_Reboot',
+	function => \&create_extract_view,
+    },
+);
+
+# GUI global variables
 my ($window, $cmdbox, $inbox, $htmlview);
+my $prev;
 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);
@@ -199,11 +243,33 @@ 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;
 
+# Format: screen/function name => settings for that screen
+my $global_configuration = {
+
+    # TODO: add all the user-provided options during the install
+    # to be able to call them back if necessary
+
+    hdsel => {},
+    country => {
+	country => $country,
+	timezone => $timezone,
+	keymap => $keymap,
+    },
+    password => {
+	password => $password,
+	mailto => $mailto,
+    },
+    ipconf => {
+	hostname => $hostname,
+	domain => $domain,
+    },
+};
+
 # parse command line args
 
 my $config_options = {};
@@ -229,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;
@@ -617,7 +685,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";
@@ -667,6 +737,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();
 }
 
@@ -701,7 +773,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 {
@@ -778,12 +850,14 @@ sub zfs_create_rpool {
 
     syscmd ("zfs create $zfspoolname/ROOT")  == 0 ||
 	die "unable to create zfs $zfspoolname/ROOT volume\n";
-    
-    syscmd ("zfs create $zfspoolname/data")  == 0 ||
-	die "unable to create zfs $zfspoolname/data volume\n";
 
-    syscmd ("zfs create $zfspoolname/ROOT/pve-1")  == 0 ||
-	die "unable to create zfs $zfspoolname/ROOT/pve-1 volume\n";
+    if ($setup->{product} eq 'pve') {
+	syscmd ("zfs create $zfspoolname/data")  == 0 ||
+	    die "unable to create zfs $zfspoolname/data volume\n";
+    }
+
+    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 ||
@@ -802,36 +876,6 @@ sub zfs_create_rpool {
         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) = @_;
 
@@ -855,27 +899,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);
@@ -884,22 +931,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) {
@@ -909,116 +959,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;
-
-    # 1 - GRUB boot partition: 1M 
-    # 2 - OS/Data partition
-    # 9 - ZFS reserved partition
+sub create_lvm_volumes {
+    my ($lvmdev, $os_size, $swap_size) = @_;
 
-    my $grubbootdev = get_partition_dev($target_dev, 1);
-    my $osdev = get_partition_dev ($target_dev, 2);
+    my $vgname = $setup->{product};
 
-    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 {
@@ -1027,7 +1058,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);
@@ -1050,9 +1081,9 @@ sub extract_data {
 
     my $bootdevinfo = [];
 
-    my $datadev;
     my $swapfile;
     my $rootdev;
+    my $datadev;
 
     my $use_zfs = 0;
     my $use_btrfs = 0;
@@ -1062,12 +1093,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--) {
@@ -1095,7 +1126,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,7 +1139,7 @@ sub extract_data {
 		syscmd ("zpool destroy $zfstestpool");
 
 		zfs_create_rpool($rootdev);
-	    
+
 	    } else {
 
 		# nothing to do
@@ -1146,8 +1177,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;
@@ -1158,7 +1190,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};
@@ -1168,34 +1200,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
@@ -1218,7 +1241,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";
 	}
 
@@ -1248,15 +1271,17 @@ 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);
@@ -1287,14 +1312,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" .
@@ -1387,7 +1411,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";
 		}
 	    }
@@ -1422,7 +1446,7 @@ 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
@@ -1458,8 +1482,6 @@ _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");
 
@@ -1503,25 +1525,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");
@@ -1578,10 +1620,9 @@ _EOD
 		     "root:$octets\n");
 
 	if ($setup->{product} eq 'pmg') {
-	    mkdir "/etc/pmg";
 	    # save admin email
-	    write_config ("#Unix Superuser\nroot:1:0::root:${mailto}:::\n",
-			  "/etc/pmg/user.conf");
+	    write_config ("section: admin\n\temail ${mailto}\n",
+			  "$targetdir/etc/pmg/pmg.conf");
 
 	} elsif ($setup->{product} eq 'pve') {
 
@@ -1600,13 +1641,15 @@ _EOD
 			  "$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");
@@ -1625,10 +1668,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");
@@ -1644,10 +1686,10 @@ _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");
     }
@@ -1655,9 +1697,37 @@ _EOD
     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";
@@ -1672,13 +1742,30 @@ sub display_html {
     }
 
     $htmlview->load_html_string($data, $url);
+
+    $last_display_change = time();
+}
+
+sub prev_function {
+
+    my ($text, $fctn) = @_;
+
+    $fctn = $step_number if !$fctn;
+    $text = "_Previous" if !$text;
+    $prev->set_label ($text);
+
+    $step_number--;
+    $steps[$step_number]->{function}();
+
+    $prev->grab_focus ();
 }
 
 sub set_next {
     my ($text, $fctn) = @_;
 
     $next_fctn = $fctn;
-    $text = "_Next" if !$text;
+    my $step = $steps[$step_number];
+    $text //= $steps[$step_number]->{next_button} // '_Next';
     $next->set_label ($text);
 
     $next->grab_focus ();
@@ -1693,7 +1780,8 @@ sub create_main_window {
 
     my $vbox = Gtk3::VBox->new (0, 0);
 
-    my $image = Gtk3::Image->new_from_file  ("${proxmox_libdir}/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);
@@ -1710,8 +1798,15 @@ 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);
+
+
+    $prev = Gtk3::Button->new ('_Previous');
+    $prev->signal_connect (clicked => sub { $last_display_change = 0; &prev_function (); });
+    $cmdbox->pack_end ($prev, 0, 0, 10);
+
+
     my $abort = Gtk3::Button->new ('_Abort');
     $abort->set_can_focus (0);
     $cmdbox->pack_start ($abort, 0, 0, 10);
@@ -1723,7 +1818,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);
 
@@ -1744,10 +1839,10 @@ sub create_main_window {
     $window->realize ();
 }
 
-sub cleanup_view { 
+sub cleanup_view {
     $inbox->foreach(sub {
 	my $child = shift;
-	$inbox->remove ($child);	
+	$inbox->remove ($child);
     });
 }
 
@@ -1890,8 +1985,8 @@ 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);
@@ -1954,8 +2049,9 @@ sub create_ipconf_view {
 
     $vbox2->pack_start ($devicebox, 0, 0, 2);
 
-    my $hn = $ipconf->{domain} ? "pve.$ipconf->{domain}" : 'pve.example.invalid';
-   
+    my $hn = $ipconf->{domain} ?
+	"$setup->{product}.$ipconf->{domain}" : "$setup->{product}.example.invalid";
+
     my ($hostbox, $hostentry) =
 	create_text_input ($hn, 'Hostname (FQDN):');
     $vbox2->pack_start ($hostbox, 0, 0, 2);
@@ -1984,7 +2080,7 @@ sub create_ipconf_view {
     set_next (undef, sub {
 
 	# verify hostname
-	
+
 	my $text = $hostentry->get_text();
 
 	$text =~ s/^\s+//;
@@ -2018,7 +2114,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.");
@@ -2051,7 +2147,7 @@ sub create_ipconf_view {
 	    $ipconf_entry_gw->grab_focus();
 	    return;
 	}
-	
+
 	$text = $ipconf_entry_dns->get_text();
 	$text =~ s/^\s+//;
 	$text =~ s/\s+$//;
@@ -2064,10 +2160,11 @@ sub create_ipconf_view {
 	    $ipconf_entry_dns->grab_focus();
 	    return;
 	}
-	
+
 	#print "TEST $ipaddress $netmask $gateway $dnsserver\n";
-	
-	create_extract_view ();
+
+	$step_number++;
+	create_extract_view();
     });
 
     $hostentry->grab_focus();
@@ -2169,6 +2266,7 @@ sub create_password_view {
     $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);
 
@@ -2179,6 +2277,7 @@ sub create_password_view {
     $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);
 
@@ -2189,7 +2288,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');
+    $eme->set_text($mailto);
     $hbox3->pack_start ($eme, 0, 0, 0);
 
 
@@ -2199,7 +2298,7 @@ sub create_password_view {
 
     $inbox->show_all;
 
-    display_html ("passwd.htm");
+    display_html();
 
     set_next (undef,  sub {
 
@@ -2235,6 +2334,7 @@ sub create_password_view {
 	$password = $t1;
 	$mailto = $t3;
 
+	$step_number++;
 	create_ipconf_view();
     });
 
@@ -2314,7 +2414,7 @@ sub create_country_view {
 
 	if ($val == Gtk3::Gdk::KEY_Tab) {
 	    my $cc = $countryhash->{lc($text)};
-	    
+
 	    my $found = 0;
 	    my $compl;
 
@@ -2351,7 +2451,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();
@@ -2379,13 +2479,14 @@ 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 {
@@ -2484,6 +2585,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);
@@ -2538,6 +2662,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);;
 };
 
@@ -2557,7 +2682,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;
@@ -2567,7 +2692,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',
@@ -2607,34 +2732,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);
@@ -2726,7 +2854,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};
@@ -2743,7 +2871,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;
@@ -2790,7 +2918,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) {
@@ -2851,6 +2979,8 @@ sub get_btrfs_raid_setup {
 
 sub create_hdsel_view {
 
+    $prev->set_sensitive(1); # enable previous button at this point
+
     cleanup_view ();
 
     my $vbox =  Gtk3::VBox->new (0, 0);
@@ -2877,7 +3007,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');
@@ -2887,7 +3017,7 @@ sub create_hdsel_view {
 
     $inbox->show_all;
 
-    display_html ("page1.htm");
+    display_html();
 
     set_next (undef, sub {
 
@@ -2897,6 +3027,7 @@ sub create_hdsel_view {
 		display_message ("Warning: $err\n" .
 				 "Please fix ZFS setup first.");
 	    } else {
+		$step_number++;
 		create_country_view();
 	    }
 	} elsif ($config_options->{filesys} =~ m/btrfs/) {
@@ -2905,9 +3036,11 @@ sub create_hdsel_view {
 		display_message ("Warning: $err\n" .
 				 "Please fix BTRFS setup first.");
 	    } else {
+		$step_number++;
 		create_country_view();
 	    }
 	} else {
+	    $step_number++;
 	    create_country_view();
 	}
     });
@@ -2917,8 +3050,9 @@ sub create_extract_view {
 
     cleanup_view ();
 
-    display_html ("extract1-license.htm");
-    $next->set_sensitive (0);
+    display_info();
+
+    $next->set_sensitive(0);
 
     my $vbox =  Gtk3::VBox->new (0, 0);
     $inbox->pack_start ($vbox, 1, 0, 0);
@@ -2937,7 +3071,7 @@ sub create_extract_view {
 
     $vbox2->pack_start ($progress, 0, 0, 0);
 
-    $inbox->show_all;
+    $inbox->show_all();
 
     my $tdir = $opt_testmode ? "target" : "/target";
     mkdir $tdir;
@@ -2946,22 +3080,24 @@ sub create_extract_view {
     eval  { extract_data ($base, $tdir); };
     my $err = $@;
 
-    $next->set_sensitive (1);
+    $next->set_sensitive(1);
 
     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->set_sensitive(0);
+
+    cleanup_view();
 
     if ($setup->{product} eq 'pve') {
 	eval {
@@ -2973,8 +3109,9 @@ sub create_intro_view {
 	};
     }
 
-    display_html ("license.htm");
+    display_html();
 
+    $step_number++;
     set_next ("I a_gree", \&create_hdsel_view);
 }
 
@@ -2997,7 +3134,7 @@ my $initial_error = 0;
 if (!defined ($hds) || (scalar (@$hds) <= 0)) {
     print "no hardisks found\n";
     $initial_error = 1;
-    display_html ("nohds.htm");
+    display_html("nohds.htm");
     set_next ("Reboot", sub { exit (0); } );
 } else {
     foreach my $hd (@$hds) {
@@ -3010,7 +3147,7 @@ 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");
+    display_html("nonics.htm");
     set_next ("Reboot", sub { exit (0); } );
 }