#!/usr/bin/perl -w
+$ENV{DEBIAN_FRONTEND} = 'noninteractive';
+$ENV{LC_ALL} = 'C';
+
use strict;
use Getopt::Long;
+use IPC::Open2;
use IPC::Open3;
use IO::File;
-use IO::Dir;
use IO::Select;
use Cwd 'abs_path';
-use Gtk2 '-init';
-use Gtk2::Html2;
-use Gtk2::Gdk::Keysyms;
+use Gtk3 '-init';
+use Gtk3::WebKit;
use Encode;
+use String::ShellQuote;
+use Data::Dumper;
+use File::Basename;
-my $release = '3.0';
+my $release = '3.3';
my $kapi = `uname -r`;
chomp $kapi;
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)) {
die "usage error\n";
exit (-1);
my $logfd = IO::File->new (">/tmp/install.log");
-my $proxmox_dir = $opt_testmode ? "." : "/var/lib/pve-installer";
+my $proxmox_dir = $opt_testmode ? Cwd::cwd() : "/var/lib/pve-installer";
-$ENV{DEBIAN_FRONTEND} = 'noninteractive';
-$ENV{LC_ALL} = 'C';
+my $grub_plattform = "pc"; # pc, efi-amd64 or efi-ia32
+
+$grub_plattform = "efi-amd64" if -d "/sys/firmware/efi";
-my ($window, $cmdbox, $inbox, $document, $htmlview);
-my ($next, $next_fctn, $target_hd, $master_hd);
+my ($window, $cmdbox, $inbox, $htmlview);
+my ($next, $next_fctn, $target_hd);
my ($progress, $progress_status);
my ($ipaddress, $ip_1, $ip_2, $ip_3, $ip_4);
my ($netmask, $mask_1, $mask_2, $mask_3, $mask_4);
my $keymap = 'en-us';
my $cmap;
-my $filesys = ($cmdline =~ m/\sext4(\s.*)$/) ? 'ext4' : 'ext3';
+# parse command line args
+
+my $config_options = {};
+
+if ($cmdline =~ m/\s(ext3|ext4|zfs)(\s.*)?$/) {
+ $config_options->{filesys} = $1;
+} else {
+ $config_options->{filesys} = 'ext3';
+}
+
+if ($cmdline =~ m/hdsize=(\d+(\.\d+)?)[\s\n]/i) {
+ $config_options->{hdsize} = $1;
+}
+
+if ($cmdline =~ m/swapsize=(\d+(\.\d+)?)[\s\n]/i) {
+ $config_options->{swapsize} = $1;
+}
+
+if ($cmdline =~ m/maxroot=(\d+(\.\d+)?)[\s\n]/i) {
+ $config_options->{maxroot} = $1;
+}
+
+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;
+}
my $postfix_main_cf = <<_EOD;
# See /usr/share/postfix/main.cf.dist for a commented, more complete version
_EOD
+sub shellquote {
+ my $str = shift;
+
+ return String::ShellQuote::shell_quote($str);
+}
+
+sub cmd2string {
+ my ($cmd) = @_;
+
+ die "no arguments" if !$cmd;
+
+ return $cmd if !ref($cmd);
+
+ my @qa = ();
+ foreach my $arg (@$cmd) { push @qa, shellquote($arg); }
+
+ return join (' ', @qa);
+}
+
sub syscmd {
my ($cmd) = @_;
sub run_command {
my ($cmd, $func, $input, $noout) = @_;
+ my $cmdstr;
+ if (!ref($cmd)) {
+ $cmdstr = $cmd;
+ if ($cmd =~ m/|/) {
+ # see 'man bash' for option pipefail
+ $cmd = [ '/bin/bash', '-c', "set -o pipefail && $cmd" ];
+ } else {
+ $cmd = [ $cmd ];
+ }
+ } else {
+ $cmdstr = cmd2string($cmd);
+ }
+
my $cmdtxt;
- if ($input && ($cmd !~ m/chpasswd/)) {
- $cmdtxt = "# $cmd <<EOD\n$input";
+ if ($input && ($cmdstr !~ m/chpasswd/)) {
+ $cmdtxt = "# $cmdstr <<EOD\n$input";
chomp $cmdtxt;
$cmdtxt .= "\nEOD\n";
} else {
- $cmdtxt = "# $cmd\n";
+ $cmdtxt = "# $cmdstr\n";
+ }
+
+ if ($opt_testmode) {
+ print $cmdtxt;
+ STDOUT->flush();
}
- print $cmdtxt;
- STDOUT->flush();
+
print $logfd $cmdtxt;
my $reader = IO::File->new();
my $pid;
eval {
- $pid = open3 ($writer, $reader, $error, $cmd) || die $!;
+ $pid = open3 ($writer, $reader, $error, @$cmd) || die $!;
};
my $err = $@;
while ($select->count) {
my @handles = $select->can_read (0.2);
- Gtk2->main_iteration while Gtk2->events_pending;
+ Gtk3->main_iteration while Gtk3->events_pending;
next if !scalar (@handles); # timeout
my $ec = ($? >> 8);
if ($ec) {
- die "command '$cmd' failed with exit code $ec";
+ die "command '$cmdstr' failed with exit code $ec";
}
return $ostream;
sub detect_country {
print "trying to detect country...\n";
- open (TMP, "traceroute -N 1 -q 1 -n www.debian.org|");
+ my $cpid = open2(\*TMP, undef, "traceroute -N 1 -q 1 -n 8.8.8.8");
+ return undef if !$cpid;
my $country;
print $logfd "DC GEOIP: $geoip";
if ($geoip =~ m/GeoIP Country Edition:\s*([A-Z]+),/) {
$country = lc ($1);
+ print $logfd "DC FOUND: $country\n";
last;
}
}
sub find_stable_path {
my ($stabledir, $bdev) = @_;
- my $dh = IO::Dir->new ($stabledir);
- if ($dh) {
- while (defined(my $tmp = $dh->read)) {
- my $path = "$stabledir/$tmp";
- if (link_points_to ($path, $bdev)) {
- return wantarray ? ($path, $tmp) : $path;
- }
+ foreach my $path (<$stabledir/*>) {
+ if (link_points_to ($path, $bdev)) {
+ return wantarray ? ($path, basename($path)) : $path;
}
-
- $dh->close;
}
-
- return wantarray ? () : undef;
}
sub find_dev_by_uuid {
die "no such device '$dev'";
}
-# find the master boot disk - return the first found scsi/ide disk
-sub find_master {
- my ($target_hd) = @_;
-
- foreach my $hd (sort { ${$a}[1] cmp ${$b}[1] } @$hds) {
- my ($disk, $devname) = @$hd;
- next if $disk < 0;
-
- if ($target_hd =~ m|^/dev/sd|) {
- return $devname if $devname =~ m|^/dev/sd|;
- } elsif ($target_hd =~ m|^/dev/hd|) {
- return $devname if $devname =~ m|^/dev/hd|;
- } elsif ($target_hd =~ m|^/dev/i2o/|) {
- return $devname if $devname =~ m|^/dev/i2o/|;
- } elsif ($target_hd =~ m|^/dev/ataraid/|) {
- return $devname if $devname =~ m|^/dev/ataraid/|;
- } elsif ($target_hd =~ m|^/dev/ida/|) {
- return $devname if $devname =~ m|^/dev/ida/|;
- } elsif ($target_hd =~ m|^/dev/cciss/|) {
- return $devname if $devname =~ m|^/dev/cciss/|;
- } elsif ($target_hd =~ m|^/dev/rd/|) {
- return $devname if $devname =~ m|^/dev/rd/|;
- }
- }
-
- return $target_hd;
-}
-
sub get_partition_dev {
- my ($target_hd, $partnum) = @_;
-
- if ($target_hd =~ m|^/dev/[hxsev]d[a-z]$|) {
- return "${target_hd}$partnum";
- } elsif ($target_hd =~ m|^/dev/[^/]+/c\d+d\d+$|) {
- return "${target_hd}p$partnum";
- } elsif ($target_hd =~ m|^/dev/[^/]+/d\d+$|) {
- return "${target_hd}p$partnum";
- } elsif ($target_hd =~ m|^/dev/[^/]+/hd[a-z]$|) {
- return "${target_hd}$partnum";
+ my ($dev, $partnum) = @_;
+
+ if ($dev =~ m|^/dev/[hxsev]d[a-z]$|) {
+ return "${dev}$partnum";
+ } elsif ($dev =~ m|^/dev/[^/]+/c\d+d\d+$|) {
+ return "${dev}p$partnum";
+ } elsif ($dev =~ m|^/dev/[^/]+/d\d+$|) {
+ return "${dev}p$partnum";
+ } elsif ($dev =~ m|^/dev/[^/]+/hd[a-z]$|) {
+ return "${dev}$partnum";
} else {
- die "unable to get device for partition $partnum on device $target_hd\n";
+ die "unable to get device for partition $partnum on device $dev\n";
}
}
-sub get_boot_part {
- my ($target_hd, $gpt) = @_;
+sub file_get_contents {
+ my ($filename, $max) = @_;
- return get_partition_dev ($target_hd, $gpt ? 2 : 1);
-}
+ my $fh = IO::File->new($filename, "r") ||
+ die "can't open '$filename' - $!\n";
+
+ local $/; # slurp mode
-sub get_lvm_part {
- my ($target_hd, $gpt) = @_;
+ my $content = <$fh>;
- return get_partition_dev ($target_hd, $gpt ? 3 : 2);
+ close $fh;
+
+ return $content;
}
sub write_config {
$progress->set_text (sprintf ("%d%%", int ($res*100)));
$progress_status->set_text ($text) if defined ($text);
- Gtk2->main_iteration while Gtk2->events_pending;
+ Gtk3->main_iteration while Gtk3->events_pending;
}
sub create_filesystem {
die "unable to remove $cmd diversion\n";
}
+sub zfs_create_rpool {
+ my ($zfspoolname, $vdev) = @_;
+
+ syscmd ("zpool create -f -o ashift=12 $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/ROOT/pve-1") == 0 ||
+ die "unable to create zfs $zfspoolname/ROOT/pve-1 volume\n";
+
+ # disable atime during insatll
+ syscmd ("zfs set atime=off $zfspoolname") == 0 ||
+ die "unable to set zfs properties\n";
+ syscmd ("zfs set compression=on $zfspoolname") == 0 ||
+ die "unable to set zfs properties\n";
+}
+
+sub zfs_create_swap {
+ my ($zfspoolname, $swapsize) = @_;
+
+ syscmd ("zfs create -V ${swapsize}K -b 4K $zfspoolname/swap") == 0 ||
+ die "unable to create zfs swap device\n";
+
+ syscmd ("zfs set com.sun:auto-snapshot=false $zfspoolname/swap") == 0 ||
+ die "unable to set zfs properties\n";
+
+ # reduces memory pressure
+ syscmd ("zfs set sync=always $zfspoolname/swap") == 0 ||
+ die "unable to set zfs properties\n";
+
+ return "/dev/zvol/$zfspoolname/swap";
+}
+
+sub partition_bootable_disk {
+ my ($target_dev, $maxhdsize, $use_zfs) = @_;
+
+ die "too dangerous" if $opt_testmode;
+
+ syscmd("dd if=/dev/zero of=${target_dev} bs=512 count=256");
+ my $hdsize = hd_size($target_dev); # size in blocks (1024 bytes)
+
+ if ($maxhdsize && ($maxhdsize < $hdsize)) {
+ $hdsize = $maxhdsize;
+ }
+
+ my $hdgb = int($hdsize/(1024*1024));
+ die "hardisk '$target_dev' too small (${hdsize}GB)" if $hdgb < 8;
+
+ # 1 - GRUB boot partition: 1M
+ # 2 - EFI ESP: 128M
+ # 3 - OS/Data partition
+
+ my $grubbootdev = get_partition_dev($target_dev, 1);
+ my $efibootdev = get_partition_dev($target_dev, 2);
+ my $osdev = get_partition_dev ($target_dev, 3);
+
+ my $bootsize_mb = 512;
+ my $efibootsize_mb = 128;
+ my $grubbootsize_mb = 1;
+
+ my $hdsize_mb = $hdsize/1024;
+
+ my $pcmd = ['parted', '--script', '--align', 'optimal', $target_dev];
+ push @$pcmd, 'unit', 'MiB';
+ push @$pcmd, 'mklabel', 'gpt';
+
+ my $pnum = 0;
+ my $cpos = 1;
+
+ my $mkpart = sub {
+ my ($fstype, $size) = @_;
+ $pnum++;
+ my $end = defined($size) ? $cpos + $size : $hdsize_mb;
+ if ($fstype) {
+ push @$pcmd, 'mkpart', 'primary', $fstype, $cpos, $end;
+ } else {
+ push @$pcmd, 'mkpart', 'primary', $cpos, $end;
+ }
+ $cpos = $end;
+ };
+
+ &$mkpart(undef, $grubbootsize_mb);
+ push @$pcmd, 'set', $pnum, 'bios_grub', 'on';
+ push @$pcmd, 'name', $pnum, 'Grub-Boot-Partition';
+
+ &$mkpart('fat32', $efibootsize_mb);
+ push @$pcmd, 'set', $pnum, 'boot', 'on';
+ push @$pcmd, 'name', $pnum, 'EFI-System-Partition';
+
+ my $os_size;
+
+ if ($use_zfs) {
+
+ my $data_start = $cpos;
+ &$mkpart('zfs');
+ push @$pcmd, 'name', $pnum, 'PVE-ZFS-Partition';
+ $os_size = ($cpos - $data_start)*1024;
+
+ } else {
+
+ my $data_start = $cpos;
+ &$mkpart('ext2');
+ push @$pcmd, 'set', $pnum, 'lvm', 'on';
+ push @$pcmd, 'name', $pnum, 'PVE-LVM2-Partition';
+ $os_size = ($cpos - $data_start)*1024;
+ }
+
+ syscmd($pcmd) == 0 ||
+ die "unable to partition harddisk '${target_dev}'\n";
+
+ return ($os_size, $osdev, $efibootdev);
+}
+
+sub create_lvm_volumes {
+ my ($lvmdev, $os_size, $swap_size) = @_;
+
+ my $rootdev = '/dev/pve/root';
+ my $datadev = '/dev/pve/data';
+ my $swapfile = '/dev/pve/swap';
+
+ # we use --metadatasize 250k, which reseults 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";
+ syscmd ("/sbin/vgcreate pve $lvmdev") == 0 ||
+ die "unable to create volume group";
+
+ 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 = (($hdgb > ($maxroot*4)) ? $maxroot : $hdgb/4)*1024*1024;
+
+ my $rest = $os_size - $swap_size - $rootsize; # in KB
+
+ my $minfree;
+ if ($config_options->{minfree}) {
+ $minfree = (($config_options->{minfree}*1024*1024) >= $rest ) ? $space :
+ $config_options->{minfree}*1024*1024 ;
+ } else {
+ $minfree = $space;
+ }
+
+ $rest = $rest - $minfree;
+
+ if ($config_options->{maxvz}) {
+ $rest = (($config_options->{maxvz}*1024*1024) <= $rest) ?
+ $config_options->{maxvz}*1024*1024 : $rest;
+ }
+
+ syscmd ("/sbin/lvcreate -L${swap_size}K -nswap pve") == 0 ||
+ die "unable to create swap volume";
+
+ syscmd ("/sbin/lvcreate -L${rootsize}K -nroot pve") == 0 ||
+ die "unable to create root volume";
+
+ syscmd ("/sbin/lvcreate -L${rest}K -ndata pve") == 0 ||
+ die "unable to create data volume";
+
+ syscmd ("/sbin/vgchange -a y pve") == 0 ||
+ die "unable to activate volume group";
+
+ return ($rootdev, $datadev, $swapfile);
+}
+
+sub compute_swapsize {
+ my ($hdsize) = @_;
+
+ my $hdgb = int($hdsize/(1024*1024));
+
+ my $swapsize;
+ if ($config_options->{swapsize}) {
+ $swapsize = $config_options->{swapsize}*1024*1024;
+ } else {
+ my $ss = int ($total_memory / 1024);
+ $ss = 4 if $ss < 4;
+ $ss = ($hdgb/8) if $ss > ($hdgb/8);
+ $swapsize = $ss*1024*1024;
+ }
+}
+
sub extract_data {
my ($tgzfile, $targetdir) = @_;
die "target '$targetdir' does not exist\n" if ! -d $targetdir;
- my $rootdev;
- my $bootdev;
+ my $bootdevinfo = [];
+
my $datadev;
my $swapfile;
+ my $rootdev;
- my $ptype = 'msdos';
-
- eval {
-
- my $maxper = 0.25;
+ my $use_zfs;
+ my $zfspoolname = $opt_testmode ? "test_rpool" : 'rpool';
- update_progress (0, 0, $maxper, "create partitions");
+ my $filesys = $config_options->{filesys};
- if ( -b $target_hd) {
- syscmd ("dd if=/dev/zero of=${target_hd} bs=512 count=256");
- my $hdsize = hd_size ($target_hd); # size in blocks (1024 bytes)
-
- if ($hdsize >= 2*1024*1024*1024) { # MBR can only handle 2 TB
- $ptype = 'gpt';
- }
+ if ($filesys =~ m/zfs/) {
+ $target_hd = undef; # do not use this config
+ $use_zfs = 1;
+ $targetdir = "/$zfspoolname/ROOT/pve-1";
+ } else {
+ $use_zfs = 0;
+ }
+
+ if ($use_zfs) {
+ my $i;
+ for ($i = 5; $i > 0; $i--) {
+ syscmd("modprobe zfs");
+ last if -c "/dev/zfs";
+ sleep(1);
+ }
- if ($cmdline =~ m/hdsize=(\d+)[\s\n]/i) {
- # max hdsize passed on cmdline (GB)
- my $maxhdsize=$1*1024*1024;
+ die "unable to load zfs kernel module\n" if !$i;
+ }
- # use $maxhdsize if specified size is lower than hdsize
- if ($maxhdsize < $hdsize) {
- $hdsize = $maxhdsize;
- }
- }
+ eval {
- my $bootsize_mb = 512;
- my $bootsize = $bootsize_mb * 1024;
- my $hdsize_mb = $hdsize/1024;
- my $pcmd = "parted --align optimal ${target_hd}";
- $pcmd .= " unit MiB";
- $pcmd .= " mklabel $ptype";
+ my $maxper = 0.25;
- my $pnum = 1;
+ update_progress (0, 0, $maxper, "create partitions");
- if ($ptype eq 'gpt') {
- $pcmd .= " mkpart primary 1 2";
- $pcmd .= " set $pnum bios_grub on";
- $pnum++;
- };
+ if ($opt_testmode) {
- $pcmd .= " mkpart primary ext2 $pnum ${bootsize_mb}";
- $pcmd .= " set $pnum boot on";
- $pnum++;
+ $rootdev = abs_path($target_hd);
+ syscmd ("umount $rootdev");
+ if ($use_zfs) {
- $pcmd .= " mkpart primary ext2 ${bootsize_mb} ${hdsize_mb}";
- $pcmd .= " set $pnum lvm on";
+ die "unsupported zfs mode (for testing environment)\n"
+ if $filesys ne 'zfs (RAID0)';
- syscmd($pcmd) == 0 ||
- die "unable to partition harddisk '${target_hd}'\n";
+ syscmd ("zpool destroy $zfspoolname") if $opt_testmode;
- sleep(1); # give kernel time to reread part table
+ zfs_create_rpool($zfspoolname, $rootdev);
+ }
- my $lvmdev = get_lvm_part($target_hd, $ptype eq 'gpt');
+ } elsif ($use_zfs) {
- $rootdev = '/dev/pve/root';
- $datadev = '/dev/pve/data';
- $swapfile = '/dev/pve/swap';
+ my ($devlist, $bootdevlist, $vdev) = get_zfs_raid_setup();
- # we use --metadatasize 250k, which reseults 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";
- syscmd ("/sbin/vgcreate pve $lvmdev") == 0 ||
- die "unable to create volume group";
+ my $disksize;
+ foreach my $hd (@$bootdevlist) {
+ my $devname = @$hd[1];
+ my ($size, $osdev, $efidev) =
+ partition_bootable_disk($devname, undef, 1);
+ die "unable to mirror disks with different sizes!\n"
+ if $disksize && ($size != $disksize);
+ push @$bootdevinfo, { esp => $efidev, devname => $devname, osdev => $osdev};
+ $disksize = $size;
+ $vdev =~ s/ $devname/ $osdev/;
+ }
- my $hdgb = int($hdsize/(1024*1024));
- die "hardisk too small (${hdgb}GB)" if $hdgb < 4;
+ sleep(1); # give kernel time to reread part table
- my $swapsize;
- if ($cmdline =~ m/swapsize=(\d+)[\s\n]/i) {
- $swapsize=$1*1024*1024;
- } else {
- my $ss = int ($total_memory / 1024);
- $ss = 4 if $ss < 4;
- $ss = ($hdgb/8) if $ss > ($hdgb/8);
- $swapsize = $ss*1024*1024;
- }
+ # trigger udev to create /dev/disk/by-uuid
+ syscmd ("udevadm trigger --subsystem-match block");
+ syscmd ("udevadm settle --timeout 10");
- my $space = (($hdgb > 128) ? 16 : ($hdgb/8))*1024*1024;
+ 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};
- my $maxroot;
- if ($cmdline =~ m/maxroot=(\d+)[\s\n]/i) {
- $maxroot = $1;
- } else {
- $maxroot = 96;
+ my $osdev = $di->{osdev};
+ $vdev =~ s/ $devname/ $osdev/;
}
- my $rootsize = (($hdgb > ($maxroot*4)) ? $maxroot : $hdgb/4)*1024*1024;
- my $rest = int($hdsize) - $bootsize - $swapsize - $rootsize; # in KB
+ zfs_create_rpool($zfspoolname, $vdev);
+
+ my $swap_size = compute_swapsize($disksize);
+ $swapfile = zfs_create_swap($zfspoolname, $swap_size);
- my $minfree;
- if ($cmdline =~ m/minfree=(\d+)[\s\n]/i) {
- $minfree = (($1*1024*1024) >= $rest ) ? $space : $1*1024*1024 ;
- } else {
- $minfree = $space;
- }
+ } else {
- $rest = $rest - $minfree;
+ die "target '$target_hd' is not a valid block device\n" if ! -b $target_hd;
- if ($cmdline =~ m/maxvz=(\d+)[\s\n]/i) {
- $rest = (($1*1024*1024) <= $rest) ? $1*1024*1024 : $rest;
+ my $maxhdsize;
+ if ($config_options->{hdsize}) {
+ # max hdsize passed on cmdline (GB)
+ $maxhdsize = $config_options->{hdsize}*1024*1024;
}
- syscmd ("/sbin/lvcreate -L${swapsize}K -nswap pve") == 0 ||
- die "unable to create swap volume";
+ my ($os_size, $osdev, $efidev);
+ ($os_size, $osdev, $efidev) =
+ partition_bootable_disk($target_hd, $maxhdsize, $use_zfs);
+
+ sleep(1); # give kernel time to reread part table
- syscmd ("/sbin/lvcreate -L${rootsize}K -nroot pve") == 0 ||
- die "unable to create root volume";
+ # trigger udev to create /dev/disk/by-uuid
+ syscmd ("udevadm trigger --subsystem-match block");
+ syscmd ("udevadm settle --timeout 10");
- syscmd ("/sbin/lvcreate -L${rest}K -ndata pve") == 0 ||
- die "unable to create data volume";
+ my $by_id = find_stable_path ("/dev/disk/by-id", $target_hd);
+ push @$bootdevinfo, { esp => $efidev, devname => $target_hd,
+ osdev => $osdev, by_id => $by_id };
- syscmd ("/sbin/vgchange -a y pve") == 0 ||
- die "unable to activate volume group";
+ my $swap_size = compute_swapsize($os_size);
+ ($rootdev, $datadev, $swapfile) =
+ create_lvm_volumes($osdev, $os_size, $swap_size);
- } else {
- $rootdev = $target_hd;
- syscmd ("umount $rootdev");
+ # trigger udev to create /dev/disk/by-uuid
+ syscmd ("udevadm trigger --subsystem-match block");
+ syscmd ("udevadm settle --timeout 10");
+ }
+
+ if ($use_zfs) {
+ # to be fast during installation
+ syscmd ("zfs set sync=disabled $zfspoolname") == 0 ||
+ die "unable to set zfs properties\n";
}
update_progress (0.03, 0, $maxper, "create swap space");
if ($swapfile) {
- syscmd ("mkswap $swapfile") == 0 ||
+ syscmd ("mkswap -f $swapfile") == 0 ||
die "unable to create swap space\n";
}
update_progress (0.05, 0, $maxper, "creating filesystems");
- if ( -b $target_hd) {
- $bootdev = get_boot_part ($target_hd, $ptype eq 'gpt');
- create_filesystem ($bootdev, 'boot', $filesys, 0.05, $maxper, 0, 0.1);
- create_filesystem ($rootdev, 'root', $filesys, 0.05, $maxper, 0.1, 0.5);
- create_filesystem ($datadev, 'data', $filesys, 0.05, $maxper, 0.5, 1, '-m 0');
- } else {
- create_filesystem ($rootdev, 'root', $filesys, 0.05, $maxper, 0, 1);
+ foreach my $di (@$bootdevinfo) {
+ syscmd ("mkfs.vfat -F32 $di->{esp}") == 0 ||
+ die "unable to initialize EFI ESP on device $di->{esp}\n";
}
- update_progress (1, 0.05, $maxper, "mounting target $rootdev");
+ if (!$use_zfs) {
- if ( -b $target_hd) {
+ if ( -b $target_hd) {
- # trigger udev to create /dev/disk/by-uuid
- syscmd ("udevadm trigger --subsystem-match block");
- syscmd ("udevadm settle --timeout 10");
+ create_filesystem ($rootdev, 'root', $filesys, 0.05, $maxper, 0, 0.5);
+ create_filesystem ($datadev, 'data', $filesys, 0.05, $maxper, 0.5, 1, '-m 0');
+
+ } else {
+
+ create_filesystem ($rootdev, 'root', $filesys, 0.05, $maxper, 0, 1, '-m 0');
+ }
+ }
+
+ update_progress (1, 0.05, $maxper, "mounting target $rootdev");
+ if (!$use_zfs) {
syscmd ("mount -n $rootdev -o noatime,barrier=0 $targetdir") == 0 ||
die "unable to mount $rootdev\n";
+ }
+
+ mkdir "$targetdir/boot";
+ mkdir "$targetdir/boot/efi";
- mkdir "$targetdir/boot";
- syscmd ("mount -n $bootdev -o noatime,barrier=0 $targetdir/boot") == 0 ||
- die "unable to mount $bootdev\n";
+ if (scalar(@$bootdevinfo)) {
+ mkdir "$targetdir/boot/efi";
+ my $di = @$bootdevinfo[0]; # simply use first disk
+ syscmd ("mount -n $di->{esp} $targetdir/boot/efi") == 0 ||
+ die "unable to mount $di->{esp}\n";
+ }
+
+ if ($datadev) {
mkdir "$targetdir/var";
mkdir "$targetdir/var/lib";
mkdir "$targetdir/var/lib/vz";
syscmd ("mount -n $datadev $targetdir/var/lib/vz") == 0 ||
die "unable to mount $datadev\n";
-
- } else {
- syscmd ("mount $rootdev $targetdir -o loop,noatime,barrier=0") == 0 ||
- die "unable to mount $rootdev\n";
}
display_html ("extract2-rulesystem.htm");
my $resolfconf = "search $domain\nnameserver $dnsserver\n";
write_config ($resolfconf, "$targetdir/etc/resolv.conf");
- # try to use UUID=XXX for boot device
- my $boot_uuid = $bootdev;
- if (my $uuid = find_dev_by_uuid ($bootdev)) {
- $boot_uuid = "UUID=$uuid";
- }
-
# configure fstab
- my $fstab =
- "# <file system> <mount point> <type> <options> <dump> <pass>\n" .
- "$rootdev / $filesys errors=remount-ro 0 1\n";
-
- $fstab .= "$datadev /var/lib/vz $filesys defaults 0 1\n" if $datadev;
+ my $fstab = "# <file system> <mount point> <type> <options> <dump> <pass>\n";
- $fstab .= "${boot_uuid} /boot $filesys defaults 0 1\n" if $boot_uuid;
+ if (!$use_zfs) {
+ $fstab .= "$rootdev / $filesys errors=remount-ro 0 1\n";
+ $fstab .= "$datadev /var/lib/vz $filesys defaults 0 1\n" if $datadev;
+ }
+
+ if (scalar(@$bootdevinfo)) {
+ my $di = @$bootdevinfo[0]; # simply use first disk
+ my $efi_boot_uuid = $di->{esp};
+ 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";
+ }
$fstab .= "$swapfile none swap sw 0 0\n" if $swapfile;
syscmd ("touch $targetdir/proxmox_install_mode");
+ my $grub_install_devices_txt = '';
+ foreach my $di (@$bootdevinfo) {
+ $grub_install_devices_txt .= ', ' if $grub_install_devices_txt;
+ $grub_install_devices_txt .= $di->{by_id} if $di->{by_id};
+ }
+
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/workgroup string WORKGROUP
postfix postfix/main_mailer_type select Local only
console-data console-data/keymap/policy select Don\'t touch keymap
+grub-pc grub-pc/install_devices select $grub_install_devices_txt
_EOD
my $pkgdir = $opt_testmode ? "packages" : "/proxmox/packages";
chomp;
my $path = $_;
my ($deb) = $path =~ m/$pkgdir\/(.*\.deb)/;
+ if ($deb =~ m/^grub-efi-/ && $deb !~ m/^grub-${grub_plattform}/) {
+ $count++;
+ next;
+ }
update_progress ($count/$pkg_count, 0.5, 0.75, "extracting $deb");
print "extracting: $deb\n";
syscmd ("cp $path $targetdir/tmp/$deb") == 0 ||
syscmd ("chroot $targetdir /usr/sbin/install-keymap '/usr/share/keymaps/i386/$kmapfile'");
}
- # enable apache port redirect
- syscmd ("chroot $targetdir a2ensite pve-redirect.conf");
-
# set apt mirror
if (my $mirror = $cmap->{country}->{$country}->{mirror}) {
my $fn = "$targetdir/etc/apt/sources.list";
update_progress (0.8, 0.95, 1, "make system bootable");
# update default grub settings
- syscmd ("sed -i -e 's/^GRUB_DISTRIBUTOR.*/GRUB_DISTRIBUTOR=\"Proxmox Virtual Environment\"/' -e 's/#GRUB_DISABLE_LINUX_RECOVERY=.*/GRUB_DISABLE_LINUX_RECOVERY=\"true\"/' $targetdir/etc/default/grub");
+ syscmd ("sed -i -e 's/^GRUB_DISTRIBUTOR.*/GRUB_DISTRIBUTOR=\"Proxmox Virtual Environment\"/' -e 's/#GRUB_DISABLE_RECOVERY=.*/GRUB_DISABLE_RECOVERY=\"true\"/' $targetdir/etc/default/grub") == 0 ||
+ die "unable to update /etc/default/grub\n";
+
+ 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 ||
+ die "unable to update /etc/default/grub\n";
+
+ }
diversion_remove ($targetdir, "/usr/sbin/update-grub");
diversion_remove ($targetdir, "/usr/sbin/update-initramfs");
- if (!$opt_testmode && -b $target_hd) {
+ if (!$opt_testmode) {
unlink ("$targetdir/etc/mtab");
symlink ("/proc/mounts", "$targetdir/etc/mtab");
syscmd ("chroot $targetdir /usr/sbin/update-initramfs -c -k $kapi") == 0 ||
die "unable to install initramfs\n";
- syscmd ("chroot $targetdir /usr/sbin/grub-install --no-floppy '(hd0)'") == 0 ||
- die "unable to install the boot loader\n";
+ foreach my $di (@$bootdevinfo) {
+ my $dev = $di->{devname};
+ syscmd ("chroot $targetdir /usr/sbin/grub-install --no-floppy --bootloader-id='proxmox' $dev") == 0 ||
+ die "unable to install the boot loader\n";
+ }
syscmd ("chroot $targetdir /usr/sbin/update-grub") == 0 ||
- die "unable to install the boot loader\n";
+ die "unable to update boot loader config\n";
syscmd ("umount $targetdir/dev");
}
-
# cleanup
# hack: remove dead.letter from sshd installation
syscmd ("rm -rf $targetdir/dead.letter");
- unlink ("$targetdir/etc/mtab");
- syscmd ("touch $targetdir/etc/mtab");
-
unlink "$targetdir/usr/sbin/policy-rc.d";
diversion_remove ($targetdir, "/sbin/start-stop-daemon");
syscmd ("chroot $targetdir /usr/bin/dpkg-query -W --showformat='\${package}\n'> pve-final.pkglist");
}
- syscmd ("umount $targetdir/boot");
+ syscmd ("umount $targetdir/boot/efi") if scalar(@$bootdevinfo);
syscmd ("umount $targetdir/var/lib/vz");
syscmd ("umount $targetdir/tmp");
syscmd ("umount $targetdir/proc");
syscmd ("umount $targetdir/sys");
- syscmd ("umount -d $targetdir");
+
+ if ($use_zfs) {
+ syscmd ("zfs umount -a") == 0 ||
+ die "unable to unmount zfs\n";
+ } else {
+ syscmd ("umount -d $targetdir");
+ }
+
+ if (!$err && $use_zfs) {
+ syscmd ("zfs set sync=standard $zfspoolname") == 0 ||
+ die "unable to set zfs properties\n";
+
+ syscmd ("zfs set mountpoint=/ $zfspoolname/ROOT/pve-1") == 0 ||
+ die "zfs set mountpoint failed\n";
+
+ syscmd ("zpool set bootfs=$zfspoolname/ROOT/pve-1 $zfspoolname") == 0 ||
+ die "zfs set bootfs failed\n";
+ }
die $err if $err;
}
sub display_html {
my ($filename) = @_;
- $htmlview->set_document(undef);
- $document->clear;
- $htmlview->set_document($document);
+ my $path = "${proxmox_dir}/html/$filename";
+ my $url = "file://$path";
- $document->open_stream ("text/html");
+ my $data = file_get_contents($path);
- my $fn = "${proxmox_dir}/html/$filename";
- open (HTML, $fn) ||
- die "unable to open file '$fn' - $!\n";
- while (<HTML>) { $document->write_stream ($_); }
- close (HTML);
+ if ($filename eq 'license.htm') {
+ my $licensefn = -f "/EULA" ? "/EULA" :
+ $opt_testmode ? "./copyright" :
+ "/usr/share/doc/pve-installer/copyright";
+ my $license = decode('utf8', file_get_contents($licensefn));
+ $license =~ m/^\s+(.+\n)/;
+ my $title = $licensefn eq '/EULA' ? "END USER LICENSE AGREEMENT (EULA)": $1;
+ $data =~ s/__LICENSE__/$license/;
+ $data =~ s/__LICENSE_TITLE__/$title/;
+ }
- $document->close_stream;
+ $htmlview->load_html_string($data, $url);
}
sub set_next {
my $buf;
while (my $i = read (HTMLTMP, $buf, 4096)) {
$stream->write ($buf);
- Gtk2->main_iteration while Gtk2->events_pending;
+ Gtk3->main_iteration while Gtk3->events_pending;
}
close (HTMLTMP);
}
sub create_main_window {
- $window = Gtk2::Window->new ();
+ $window = Gtk3::Window->new ();
$window->set_default_size (1024, 768);
+ $window->set_has_resize_grip(0);
$window->set_decorated (0) if !$opt_testmode;
- my $vbox = Gtk2::VBox->new (0, 0);
+ my $vbox = Gtk3::VBox->new (0, 0);
- my $image = Gtk2::Image->new_from_file ("${proxmox_dir}/proxlogo.xpm");
+ my $image = Gtk3::Image->new_from_file ("${proxmox_dir}/proxlogo.xpm");
$vbox->pack_start ($image, 0, 0, 0);
- my $hbox = Gtk2::HBox->new (0, 0);
+ my $hbox = Gtk3::HBox->new (0, 0);
$vbox->pack_start ($hbox, 1, 1, 0);
- my $f1 = Gtk2::Frame->new ();
- $f1->set_shadow_type ('in');
- $hbox->pack_start ($f1, 1, 1, 0);
+ # my $f1 = Gtk3::Frame->new ('test');
+ # $f1->set_shadow_type ('none');
+ # $hbox->pack_start ($f1, 1, 1, 0);
- my $sep1 = Gtk2::HSeparator->new;
+ my $sep1 = Gtk3::HSeparator->new;
$vbox->pack_start ($sep1, 0, 0, 0);
- $cmdbox = Gtk2::HBox->new ();
+ $cmdbox = Gtk3::HBox->new ();
$vbox->pack_start ($cmdbox, 0, 0, 10);
- $next = Gtk2::Button->new ('_Next');
+ $next = Gtk3::Button->new ('_Next');
$next->signal_connect (clicked => sub { &$next_fctn (); });
$cmdbox->pack_end ($next, 0, 0, 10);
- my $abort = Gtk2::Button->new ('_Abort');
- $abort->can_focus (0);
+ 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 = Gtk2::VBox->new (0, 0);
- $f1->add ($vbox2);
-
- $htmlview = new Gtk2::Html2::View;
- # hack: create a separate style - else Gtk2::Html2 modifies
- # main window style
- my $rcs1 = Gtk2::RcStyle->new;
- $htmlview->modify_style ($rcs1);
-
- $document = new Gtk2::Html2::Document;
- $document->signal_connect (request_url => \&url_requested);
-
- $document->clear;
- $htmlview->set_document ($document);
+ my $vbox2 = Gtk3::VBox->new (0, 0);
+ $hbox->add ($vbox2);
- my $hbox2 = Gtk2::HBox->new (0, 0);
- $hbox2->pack_start ($htmlview, 1, 1, 0);
+ $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);
$vbox2->pack_start ($hbox2, 1, 1, 0);
- my $vbox3 = Gtk2::VBox->new (0, 0);
+ my $vbox3 = Gtk3::VBox->new (0, 0);
$vbox2->pack_start ($vbox3, 0, 0, 0);
- my $sep2 = Gtk2::HSeparator->new;
+ my $sep2 = Gtk3::HSeparator->new;
$vbox3->pack_start ($sep2, 0, 0, 0);
- $inbox = Gtk2::HBox->new (0, 0);
+ $inbox = Gtk3::HBox->new (0, 0);
$vbox3->pack_start ($inbox, 0, 0, 0);
$window->add ($vbox);
sub cleanup_view {
my $list = $inbox->get_children;
- foreach my $c ($list) {
+ foreach my $c (@$list) {
next if !defined ($c);
$inbox->remove ($c);
}
}
+# fixme: newer GTK3 has special properties to handle numbers with Entry
+# only allow floating point numbers with Gtk3::Entry
+sub check_float {
+ my ($entry, $event) = @_;
+
+
+ my $val = $event->get_keyval;
+
+ if ($val == ord '.' ||
+ $val == Gtk3::Gdk::KEY_ISO_Left_Tab ||
+ $val == Gtk3::Gdk::KEY_Shift_L ||
+ $val == Gtk3::Gdk::KEY_Tab ||
+ $val == Gtk3::Gdk::KEY_Left ||
+ $val == Gtk3::Gdk::KEY_Right ||
+ $val == Gtk3::Gdk::KEY_BackSpace ||
+ $val == Gtk3::Gdk::KEY_Delete ||
+ ($val >= ord '0' && $val <= ord '9') ||
+ ($val >= Gtk3::Gdk::KEY_KP_0 &&
+ $val <= Gtk3::Gdk::KEY_KP_9)) {
+ return undef;
+ }
+
+ return 1;
+}
+
+# used by the IP input entry
sub check_num {
my ($entry, $event) = @_;
- my $val = $event->keyval;
+
+ my $val = $event->get_keyval;
if ($val == ord '.') {
- $entry->parent->child_focus ('right');
+ $entry->get_parent->child_focus ('right');
return 1;
}
- if ($val == $Gtk2::Gdk::Keysyms{ISO_Left_Tab} ||
- $val == $Gtk2::Gdk::Keysyms{Shift_L} ||
- $val == $Gtk2::Gdk::Keysyms{Tab} ||
- $val == $Gtk2::Gdk::Keysyms{BackSpace} ||
- $val == $Gtk2::Gdk::Keysyms{Delete} ||
+ if ($val == Gtk3::Gdk::KEY_ISO_Left_Tab ||
+ $val == Gtk3::Gdk::KEY_Shift_L ||
+ $val == Gtk3::Gdk::KEY_Tab ||
+ $val == Gtk3::Gdk::KEY_BackSpace ||
+ $val == Gtk3::Gdk::KEY_Delete ||
($val >= ord '0' && $val <= ord '9') ||
- ($val >= $Gtk2::Gdk::Keysyms{KP_0} &&
- $val <= $Gtk2::Gdk::Keysyms{KP_9})) {
+ ($val >= Gtk3::Gdk::KEY_KP_0 &&
+ $val <= Gtk3::Gdk::KEY_KP_9)) {
return undef;
}
sub creat_text_input {
my ($default, $text) = @_;
- my $hbox = Gtk2::HBox->new (0, 0);
+ my $hbox = Gtk3::HBox->new (0, 0);
- my $label = Gtk2::Label->new ($text);
+ 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 = Gtk2::Entry->new ();
+ my $e1 = Gtk3::Entry->new ();
$e1->set_width_chars (30);
$hbox->pack_start ($e1, 0, 0, 0);
$e1->set_text ($default);
my (@ips) = split /\./, $init;
my (@defs) = split /\./, $default;
- my $hbox = Gtk2::HBox->new (0, 0);
+ my $hbox = Gtk3::HBox->new (0, 0);
- my $label = Gtk2::Label->new ($text);
+ 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 = Gtk2::Entry->new_with_max_length (3);
+ my $e1 = Gtk3::Entry->new();
+ $e1->set_max_length(3);
$e1->{default} = $defs[0];
$hbox->pack_start ($e1, 0, 0, 0);
$e1->set_width_chars (3);
$e1->signal_connect (key_press_event => \&check_num);
$e1->signal_connect (focus_out_event => \&check_range);
- my $l1 = Gtk2::Label->new (".");
+ my $l1 = Gtk3::Label->new (".");
$hbox->pack_start ($l1, 0, 0, 2);
- my $e2 = Gtk2::Entry->new_with_max_length (3);
+ my $e2 = Gtk3::Entry->new();
+ $e2->set_max_length(3);
$e2->{default} = $defs[1];
$hbox->pack_start ($e2, 0, 0, 0);
$e2->set_width_chars (3);
$e2->signal_connect (key_press_event => \&check_num);
$e2->signal_connect (focus_out_event => \&check_range);
- my $l2 = Gtk2::Label->new (".");
+ my $l2 = Gtk3::Label->new (".");
$hbox->pack_start ($l2, 0, 0, 2);
- my $e3 = Gtk2::Entry->new_with_max_length (3);
+ my $e3 = Gtk3::Entry->new();
+ $e3->set_max_length(3);
$e3->{default} = $defs[2];
$hbox->pack_start ($e3, 0, 0, 0);
$e3->set_width_chars (3);
$e3->signal_connect (key_press_event => \&check_num);
$e3->signal_connect (focus_out_event => \&check_range);
- my $l3 = Gtk2::Label->new (".");
+ my $l3 = Gtk3::Label->new (".");
$hbox->pack_start ($l3, 0, 0, 2);
- my $e4 = Gtk2::Entry->new_with_max_length (3);
+ my $e4 = Gtk3::Entry->new();
+ $e4->set_max_length(3);
$e4->{default} = $defs[3];
$hbox->pack_start ($e4, 0, 0, 0);
$e4->set_width_chars (3);
sub display_message {
my ($msg) = @_;
- my $dialog = Gtk2::MessageDialog->new ($window, 'modal',
+ my $dialog = Gtk3::MessageDialog->new ($window, 'modal',
'info', 'ok', $msg);
$dialog->run();
$dialog->destroy();
sub display_error {
my ($msg) = @_;
- my $dialog = Gtk2::MessageDialog->new ($window, 'modal',
+ my $dialog = Gtk3::MessageDialog->new ($window, 'modal',
'error', 'ok', $msg);
$dialog->run();
$dialog->destroy();
cleanup_view ();
display_html ("ipconf.htm");
- my $vbox = Gtk2::VBox->new (0, 0);
+ my $vbox = Gtk3::VBox->new (0, 0);
$inbox->pack_start ($vbox, 1, 0, 0);
- my $hbox = Gtk2::HBox->new (0, 0);
- $vbox->pack_start ($hbox, 0, 0, 30);
- my $vbox2 = Gtk2::VBox->new (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 $addr = $ipconf->{addr} || '192.168.100.2';
($gwbox, $gw_1, $gw_2, $gw_3, $gw_4) =
creat_ip_input ($gateway, '0.0.0.0', 'Gateway:');
- $vbox2->pack_start ($gwbox, 0, 0, 15);
+ $vbox2->pack_start ($gwbox, 0, 0, 2);
$dnsserver = $ipconf->{dnsserver} || $gateway;
$sel = $timezone; # used once to select default
}
- my $cb = $lastzonecb = Gtk2::ComboBox->new_text ();
+ my $cb = $lastzonecb = Gtk3::ComboBoxText->new_with_entry();
$cb->set_size_request (200, -1);
$cb->signal_connect ('changed' => sub {
cleanup_view ();
- my $vbox2 = Gtk2::VBox->new (0, 0);
+ my $vbox2 = Gtk3::VBox->new (0, 0);
$inbox->pack_start ($vbox2, 1, 0, 0);
- my $vbox = Gtk2::VBox->new (0, 0);
- $vbox2->pack_start ($vbox, 0, 0, 30);
+ my $vbox = Gtk3::VBox->new (0, 0);
+ $vbox2->pack_start ($vbox, 0, 0, 10);
- my $hbox1 = Gtk2::HBox->new (0, 0);
- my $label = Gtk2::Label->new ("Password");
+ 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 = Gtk2::Entry->new ();
+ my $pwe1 = Gtk3::Entry->new ();
$pwe1->set_visibility (0);
$pwe1->set_size_request (200, -1);
$hbox1->pack_start ($pwe1, 0, 0, 0);
- my $hbox2 = Gtk2::HBox->new (0, 0);
- $label = Gtk2::Label->new ("Confirm");
+ 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 = Gtk2::Entry->new ();
+ my $pwe2 = Gtk3::Entry->new ();
$pwe2->set_visibility (0);
$pwe2->set_size_request (200, -1);
$hbox2->pack_start ($pwe2, 0, 0, 0);
- my $hbox3 = Gtk2::HBox->new (0, 0);
- $label = Gtk2::Label->new ("E-Mail");
+ 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 = Gtk2::Entry->new ();
+ my $eme = Gtk3::Entry->new ();
$eme->set_size_request (200, -1);
$hbox3->pack_start ($eme, 0, 0, 0);
my $countryhash = $cmap->{countryhash};
my $ctr = $cmap->{country};
- my $vbox2 = Gtk2::VBox->new (0, 0);
+ my $vbox2 = Gtk3::VBox->new (0, 0);
$inbox->pack_start ($vbox2, 1, 0, 0);
- my $vbox = Gtk2::VBox->new (0, 0);
- $vbox2->pack_start ($vbox, 0, 0, 30);
+ my $vbox = Gtk3::VBox->new (0, 0);
+ $vbox2->pack_start ($vbox, 0, 0, 10);
- my $w = Gtk2::Entry->new ();
+ my $w = Gtk3::Entry->new ();
$w->set_size_request (200, -1);
- my $c = Gtk2::EntryCompletion->new ();
+ 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 = Gtk2::HBox->new (0, 0);
- my $label = Gtk2::Label->new ("Time zone");
+ 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 = Gtk2::HBox->new (0, 0);
- $label = Gtk2::Label->new ("Keyboard Layout");
+ 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 = Gtk2::ComboBox->new_text ();
+ my $kmapcb = Gtk3::ComboBoxText->new_with_entry ();
$kmapcb->set_size_request (200, -1);
foreach my $layout (sort keys %{$cmap->{kmaphash}}) {
$kmapcb->append_text ($layout);
my ($entry, $event) = @_;
my $text = $entry->get_text;
- my $val = $event->keyval;
- if ($val == $Gtk2::Gdk::Keysyms{Tab}) {
+ my $val = $event->get_keyval;
+
+ if ($val == Gtk3::Gdk::KEY_Tab) {
my $cc = $countryhash->{lc($text)};
- return undef if $cc;
+
my $found = 0;
my $compl;
- foreach my $cc (keys %$ctr) {
- my $ct = $ctr->{$cc}->{name};
- if ($ct =~ m/^\Q$text\E.*$/i) {
- $found++;
- $compl = $ct;
+
+ if ($cc) {
+ $found = 1;
+ $compl = $ctr->{$cc}->{name};
+ } else {
+ foreach my $cc (keys %$ctr) {
+ my $ct = $ctr->{$cc}->{name};
+ if ($ct =~ m/^\Q$text\E.*$/i) {
+ $found++;
+ $compl = $ct;
+ }
+ last if $found > 1;
}
- last if $found > 1;
}
+
if ($found == 1) {
- $entry->set_text ($compl);
+ $entry->set_text($compl);
+ $c->complete();
return undef;
} else {
- Gtk2::Gdk->beep();
+ #Gtk3::Gdk::beep();
+ print chr(7); # beep ?
}
- $w->insert_text('', -1); # popup selection
+ $c->complete();
+
+ my $buf = $w->get_buffer();
+ $buf->insert_text(-1, '', -1); # popup selection
+
return 1;
}
return undef;
});
-
- my $ls = Gtk2::ListStore->new('Glib::String');
+
+ my $ls = Gtk3::ListStore->new('Glib::String');
foreach my $cc (sort {$ctr->{$a}->{name} cmp $ctr->{$b}->{name} } keys %$ctr) {
my $iter = $ls->append();
$ls->set ($iter, 0, $ctr->{$cc}->{name});
$w->set_completion ($c);
- my $hbox = Gtk2::HBox->new (0, 0);
+ my $hbox = Gtk3::HBox->new (0, 0);
- $label = Gtk2::Label->new ("Country");
+ $label = Gtk3::Label->new ("Country");
$label->set_alignment (1, 0.5);
$label->set_size_request (150, -1);
$hbox->pack_start ($label, 0, 0, 10);
$w->grab_focus();
}
+my $target_hd_combo;
+my $target_hd_label;
+
+my $hdopion_first_setup = 1;
+
+sub create_hdoption_view {
+
+ my $dialog = Gtk3::Dialog->new();
+
+ $dialog->set_title("Harddisk options");
+
+ $dialog->add_button("_OK", 1);
+
+ my $contarea = $dialog->get_content_area();
+
+ my $hbox2 = Gtk3::Box->new('horizontal', 0);
+ $contarea->pack_start($hbox2, 1, 1, 10);
+
+ 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");
+ $label0->set_alignment (1, 0.5);
+ $grid->attach($label0, 0, $row, 1, 1);
+
+ my $fstypecb = Gtk3::ComboBoxText->new_with_entry ();
+
+ my $fstype = ['ext3', 'ext4', 'zfs (RAID0)', 'zfs (RAID1)',
+ 'zfs (RAID10)', 'zfs (RAIDZ-1)',
+ 'zfs (RAIDZ-2)', 'zfs (RAIDZ-3)'];
+
+ my $tcount = 0;
+ foreach my $tmp (@$fstype) {
+ $fstypecb->append_text($tmp);
+ $fstypecb->set_active ($tcount)
+ if $config_options->{filesys} eq $tmp;
+ $tcount++;
+ }
+
+ $grid->attach($fstypecb, 1, $row, 1, 1);
+
+ $hbox2->show_all();
+
+ $row++;
+
+ my @disk_label;
+ my @disk_selector;
+ for (my $i = 0; $i < 6; $i++) {
+ $disk_label[$i] = Gtk3::Label->new ("Hardisk $i");
+ $disk_label[$i]->set_alignment (1, 0.5);
+ $grid->attach($disk_label[$i], 0, $row, 1, 1);
+ $disk_selector[$i] = Gtk3::ComboBoxText->new_with_entry();
+ my $e = $disk_selector[$i]->get_child();
+ $e->set_width_chars(40);
+ foreach my $hd (@$hds) {
+ my ($disk, $devname, $size, $model) = @$hd;
+ $disk_selector[$i]->append_text (get_device_desc ($devname, $size, $model));
+ $disk_selector[$i]->{pve_disk_id} = $i;
+ $disk_selector[$i]->signal_connect (changed => sub {
+ my $w = shift;
+ my $diskid = $w->{pve_disk_id};
+ my $a = $w->get_active;
+ $config_options->{"disksel${diskid}"} = ($a >= 0) ? $hds->[$a] : undef;
+ });
+ }
+
+ if ($hdopion_first_setup) {
+ $disk_selector[$i]->set_active ($i) if $hds->[$i];
+ } else {
+ my $hdind = 0;
+ if (my $cur_hd = $config_options->{"disksel$i"}) {
+ foreach my $hd (@$hds) {
+ if (@$hd[1] eq @$cur_hd[1]) {
+ $disk_selector[$i]->set_active($hdind);
+ last;
+ }
+ $hdind++;
+ }
+
+ }
+ }
+
+ $grid->attach($disk_selector[$i], 1, $row, 1, 1);
+
+ $row++;
+ }
+
+ $hdopion_first_setup = 0;
+
+ my $label_hdsize = Gtk3::Label->new ("hdsize");
+ $label_hdsize->set_alignment (1, 0.5);
+ $grid->attach($label_hdsize, 0, $row, 1, 1);
+
+ # size compute
+ my $hdsize = 0;
+ if ( -b $target_hd) {
+ $hdsize = int(hd_size ($target_hd) / (1024*1024.0)); # size in GB
+ } elsif ($target_hd) {
+ $hdsize = int((-s $target_hd) / (1024*1024*1024.0));
+ }
+
+ my $hdsize_size_adj = Gtk3::Adjustment->new($config_options->{hdsize} || $hdsize, 0, $hdsize+1, 1, 1, 1);
+ my $spinbutton_hdsize = Gtk3::SpinButton->new($hdsize_size_adj, 1, 1);
+ $spinbutton_hdsize->set_tooltip_text("only use specified size (GB) of the harddisk (rest left unpartitioned)");
+ $grid->attach($spinbutton_hdsize, 1, $row, 1, 1);
+ $row++;
+
+ my $label_swapsize = Gtk3::Label->new ("swapsize");
+ $label_swapsize->set_alignment (1, 0.5);
+ $grid->attach($label_swapsize, 0, $row, 1, 1);
+
+ my $entry_swapsize = Gtk3::Entry->new();
+ $entry_swapsize->set_tooltip_text("maximum SWAP size (GB)");
+ $entry_swapsize->signal_connect (key_press_event => \&check_float);
+ $entry_swapsize->set_text($config_options->{swapsize}) if $config_options->{swapsize};
+ $grid->attach($entry_swapsize, 1, $row, 1, 1);
+ $row++;
+
+ my $label_maxroot = Gtk3::Label->new ("maxroot");
+ $label_maxroot->set_alignment (1, 0.5);
+ $grid->attach($label_maxroot, 0, $row, 1, 1);
+
+ my $entry_maxroot = Gtk3::Entry->new();
+ $entry_maxroot->set_tooltip_text("maximum size (GB) for LVM root volume");
+ $entry_maxroot->signal_connect (key_press_event => \&check_float);
+ $entry_maxroot->set_text($config_options->{maxroot}) if $config_options->{maxroot};
+ $grid->attach($entry_maxroot, 1, $row, 1, 1);
+ $row++;
+
+ my $label_minfree = Gtk3::Label->new ("minfree");
+ $label_minfree->set_alignment (1, 0.5);
+ $grid->attach($label_minfree, 0, $row, 1, 1);
+
+ my $entry_minfree = Gtk3::Entry->new();
+ $entry_minfree->set_tooltip_text("minumum free LVM space (GB, required for LVM snapshots)");
+ $entry_minfree->signal_connect (key_press_event => \&check_float);
+ $entry_minfree->set_text($config_options->{minfree}) if $config_options->{minfree};
+ $grid->attach($entry_minfree, 1, $row, 1, 1);
+ $row++;
+
+ my $label_maxvz = Gtk3::Label->new ("maxvz");
+ $label_maxvz->set_alignment (1, 0.5);
+ $grid->attach($label_maxvz, 0, $row, 1, 1);
+
+ my $entry_maxvz = Gtk3::Entry->new();
+ $entry_maxvz->set_tooltip_text("maximum size (GB) for LVM data volume");
+ $entry_maxvz->signal_connect (key_press_event => \&check_float);
+ $entry_maxvz->set_text($config_options->{maxvz}) if $config_options->{maxvz};
+ $grid->attach($entry_maxvz, 1, $row, 1, 1);
+ $row++;
+
+ my $set_sensitive_flag = sub {
+ my $enable_size_hints = $config_options->{filesys} !~ m/zfs/;
+
+ if ($config_options->{filesys} =~ m/zfs/) {
+ $target_hd_combo->set_visible(0);
+ $target_hd_label->set_text("Target: $config_options->{filesys} ");
+ foreach my $w (@disk_selector) { $w->set_visible(1); }
+ foreach my $w (@disk_label) { $w->set_visible(1); }
+ } else {
+ $target_hd_combo->set_visible(1);
+ foreach my $w (@disk_selector) { $w->set_visible(0); }
+ foreach my $w (@disk_label) { $w->set_visible(0); }
+ $target_hd_label->set_text("Target Harddisk: ");
+ }
+
+ $spinbutton_hdsize->set_visible($enable_size_hints);
+ $label_hdsize->set_visible($enable_size_hints);
+ $entry_swapsize->set_visible($enable_size_hints);
+ $label_swapsize->set_visible($enable_size_hints);
+ $entry_maxroot->set_visible($enable_size_hints);
+ $label_maxroot->set_visible($enable_size_hints);
+ $entry_minfree->set_visible($enable_size_hints);
+ $label_minfree->set_visible($enable_size_hints);
+ $entry_maxvz->set_visible($enable_size_hints);
+ $label_maxvz->set_visible($enable_size_hints);
+ };
+
+ &$set_sensitive_flag();
+
+ $fstypecb->signal_connect (changed => sub {
+ $config_options->{filesys} = $fstypecb->get_active_text();
+ &$set_sensitive_flag();
+ });
+
+ $dialog->show();
+
+ $dialog->run();
+
+ my $get_float = sub {
+ my ($entry) = @_;
+
+ my $text = $entry->get_text();
+ return undef if !defined($text);
+
+ $text =~ s/^\s+//;
+ $text =~ s/\s+$//;
+
+ return undef if $text !~ m/^\d+(\.\d+)?$/;
+
+ return $text;
+ };
+
+ my $tmp;
+
+ if (($tmp = &$get_float($spinbutton_hdsize)) && ($tmp != $hdsize)) {
+ $config_options->{hdsize} = $tmp;
+ } else {
+ delete $config_options->{hdsize};
+ }
+
+ if (defined($tmp = &$get_float($entry_swapsize))) {
+ $config_options->{swapsize} = $tmp;
+ } else {
+ delete $config_options->{swapsize};
+ }
+
+ if (defined($tmp = &$get_float($entry_maxroot))) {
+ $config_options->{maxroot} = $tmp;
+ } else {
+ delete $config_options->{maxroot};
+ }
+
+ if (defined($tmp = &$get_float($entry_minfree))) {
+ $config_options->{minfree} = $tmp;
+ } else {
+ delete $config_options->{minfree};
+ }
+
+ if (defined($tmp = &$get_float($entry_maxvz))) {
+ $config_options->{maxvz} = $tmp;
+ } else {
+ delete $config_options->{maxvz};
+ }
+
+ $dialog->destroy();
+}
+
+sub get_zfs_raid_setup {
+
+ my $filesys = $config_options->{filesys};
+
+ my $dev_name_hash = {};
+
+ my $devlist = [];
+ my $bootdevlist = [];
+ for (my $i = 0; $i < 6; $i++) {
+ if (my $hd = $config_options->{"disksel$i"}) {
+ my ($disk, $devname, $size, $model) = @$hd;
+ die "device '$devname' is used more than once\n"
+ if $dev_name_hash->{$devname};
+ $dev_name_hash->{$devname} = $hd;
+ push @$devlist, $hd;
+ }
+ }
+
+ die "$filesys need at least one device\n" if scalar(@$devlist) < 1;
+
+ my $cmd= '';
+ if ($filesys eq 'zfs (RAID0)') {
+ push @$bootdevlist, @$devlist[0];
+ foreach my $hd (@$devlist) {
+ $cmd .= " @$hd[1]";
+ }
+ } elsif ($filesys eq 'zfs (RAID1)') {
+ $cmd .= ' mirror ';
+ foreach my $hd (@$devlist) {
+ $cmd .= " @$hd[1]";
+ push @$bootdevlist, $hd;
+ }
+ } elsif ($filesys eq 'zfs (RAID10)') {
+ my $count = scalar(@$devlist);
+ my $half = int($count/2);
+ die "zfs (RAID10) need at least 2 device\n" if $count < 2;
+ die "zfs (RAID10) need at an even numver of devices\n" if $half*2 != $count;
+
+ push @$bootdevlist, @$devlist[0], @$devlist[1];
+
+ for (my $i = 0; $i < $count; $i+=2) {
+ my $hd1 = @$devlist[$i];
+ my $hd2 = @$devlist[$i+1];
+ $cmd .= ' mirror ' . @$hd1[1] . ' ' . @$hd2[1];
+ }
+
+ } elsif ($filesys =~ m/^zfs \(RAIDZ-([123])\)$/) {
+ my $level = $1;
+ my $mindisks = 2 + $level;
+ die "zfs (RAIDZ-$level) need at least $mindisks devices\n" if scalar(@$devlist) < $mindisks;
+ $cmd .= ' raidz$level';
+ foreach my $hd (@$devlist) {
+ $cmd .= " @$hd[1]";
+ push @$bootdevlist, $hd;
+ }
+ } else {
+ die "unknown zfs mode '$filesys'\n";
+ }
+
+ return ($devlist, $bootdevlist, $cmd);
+}
+
sub create_hdsel_view {
cleanup_view ();
- my $vbox = Gtk2::VBox->new (0, 0);
+ my $vbox = Gtk3::VBox->new (0, 0);
$inbox->pack_start ($vbox, 1, 0, 0);
- my $hbox = Gtk2::HBox->new (0, 0);
- $vbox->pack_start ($hbox, 0, 0, 30);
+ my $hbox = Gtk3::HBox->new (0, 0);
+ $vbox->pack_start ($hbox, 0, 0, 10);
my ($disk, $devname, $size, $model) = @{@$hds[0]};
$target_hd = $devname;
- $master_hd = find_master ($target_hd);
- my $label;
- if (scalar (@$hds) == 1) {
- my $devdesc = get_device_desc ($devname, $size, $model);
- $label = Gtk2::Label->new ("Target Harddisk: $devdesc");
- $hbox->pack_start ($label, 0, 0, 0);
- } else {
- $label = Gtk2::Label->new ("Target Harddisks: ");
- $hbox->pack_start ($label, 0, 0, 0);
+ $target_hd_label = Gtk3::Label->new ("Target Harddisk: ");
+ $hbox->pack_start ($target_hd_label, 0, 0, 0);
- my $combo = Gtk2::ComboBox->new_text ();
+ $target_hd_combo = Gtk3::ComboBoxText->new_with_entry();
+ my $e = $target_hd_combo->get_child();
+ $e->set_width_chars(40);
- foreach my $hd (@$hds) {
- ($disk, $devname, $size, $model) = @$hd;
- $combo->append_text (get_device_desc ($devname, $size, $model));
- }
+ foreach my $hd (@$hds) {
+ ($disk, $devname, $size, $model) = @$hd;
+ $target_hd_combo->append_text (get_device_desc ($devname, $size, $model));
+ }
- $combo->set_active (0);
- $combo->signal_connect (changed => sub {
- $a = shift->get_active;
- my ($disk, $devname) = @{@$hds[$a]};
- $target_hd = $devname;
- $master_hd = find_master ($target_hd);
- });
+ $target_hd_combo->set_active (0);
+ $target_hd_combo->signal_connect (changed => sub {
+ $a = shift->get_active;
+ my ($disk, $devname) = @{@$hds[$a]};
+ $target_hd = $devname;
+ });
+
+ $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);
- $hbox->pack_start ($combo, 0, 0, 0);
- }
$inbox->show_all;
display_html ("page1.htm");
- set_next (undef, \&create_country_view);
+
+ set_next (undef, sub {
+
+ if ($config_options->{filesys} =~ m/zfs/) {
+ eval { get_zfs_raid_setup(); };
+ if (my $err = $@) {
+ display_message ("Warning: $err\n" .
+ "Please fix ZFS setup first.");
+ } else {
+ create_country_view();
+ }
+ } else {
+ create_country_view();
+ }
+ });
}
sub create_extract_view {
display_html ("extract1-license.htm");
$next->set_sensitive (0);
- my $vbox = Gtk2::VBox->new (0, 0);
+ my $vbox = Gtk3::VBox->new (0, 0);
$inbox->pack_start ($vbox, 1, 0, 0);
- my $hbox = Gtk2::HBox->new (0, 0);
- $vbox->pack_start ($hbox, 0, 0, 30);
+ my $hbox = Gtk3::HBox->new (0, 0);
+ $vbox->pack_start ($hbox, 0, 0, 10);
- my $vbox2 = Gtk2::VBox->new (0, 0);
+ my $vbox2 = Gtk3::VBox->new (0, 0);
$hbox->pack_start ($vbox2, 0, 0, 0);
- $progress_status = Gtk2::Label->new ();
+ $progress_status = Gtk3::Label->new ('');
$vbox2->pack_start ($progress_status, 1, 1, 0);
- $progress = Gtk2::ProgressBar->new;
- $progress->set_size_request (400, -1);
+ $progress = Gtk3::ProgressBar->new;
+ $progress->set_show_text(1);
+ $progress->set_size_request (600, -1);
$vbox2->pack_start ($progress, 0, 0, 0);
set_next ("_Reboot", sub { exit (0); } );
- display_html ($err ? "fail.htm" : "success.htm");
-
- display_error ($err) if $err;
-}
-
-sub mupdate_progress {
- my $per = shift;
- print "GOT1: $per\n";
-
+ if ($err) {
+ display_html ("fail.htm");
+ display_error ($err);
+ } else {
+ cleanup_view ();
+ display_html ("success.htm");
+ }
}
sub create_intro_view {
$ipconf = get_ip_config ();
-$country = detect_country () if $ipconf->{addr};
+$country = detect_country() if $ipconf->{addr} || $opt_testmode;;
# read country, kmap and timezone infos
$cmap = read_cmap ();
create_intro_view ();
}
-Gtk2->main;
+Gtk3->main;
exit 0;
projects / pve-installer.git / blobdiff