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) = @_;
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)";
'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 = [
'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);
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 = {};
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;
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;
}
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";
$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();
}
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 {
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";
+
+ 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";
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) = @_;
};
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);
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) {
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
-
- my $grubbootdev = get_partition_dev($target_dev, 1);
- my $osdev = get_partition_dev ($target_dev, 2);
-
- my $pcmd = ['sgdisk', '-a1'];
-
- my $pnum = 1;
- push @$pcmd, "-n$pnum:34:2047", "-t$pnum:EF02";
-
- $pnum = 9;
- push @$pcmd, "-n$pnum:-8M:0", "-t$pnum:BF07";
-
- $pnum = 2;
- push @$pcmd, "-n$pnum:2048:0", "-t$pnum:BF01", '-c', "$pnum:zfs";
-
- push @$pcmd, $target_dev;
-
- my $os_size = $hdsize - 1024 - 1024*8;
-
- syscmd($pcmd) == 0 ||
- die "unable to partition harddisk '${target_dev}'\n";
-
- &$udevadm_trigger_block();
-
- syscmd("dd if=/dev/zero of=$osdev bs=1M count=16") if -b $osdev;
-
- return ($os_size, $osdev);
-}
-
sub create_lvm_volumes {
my ($lvmdev, $os_size, $swap_size) = @_;
my $rootdev = "/dev/$vgname/root";
my $datadev = "/dev/$vgname/data";
- my $swapfile = "/dev/$vgname/swap";
+ my $swapfile;
# we use --metadatasize 250k, which results in "pe_start = 512"
# so pe_start is aligned on a 128k boundary (advantage for SSDs)
my $hdgb = int($os_size/(1024*1024));
my $space = (($hdgb > 128) ? 16 : ($hdgb/8))*1024*1024;
- my $maxroot;
- if ($config_options->{maxroot}) {
- $maxroot = $config_options->{maxroot};
- } else {
- $maxroot = 96;
- }
+ my $rootsize;
+ my $datasize;
- my $rootsize = (($hdgb > ($maxroot*4)) ? $maxroot : $hdgb/4)*1024*1024;
+ if ($setup->{product} eq 'pve') {
- my $rest = $os_size - $swap_size - $rootsize; # in KB
+ my $maxroot;
+ if ($config_options->{maxroot}) {
+ $maxroot = $config_options->{maxroot};
+ } else {
+ $maxroot = 96;
+ }
+
+ $rootsize = (($hdgb > ($maxroot*4)) ? $maxroot : $hdgb/4)*1024*1024;
+
+ my $rest = $os_size - $swap_size - $rootsize; # in KB
+
+ my $minfree;
+ if (defined($config_options->{minfree})) {
+ $minfree = (($config_options->{minfree}*1024*1024) >= $rest ) ? $space :
+ $config_options->{minfree}*1024*1024 ;
+ } else {
+ $minfree = $space;
+ }
+
+ $rest = $rest - $minfree;
+
+ if (defined($config_options->{maxvz})) {
+ $rest = (($config_options->{maxvz}*1024*1024) <= $rest) ?
+ $config_options->{maxvz}*1024*1024 : $rest;
+ }
+
+ $datasize = $rest;
- my $minfree;
- if ($config_options->{minfree}) {
- $minfree = (($config_options->{minfree}*1024*1024) >= $rest ) ? $space :
- $config_options->{minfree}*1024*1024 ;
} else {
- $minfree = $space;
+ my $minfree = defined($config_options->{minfree}) ? $config_options->{minfree}*1024*1024 : $space;
+ $rootsize = $os_size - $minfree - $swap_size; # in KB
}
- $rest = $rest - $minfree;
+ if ($swap_size) {
+ syscmd ("/sbin/lvcreate -L${swap_size}K -nswap $vgname") == 0 ||
+ die "unable to create swap volume\n";
- if ($config_options->{maxvz}) {
- $rest = (($config_options->{maxvz}*1024*1024) <= $rest) ?
- $config_options->{maxvz}*1024*1024 : $rest;
+ $swapfile = "/dev/$vgname/swap";
}
- syscmd ("/sbin/lvcreate -L${swap_size}K -nswap $vgname") == 0 ||
- die "unable to create swap volume\n";
-
syscmd ("/sbin/lvcreate -L${rootsize}K -nroot $vgname") == 0 ||
die "unable to create root volume\n";
- syscmd ("/sbin/lvcreate -L${rest}K -ndata $vgname") == 0 ||
- die "unable to create data volume\n";
+ if ($datasize > 4*1024*1024) {
+ my $metadatasize = $datasize/100; # default 1% of data
+ $metadatasize = 1024*1024 if $metadatasize < 1024*1024; # but at least 1G
+ $metadatasize = 16*1024*1024 if $metadatasize > 16*1024*1024; # but at most 16G
- syscmd ("/sbin/lvconvert --yes --type thin-pool $vgname/data") == 0 ||
- die "unable to create data thin-pool\n";
+ # otherwise the metadata is taken out of $minfree
+ $datasize -= 2*$metadatasize;
+
+ # 1 4MB PE to allow for rounding
+ $datasize -= 4*1024;
+
+ syscmd ("/sbin/lvcreate -L${datasize}K -ndata $vgname") == 0 ||
+ die "unable to create data volume\n";
+
+ syscmd ("/sbin/lvconvert --yes --type thin-pool --poolmetadatasize ${metadatasize}K $vgname/data") == 0 ||
+ die "unable to create data thin-pool\n";
+ } else {
+ $datadev = undef;
+ }
syscmd ("/sbin/vgchange -a y $vgname") == 0 ||
die "unable to activate volume group\n";
- return ($rootdev, $datadev, $swapfile);
+ return ($rootdev, $swapfile, $datadev);
}
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);
my $bootdevinfo = [];
- my $datadev;
my $swapfile;
my $rootdev;
+ my $datadev;
my $use_zfs = 0;
my $use_btrfs = 0;
$target_hd = undef; # do not use this config
$use_btrfs = 1;
}
-
+
if ($use_zfs) {
my $i;
for ($i = 5; $i > 0; $i--) {
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');
syscmd ("zpool destroy $zfstestpool");
zfs_create_rpool($rootdev);
-
+
} else {
# nothing to do
}
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;
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};
}
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
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";
}
}
}
- 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);
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" .
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";
}
}
# 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
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");
write_config ('', "$targetdir/var/lib/apt/extended_states");
# allow ssh root login
- syscmd(['sed', '-i', 's/^#\\?PermitRootLogin.*/PermitRootLogin yes/', "$targetdir/etc/ssh/sshd_config"]);
+ syscmd(['sed', '-i', 's/^#\?PermitRootLogin.*/PermitRootLogin yes/', "$targetdir/etc/ssh/sshd_config"]);
if ($setup->{product} eq 'pmg') {
# install initial clamav DB
my $srcdir = "${proxmox_cddir}/proxmox/clamav";
- foreach my $fn ("main.cvd", "bytecode.cvd", "daily.cld", "safebrowsing.cvd") {
+ 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";
}
if ($use_zfs) {
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");
"$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 ("zfs set mountpoint=/ $zfspoolname/ROOT/$zfsrootvolname") == 0 ||
die "zfs set mountpoint failed\n";
-
+
syscmd ("zpool set bootfs=$zfspoolname/ROOT/$zfsrootvolname $zfspoolname") == 0 ||
die "zfs set bootfs failed\n";
syscmd ("zpool export $zfspoolname");
die $err if $err;
}
+my $last_display_change = 0;
+
+my $display_info_counter = 0;
+
+my $display_info_items = [
+ "extract1-license.htm",
+ "extract2-rulesystem.htm",
+ "extract3-spam.htm",
+ "extract4-virus.htm",
+ ];
+
+sub display_info {
+
+ my $min_display_time = 15;
+
+ my $ctime = time();
+
+ return if ($ctime - $last_display_change) < $min_display_time;
+
+ my $page = $display_info_items->[$display_info_counter % scalar(@$display_info_items)];
+
+ $display_info_counter++;
+
+ display_html($page);
+}
+
sub display_html {
my ($filename) = @_;
+ $filename = $steps[$step_number]->{html} if !$filename;
+
my $path = "${proxmox_libdir}/html/$filename";
my $url = "file://$path";
}
$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_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;
+ my $step = $steps[$step_number];
+ $text //= $steps[$step_number]->{next_button} // '_Next';
$next->set_label ($text);
$next->grab_focus ();
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);
$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_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);
+
+
my $abort = Gtk3::Button->new ('_Abort');
$abort->set_can_focus (0);
$cmdbox->pack_start ($abort, 0, 0, 10);
$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);
$window->realize ();
}
-sub cleanup_view {
+sub cleanup_view {
$inbox->foreach(sub {
my $child = shift;
- $inbox->remove ($child);
+ $inbox->remove ($child);
});
}
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 $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);
};
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 $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})
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);
$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:");
$vbox2->pack_start ($devicebox, 0, 0, 2);
- my $hn = $ipconf->{domain} ?
- "$setup->{product}.$ipconf->{domain}" : "$setup->{product}.example.invalid";
-
+ my $hn = $config->{fqdn} // "$setup->{product}." . ($ipconf->{domain} // "example.invalid");
+
my ($hostbox, $hostentry) =
create_text_input ($hn, 'Hostname (FQDN):');
$vbox2->pack_start ($hostbox, 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) =
$vbox2->pack_start ($gwbox, 0, 0, 2);
- $dnsserver = $ipconf->{dnsserver} || $gateway;
+ $dnsserver = $config->{dnsserver} // $ipconf->{dnsserver} || $gateway;
my $dnsbox;
($dnsbox, $ipconf_entry_dns) =
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
$ipaddress = $text;
$ipversion = 4;
} elsif ($text =~ m!^($IPV6RE)$!) {
- $ipaddress = $text;
+ $ipaddress = $text;
$ipversion = 6;
} else {
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+//;
$ipconf_entry_mask->grab_focus();
return;
}
+ $config->{netmask} = $netmask;
$text = $ipconf_entry_gw->get_text();
$text =~ s/^\s+//;
$ipconf_entry_gw->grab_focus();
return;
}
-
+ $config->{gateway} = $gateway;
+
$text = $ipconf_entry_dns->get_text();
$text =~ s/^\s+//;
$text =~ s/\s+$//;
$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__ => $target_hd,
+ __target_fs__ => $config_options->{filesys},
+ __country__ => $country,
+ __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) = @_;
$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);
$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);
$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);
$inbox->show_all;
- display_html ("passwd.htm");
+ display_html();
set_next (undef, sub {
$password = $t1;
$mailto = $t3;
+ $step_number++;
create_ipconf_view();
});
if ($val == Gtk3::Gdk::KEY_Tab) {
my $cc = $countryhash->{lc($text)};
-
+
my $found = 0;
my $compl;
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();
$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 {
# &$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);
$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);;
};
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;
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',
$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);
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};
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;
} 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) {
sub create_hdsel_view {
+ $prev_btn->set_sensitive(1); # enable previous button at this point
+
cleanup_view ();
my $vbox = Gtk3::VBox->new (0, 0);
my ($disk, $devname) = @{@$hds[$a]};
$target_hd = $devname;
});
-
+
$hbox->pack_start ($target_hd_combo, 0, 0, 10);
my $options = Gtk3::Button->new ('_Options');
$inbox->show_all;
- display_html ("page1.htm");
+ display_html();
set_next (undef, sub {
display_message ("Warning: $err\n" .
"Please fix ZFS setup first.");
} else {
+ $step_number++;
create_country_view();
}
} elsif ($config_options->{filesys} =~ m/btrfs/) {
display_message ("Warning: $err\n" .
"Please fix BTRFS setup first.");
} else {
+ $step_number++;
create_country_view();
}
} else {
+ $step_number++;
create_country_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);
$vbox2->pack_start ($progress, 0, 0, 0);
- $inbox->show_all;
+ $inbox->show_all();
my $tdir = $opt_testmode ? "target" : "/target";
mkdir $tdir;
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_btn->set_sensitive(0);
+
+ cleanup_view();
if ($setup->{product} eq 'pve') {
eval {
};
}
- display_html ("license.htm");
+ display_html();
+ $step_number++;
set_next ("I a_gree", \&create_hdsel_view);
}
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) {
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); } );
}