X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=proxinstall;h=de1980909d0757af25ef238e72727bdfc6f60eb3;hb=4fb6ac6041d2faecca06619e67f807d02e551a3f;hp=5aece6b3074be050d2f02749eabdab00191a38f3;hpb=201a512007db192b156f3234dbb258ee405450ab;p=pve-installer.git diff --git a/proxinstall b/proxinstall index 5aece6b..de19809 100755 --- a/proxinstall +++ b/proxinstall @@ -13,11 +13,12 @@ use IO::File; use IO::Select; use Cwd 'abs_path'; use Gtk3 '-init'; -use Gtk3::WebKit; +use Gtk3::WebKit2; use Encode; use String::ShellQuote; use Data::Dumper; use File::Basename; +use File::Path; use Time::HiRes; use ProxmoxInstallerSetup; @@ -30,7 +31,7 @@ if (!$ENV{G_SLICE} || $ENV{G_SLICE} ne "always-malloc") { die "do not use slice allocator (run with 'G_SLICE=always-malloc ./proxinstall ...')\n"; } -if (!GetOptions ('testmode=s' => \$opt_testmode)) { +if (!GetOptions('testmode=s' => \$opt_testmode)) { die "usage error\n"; exit (-1); } @@ -89,16 +90,14 @@ sub file_read_firstline { return $res; } -my $logfd = IO::File->new (">/tmp/install.log"); +my $logfd = IO::File->new(">/tmp/install.log"); my $proxmox_libdir = $opt_testmode ? Cwd::cwd() . "/testdir/var/lib/pve-installer" : "/var/lib/pve-installer"; my $proxmox_cddir = $opt_testmode ? "../pve-cd-builder/tmp/data-gz/" : "/cdrom"; my $proxmox_pkgdir = "${proxmox_cddir}/proxmox/packages/"; -my $grub_plattform = "pc"; # pc, efi-amd64 or efi-ia32 - -$grub_plattform = "efi-amd64" if -d "/sys/firmware/efi"; +my $boot_type = -d '/sys/firmware/efi' ? 'efi' : 'bios'; my $IPV4OCTET = "(?:25[0-5]|(?:2[0-4]|1[0-9]|[1-9])?[0-9])"; my $IPV4RE = "(?:(?:$IPV4OCTET\\.){3}$IPV4OCTET)"; @@ -216,10 +215,15 @@ my @steps = ( }, { step => 'ipconf', - next_button => '_Install', html => 'ipconf.htm', function => \&create_ipconf_view, }, + { + step => 'ack', + html => 'ack.htm', + next_button => '_Install', + function => \&create_ack_view, + }, { step => 'extract', next_button => '_Reboot', @@ -229,7 +233,7 @@ my @steps = ( # GUI global variables my ($window, $cmdbox, $inbox, $htmlview); -my $prev; +my $prev_btn; my ($next, $next_fctn, $target_hd); my ($progress, $progress_status); @@ -248,26 +252,21 @@ 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, - }, +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 @@ -348,7 +347,7 @@ sub cmd2string { sub syscmd { my ($cmd) = @_; - return run_command ($cmd, undef, undef, 1); + return run_command($cmd, undef, undef, 1); } sub run_command { @@ -391,7 +390,7 @@ sub run_command { my $pid; eval { - $pid = open3 ($writer, $reader, $error, @$cmd) || die $!; + $pid = open3($writer, $reader, $error, @$cmd) || die $!; }; my $err = $@; @@ -408,8 +407,8 @@ sub run_command { close $writer; my $select = new IO::Select; - $select->add ($reader); - $select->add ($error); + $select->add($reader); + $select->add($error); my ($ostream, $logout) = ('', '', ''); @@ -429,7 +428,7 @@ sub run_command { waitpid ($pid, 0); die "command '$cmd' failed: $err"; } - $select->remove ($h) if !$count; + $select->remove($h) if !$count; if ($h eq $reader) { $ostream .= $buf if !($noout || $func); $logout .= $buf; @@ -540,7 +539,7 @@ sub find_stable_path { my ($stabledir, $bdev) = @_; foreach my $path (<$stabledir/*>) { - if (link_points_to ($path, $bdev)) { + if (link_points_to($path, $bdev)) { return wantarray ? ($path, basename($path)) : $path; } } @@ -549,7 +548,7 @@ sub find_stable_path { sub find_dev_by_uuid { my $bdev = shift; - my ($full_path, $name) = find_stable_path ("/dev/disk/by-uuid", $bdev); + my ($full_path, $name) = find_stable_path("/dev/disk/by-uuid", $bdev); return $name; } @@ -559,7 +558,11 @@ sub hd_list { my $res = (); if ($opt_testmode) { - push @$res, [-1, $opt_testmode, int((-s $opt_testmode)/512), "TESTDISK"]; + my @disks = split /,/, $opt_testmode; + + for my $disk (@disks) { + push @$res, [-1, $disk, int((-s $disk)/512), "TESTDISK"]; + } return $res; } @@ -668,7 +671,7 @@ sub read_cmap { } # search for Harddisks -my $hds = hd_list (); +my $hds = hd_list(); sub hd_size { my ($dev) = @_; @@ -687,6 +690,9 @@ sub get_partition_dev { if ($dev =~ m|^/dev/sd([a-h]?[a-z]\|i[a-v])$|) { return "${dev}$partnum"; + } elsif ($dev =~ m|^/dev/xvd[a-z]$|) { + # Citrix Hypervisor blockdev + return "${dev}$partnum"; } elsif ($dev =~ m|^/dev/[hxev]d[a-z]$|) { return "${dev}$partnum"; } elsif ($dev =~ m|^/dev/[^/]+/c\d+d\d+$|) { @@ -721,7 +727,7 @@ sub file_get_contents { sub write_config { my ($text, $filename) = @_; - my $fd = IO::File->new (">$filename") || + my $fd = IO::File->new(">$filename") || die "unable to open file '$filename' - $!\n"; print $fd $text; $fd->close(); @@ -774,19 +780,19 @@ 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"); + update_progress(0, $rs, $re, "creating $name filesystem"); - run_command ("$fsdata->{mkfs} $opts $dev", sub { + run_command("$fsdata->{mkfs} $opts $dev", sub { my $line = shift; if ($line =~ m/Writing inode tables:\s+(\d+)\/(\d+)/) { $max = $2; } elsif ($max && $line =~ m/(\d+)\/$max/) { - update_progress (($1/$max)*0.9, $rs, $re); + update_progress(($1/$max)*0.9, $rs, $re); } elsif ($line =~ m/Creating journal.*done/) { - update_progress (0.95, $rs, $re); + update_progress(0.95, $rs, $re); } elsif ($line =~ m/Writing superblocks and filesystem.*done/) { - update_progress (1, $rs, $re); + update_progress(1, $rs, $re); } }); } @@ -795,29 +801,29 @@ sub debconfig_set { my ($targetdir, $dcdata) = @_; my $cfgfile = "/tmp/debconf.txt"; - write_config ($dcdata, "$targetdir/$cfgfile"); - syscmd ("chroot $targetdir debconf-set-selections $cfgfile"); + write_config($dcdata, "$targetdir/$cfgfile"); + syscmd("chroot $targetdir debconf-set-selections $cfgfile"); unlink "$targetdir/$cfgfile"; } sub diversion_add { my ($targetdir, $cmd, $new_cmd) = @_; - syscmd ("chroot $targetdir dpkg-divert --package proxmox " . - "--add --rename $cmd") == 0 || - die "unable to exec dpkg-divert\n"; + syscmd("chroot $targetdir dpkg-divert --package proxmox " . + "--add --rename $cmd") == 0 || + die "unable to exec dpkg-divert\n"; - syscmd ("ln -sf ${new_cmd} $targetdir/$cmd") == 0 || + syscmd("ln -sf ${new_cmd} $targetdir/$cmd") == 0 || die "unable to link diversion to ${new_cmd}\n"; } sub diversion_remove { my ($targetdir, $cmd) = @_; - syscmd ("mv $targetdir/${cmd}.distrib $targetdir/${cmd};") == 0 || + syscmd("mv $targetdir/${cmd}.distrib $targetdir/${cmd};") == 0 || die "unable to remove $cmd diversion\n"; - syscmd ("chroot $targetdir dpkg-divert --remove $cmd") == 0 || + syscmd("chroot $targetdir dpkg-divert --remove $cmd") == 0 || die "unable to remove $cmd diversion\n"; } @@ -845,34 +851,34 @@ sub zfs_create_rpool { $cmd .= " -o ashift=$config_options->{ashift}" if defined($config_options->{ashift}); - syscmd ("$cmd $zfspoolname $vdev") == 0 || + syscmd("$cmd $zfspoolname $vdev") == 0 || die "unable to create zfs root pool\n"; - syscmd ("zfs create $zfspoolname/ROOT") == 0 || - die "unable to create zfs $zfspoolname/ROOT volume\n"; + syscmd("zfs create $zfspoolname/ROOT") == 0 || + die "unable to create zfs $zfspoolname/ROOT volume\n"; if ($setup->{product} eq 'pve') { - syscmd ("zfs create $zfspoolname/data") == 0 || + syscmd("zfs create $zfspoolname/data") == 0 || die "unable to create zfs $zfspoolname/data volume\n"; } - syscmd ("zfs create $zfspoolname/ROOT/$zfsrootvolname") == 0 || + syscmd("zfs create $zfspoolname/ROOT/$zfsrootvolname") == 0 || die "unable to create zfs $zfspoolname/ROOT/$zfsrootvolname volume\n"; # disable atime during install - syscmd ("zfs set atime=off $zfspoolname") == 0 || + syscmd("zfs set atime=off $zfspoolname") == 0 || die "unable to set zfs properties\n"; my $value = $config_options->{compress}; - syscmd ("zfs set compression=$value $zfspoolname") + syscmd("zfs set compression=$value $zfspoolname") if defined($value) && $value ne 'off'; $value = $config_options->{checksum}; - syscmd ("zfs set checksum=$value $zfspoolname") + syscmd("zfs set checksum=$value $zfspoolname") if defined($value) && $value ne 'on'; $value = $config_options->{copies}; - syscmd ("zfs set copies=$value $zfspoolname") + syscmd("zfs set copies=$value $zfspoolname") if defined($value) && $value != 1; } @@ -882,8 +888,8 @@ my $udevadm_trigger_block = sub { sleep(1) if !$nowait; # give kernel time to reread part table # trigger udev to create /dev/disk/by-uuid - syscmd ("udevadm trigger --subsystem-match block"); - syscmd ("udevadm settle --timeout 10"); + syscmd("udevadm trigger --subsystem-match block"); + syscmd("udevadm settle --timeout 10"); }; my $clean_disk = sub { @@ -970,9 +976,9 @@ sub create_lvm_volumes { # 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 || + syscmd("/sbin/pvcreate --metadatasize 250k -y -ff $lvmdev") == 0 || die "unable to initialize physical volume $lvmdev\n"; - syscmd ("/sbin/vgcreate $vgname $lvmdev") == 0 || + syscmd("/sbin/vgcreate $vgname $lvmdev") == 0 || die "unable to create volume group '$vgname'\n"; my $hdgb = int($os_size/(1024*1024)); @@ -1017,13 +1023,13 @@ sub create_lvm_volumes { } if ($swap_size) { - syscmd ("/sbin/lvcreate -L${swap_size}K -nswap $vgname") == 0 || + syscmd("/sbin/lvcreate -L${swap_size}K -nswap $vgname") == 0 || die "unable to create swap volume\n"; $swapfile = "/dev/$vgname/swap"; } - syscmd ("/sbin/lvcreate -L${rootsize}K -nroot $vgname") == 0 || + syscmd("/sbin/lvcreate -L${rootsize}K -nroot $vgname") == 0 || die "unable to create root volume\n"; if ($datasize > 4*1024*1024) { @@ -1037,16 +1043,16 @@ sub create_lvm_volumes { # 1 4MB PE to allow for rounding $datasize -= 4*1024; - syscmd ("/sbin/lvcreate -L${datasize}K -ndata $vgname") == 0 || + 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 || + 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 || + syscmd("/sbin/vgchange -a y $vgname") == 0 || die "unable to activate volume group\n"; return ($rootdev, $swapfile, $datadev); @@ -1071,6 +1077,30 @@ sub compute_swapsize { return $swapsize; } +sub prepare_systemd_boot_esp { + my ($espdev, $targetdir) = @_; + + my $espuuid = find_dev_by_uuid($espdev); + my $espmp = "var/tmp/$espuuid"; + mkdir "$targetdir/$espmp"; + + syscmd("mount -n $espdev -t vfat $targetdir/$espmp") == 0 || + die "unable to mount ESP $espdev\n"; + + File::Path::make_path("$targetdir/$espmp/EFI/proxmox") || + die "unable to create directory $targetdir/$espmp/EFI/proxmox\n"; + + syscmd("chroot $targetdir bootctl --no-variables --path /$espmp install") == 0 || + die "unable to install systemd-boot loader\n"; + write_config("timeout 3\ndefault proxmox-*\n", + "$targetdir/$espmp/loader/loader.conf"); + syscmd("chroot $targetdir /etc/kernel/postinst.d/zz-pve-efiboot") == 0 || + die "unable to generate systemd-boot config\n"; + + syscmd("umount $targetdir/$espmp") == 0 || + die "unable to umount ESP $targetdir/$espmp\n"; + +} sub extract_data { my ($basefile, $targetdir) = @_; @@ -1115,7 +1145,7 @@ sub extract_data { my $maxper = 0.25; - update_progress (0, 0, $maxper, "create partitions"); + update_progress(0, 0, $maxper, "create partitions"); syscmd("vgchange -an") if !$opt_testmode; # deactivate all detected VGs @@ -1136,7 +1166,7 @@ sub extract_data { die "unsupported zfs mode (for testing environment)\n" if $filesys ne 'zfs (RAID0)'; - syscmd ("zpool destroy $zfstestpool"); + syscmd("zpool destroy $zfstestpool"); zfs_create_rpool($rootdev); @@ -1171,17 +1201,24 @@ sub extract_data { my ($devlist, $bootdevlist, $vdev) = get_zfs_raid_setup(); - my $disksize; foreach my $hd (@$devlist) { &$clean_disk(@$hd[1]); } + + my $disksize; foreach my $hd (@$bootdevlist) { my $devname = @$hd[1]; - my ($size, $osdev) = + my ($size, $osdev, $efidev) = partition_bootable_disk($devname, $config_options->{hdsize}, 'BF01'); + zfs_mirror_size_check($disksize, $size) if $disksize; - push @$bootdevinfo, { devname => $devname, osdev => $osdev}; + + push @$bootdevinfo, { + esp => $efidev, + devname => $devname, + osdev => $osdev + }; $disksize = $size; } @@ -1227,21 +1264,21 @@ sub extract_data { if ($use_zfs) { # to be fast during installation - syscmd ("zfs set sync=disabled $zfspoolname") == 0 || + syscmd("zfs set sync=disabled $zfspoolname") == 0 || die "unable to set zfs properties\n"; } - update_progress (0.03, 0, $maxper, "create swap space"); + update_progress(0.03, 0, $maxper, "create swap space"); if ($swapfile) { - syscmd ("mkswap -f $swapfile") == 0 || + syscmd("mkswap -f $swapfile") == 0 || die "unable to create swap space\n"; } - update_progress (0.05, 0, $maxper, "creating filesystems"); + update_progress(0.05, 0, $maxper, "creating filesystems"); foreach my $di (@$bootdevinfo) { next if !$di->{esp}; - syscmd ("mkfs.vfat -F32 $di->{esp}") == 0 || + syscmd("mkfs.vfat -F32 $di->{esp}") == 0 || die "unable to initialize EFI ESP on device $di->{esp}\n"; } @@ -1250,10 +1287,10 @@ sub extract_data { } elsif ($use_btrfs) { # do nothing } else { - create_filesystem ($rootdev, 'root', $filesys, 0.05, $maxper, 0, 1); + create_filesystem($rootdev, 'root', $filesys, 0.05, $maxper, 0, 1); } - update_progress (1, 0.05, $maxper, "mounting target $rootdev"); + update_progress(1, 0.05, $maxper, "mounting target $rootdev"); if ($use_zfs) { # do nothing @@ -1282,7 +1319,12 @@ sub extract_data { } } - update_progress (1, 0.05, $maxper, "extracting base system"); + mkdir "$targetdir/mnt"; + mkdir "$targetdir/mnt/hostrun"; + syscmd("mount --bind /run $targetdir/mnt/hostrun") == 0 || + die "unable to bindmount run on $targetdir/mnt/hostrun\n"; + + update_progress(1, 0.05, $maxper, "extracting base system"); my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size) = stat ($basefile); $ino || die "unable to open file '$basefile' - $!\n"; @@ -1293,7 +1335,7 @@ sub extract_data { my $per = 0; my $count = 0; - run_command ("unsquashfs -f -dest $targetdir -i $basefile", sub { + run_command("unsquashfs -f -dest $targetdir -i $basefile", sub { my $line = shift; return if $line !~ m/^$targetdir/; $count++; @@ -1301,18 +1343,20 @@ sub extract_data { if ($nper != $per) { $per = $nper; my $frac = $per > 100 ? 1 : $per/100; - update_progress ($frac, $maxper, 0.5); + update_progress($frac, $maxper, 0.5); } }); - syscmd ("mount -n -t tmpfs tmpfs $targetdir/tmp") == 0 || + syscmd("mount -n -t tmpfs tmpfs $targetdir/tmp") == 0 || die "unable to mount tmpfs on $targetdir/tmp\n"; - syscmd ("mount -n -t proc proc $targetdir/proc") == 0 || + syscmd("mount -n -t proc proc $targetdir/proc") == 0 || die "unable to mount proc on $targetdir/proc\n"; - syscmd ("mount -n -t sysfs sysfs $targetdir/sys") == 0 || + syscmd("mount -n -t sysfs sysfs $targetdir/sys") == 0 || die "unable to mount sysfs on $targetdir/sys\n"; + syscmd("chroot $targetdir mount --bind /mnt/hostrun /run") == 0 || + die "unable to re-bindmount hostrun on /run in chroot\n"; - update_progress (1, $maxper, 0.5, "configuring base system"); + update_progress(1, $maxper, 0.5, "configuring base system"); # configure hosts @@ -1327,11 +1371,11 @@ sub extract_data { "ff02::2 ip6-allrouters\n" . "ff02::3 ip6-allhosts\n"; - write_config ($hosts, "$targetdir/etc/hosts"); + write_config($hosts, "$targetdir/etc/hosts"); - write_config ("$hostname\n", "$targetdir/etc/hostname"); + write_config("$hostname\n", "$targetdir/etc/hostname"); - syscmd ("/bin/hostname $hostname") if !$opt_testmode; + syscmd("/bin/hostname $hostname") if !$opt_testmode; # configure interfaces @@ -1367,12 +1411,12 @@ sub extract_data { $ifaces .= "\niface $name $ntype manual\n"; } - write_config ($ifaces, "$targetdir/etc/network/interfaces"); + write_config($ifaces, "$targetdir/etc/network/interfaces"); # configure dns my $resolvconf = "search $domain\nnameserver $dnsserver\n"; - write_config ($resolvconf, "$targetdir/etc/resolv.conf"); + write_config($resolvconf, "$targetdir/etc/resolv.conf"); # configure fstab @@ -1403,9 +1447,10 @@ sub extract_data { # Note: this is required by current grub, but really dangerous, because # vfat does not have journaling, so it triggers manual fsck after each crash # so we only mount /boot/efi if really required (efi systems). - if ($grub_plattform =~ m/^efi-/) { + if ($boot_type eq 'efi' && !$use_zfs) { if (scalar(@$bootdevinfo)) { my $di = @$bootdevinfo[0]; # simply use first disk + if ($di->{esp}) { my $efi_boot_uuid = $di->{esp}; if (my $uuid = find_dev_by_uuid ($di->{esp})) { @@ -1422,21 +1467,21 @@ sub extract_data { $fstab .= "proc /proc proc defaults 0 0\n"; - write_config ($fstab, "$targetdir/etc/fstab"); - write_config ("", "$targetdir/etc/mtab"); + write_config($fstab, "$targetdir/etc/fstab"); + write_config("", "$targetdir/etc/mtab"); - syscmd ("cp ${proxmox_libdir}/policy-disable-rc.d " . + syscmd("cp ${proxmox_libdir}/policy-disable-rc.d " . "$targetdir/usr/sbin/policy-rc.d") == 0 || die "unable to copy policy-rc.d\n"; - syscmd ("cp ${proxmox_libdir}/fake-start-stop-daemon " . + syscmd("cp ${proxmox_libdir}/fake-start-stop-daemon " . "$targetdir/sbin/") == 0 || die "unable to copy start-stop-daemon\n"; - diversion_add ($targetdir, "/sbin/start-stop-daemon", "/sbin/fake-start-stop-daemon"); - diversion_add ($targetdir, "/usr/sbin/update-grub", "/bin/true"); - diversion_add ($targetdir, "/usr/sbin/update-initramfs", "/bin/true"); + diversion_add($targetdir, "/sbin/start-stop-daemon", "/sbin/fake-start-stop-daemon"); + diversion_add($targetdir, "/usr/sbin/update-grub", "/bin/true"); + diversion_add($targetdir, "/usr/sbin/update-initramfs", "/bin/true"); - syscmd ("touch $targetdir/proxmox_install_mode"); + syscmd("touch $targetdir/proxmox_install_mode"); my $grub_install_devices_txt = ''; foreach my $di (@$bootdevinfo) { @@ -1469,17 +1514,13 @@ _EOD chomp; my $path = $_; my ($deb) = $path =~ m/${proxmox_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"); + update_progress($count/$pkg_count, 0.5, 0.75, "extracting $deb"); print "extracting: $deb\n"; - syscmd ("cp $path $targetdir/tmp/$deb") == 0 || + syscmd("cp $path $targetdir/tmp/$deb") == 0 || die "installation of package $deb failed\n"; - syscmd ("chroot $targetdir dpkg $dpkg_opts --force-depends --no-triggers --unpack /tmp/$deb") == 0 || + syscmd("chroot $targetdir dpkg $dpkg_opts --force-depends --no-triggers --unpack /tmp/$deb") == 0 || die "installation of package $deb failed\n"; - update_progress ((++$count)/$pkg_count, 0.5, 0.75); + update_progress((++$count)/$pkg_count, 0.5, 0.75); } # needed for postfix postinst in case no other NIC is active @@ -1487,42 +1528,42 @@ _EOD my $cmd = "chroot $targetdir dpkg $dpkg_opts --force-confold --configure -a"; $count = 0; - run_command ($cmd, sub { + run_command($cmd, sub { my $line = shift; if ($line =~ m/Setting up\s+(\S+)/) { - update_progress ((++$count)/$pkg_count, 0.75, 0.95, - "configuring $1"); + update_progress((++$count)/$pkg_count, 0.75, 0.95, + "configuring $1"); } }); unlink "$targetdir/etc/mailname"; $postfix_main_cf =~ s/__FQDN__/${hostname}.${domain}/; - write_config ($postfix_main_cf, "$targetdir/etc/postfix/main.cf"); + write_config($postfix_main_cf, "$targetdir/etc/postfix/main.cf"); # make sure we have all postfix directories - syscmd ("chroot $targetdir /usr/sbin/postfix check"); + syscmd("chroot $targetdir /usr/sbin/postfix check"); # cleanup mail queue - syscmd ("chroot $targetdir /usr/sbin/postsuper -d ALL"); + syscmd("chroot $targetdir /usr/sbin/postsuper -d ALL"); # enable NTP (timedatectl set-ntp true does not work without DBUS) - syscmd ("chroot $targetdir /bin/systemctl enable systemd-timesyncd.service"); + syscmd("chroot $targetdir /bin/systemctl enable systemd-timesyncd.service"); unlink "$targetdir/proxmox_install_mode"; # set timezone unlink ("$targetdir/etc/localtime"); symlink ("/usr/share/zoneinfo/$timezone", "$targetdir/etc/localtime"); - write_config ("$timezone\n", "$targetdir/etc/timezone"); + write_config("$timezone\n", "$targetdir/etc/timezone"); # set apt mirror if (my $mirror = $cmap->{country}->{$country}->{mirror}) { my $fn = "$targetdir/etc/apt/sources.list"; - syscmd ("sed -i 's/ftp\\.debian\\.org/$mirror/' '$fn'"); + syscmd("sed -i 's/ftp\\.debian\\.org/$mirror/' '$fn'"); } # create extended_states for apt (avoid cron job warning if that # file does not exist) - write_config ('', "$targetdir/var/lib/apt/extended_states"); + write_config('', "$targetdir/var/lib/apt/extended_states"); # allow ssh root login syscmd(['sed', '-i', 's/^#\?PermitRootLogin.*/PermitRootLogin yes/', "$targetdir/etc/ssh/sshd_config"]); @@ -1531,7 +1572,7 @@ _EOD # 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 || + 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 || @@ -1544,16 +1585,20 @@ _EOD debconfig_set($targetdir, "pve-manager pve-manager/country string $ucc\n"); } - update_progress (0.8, 0.95, 1, "make system bootable"); + 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\\/$zfsrootvolname 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"; + if ($boot_type eq 'efi') { + write_config("root=ZFS=$zfspoolname/ROOT/$zfsrootvolname boot=zfs", "$targetdir/etc/kernel/cmdline"); + } + } - diversion_remove ($targetdir, "/usr/sbin/update-grub"); - diversion_remove ($targetdir, "/usr/sbin/update-initramfs"); + diversion_remove($targetdir, "/usr/sbin/update-grub"); + diversion_remove($targetdir, "/usr/sbin/update-initramfs"); my $kapi; foreach my $fn (<$targetdir/lib/modules/*>) { @@ -1568,20 +1613,22 @@ _EOD unlink ("$targetdir/etc/mtab"); symlink ("/proc/mounts", "$targetdir/etc/mtab"); - syscmd ("mount -n --bind /dev $targetdir/dev"); + syscmd("mount -n --bind /dev $targetdir/dev"); - syscmd ("chroot $targetdir /usr/sbin/update-initramfs -c -k $kapi") == 0 || + syscmd("chroot $targetdir /usr/sbin/update-initramfs -c -k $kapi") == 0 || die "unable to install initramfs\n"; foreach my $di (@$bootdevinfo) { my $dev = $di->{devname}; - syscmd ("chroot $targetdir /usr/sbin/grub-install --target i386-pc --no-floppy --bootloader-id='proxmox' $dev") == 0 || + syscmd("chroot $targetdir /usr/sbin/grub-install --target i386-pc --no-floppy --bootloader-id='proxmox' $dev") == 0 || die "unable to install the i386-pc boot loader on '$dev'\n"; - if ($di->{esp}) { - syscmd ("mount -n $di->{esp} -t vfat $targetdir/boot/efi") == 0 || + if ($di->{esp} && $use_zfs) { + prepare_systemd_boot_esp($di->{esp}, $targetdir); + } elsif ($di->{esp}) { + syscmd("mount -n $di->{esp} -t vfat $targetdir/boot/efi") == 0 || die "unable to mount $di->{esp}\n"; - my $rc = syscmd ("chroot $targetdir /usr/sbin/grub-install --target x86_64-efi --no-floppy --bootloader-id='proxmox' $dev"); + my $rc = syscmd("chroot $targetdir /usr/sbin/grub-install --target x86_64-efi --no-floppy --bootloader-id='proxmox' $dev"); if ($rc != 0) { if (-d '/sys/firmware/efi') { die "unable to install the EFI boot loader on '$dev'\n"; @@ -1594,35 +1641,32 @@ _EOD syscmd("cp $targetdir/boot/efi/EFI/proxmox/grubx64.efi $targetdir/boot/efi/EFI/BOOT/BOOTx64.EFI") == 0 || die "unable to copy efi boot loader\n"; - syscmd ("umount $targetdir/boot/efi") == 0 || + syscmd("umount $targetdir/boot/efi") == 0 || die "unable to umount $targetdir/boot/efi\n"; } } - syscmd ("chroot $targetdir /usr/sbin/update-grub") == 0 || + syscmd("chroot $targetdir /usr/sbin/update-grub") == 0 || die "unable to update boot loader config\n"; - syscmd ("umount $targetdir/dev"); + syscmd("umount $targetdir/dev"); } # cleanup - # hack: remove dead.letter from sshd installation - syscmd ("rm -rf $targetdir/dead.letter"); - unlink "$targetdir/usr/sbin/policy-rc.d"; - diversion_remove ($targetdir, "/sbin/start-stop-daemon"); + diversion_remove($targetdir, "/sbin/start-stop-daemon"); # set root password my $octets = encode("utf-8", $password); - run_command ("chroot $targetdir /usr/sbin/chpasswd", undef, - "root:$octets\n"); + run_command("chroot $targetdir /usr/sbin/chpasswd", undef, + "root:$octets\n"); if ($setup->{product} eq 'pmg') { # save admin email - write_config ("section: admin\n\temail ${mailto}\n", - "$targetdir/etc/pmg/pmg.conf"); + write_config("section: admin\n\temail ${mailto}\n", + "$targetdir/etc/pmg/pmg.conf"); } elsif ($setup->{product} eq 'pve') { @@ -1633,34 +1677,34 @@ _EOD # write vnc keymap to datacenter.cfg my $vnckmap = $cmap->{kmap}->{$keymap}->{kvm} || 'en-us'; - write_config ("keyboard: $vnckmap\n", - "$tmpdir/datacenter.cfg"); + write_config("keyboard: $vnckmap\n", + "$tmpdir/datacenter.cfg"); # save admin email - write_config ("user:root\@pam:1:0:::${mailto}::\n", - "$tmpdir/user.cfg"); + write_config("user:root\@pam:1:0:::${mailto}::\n", + "$tmpdir/user.cfg"); # write storage.cfg my $storage_cfg_fn = "$tmpdir/storage.cfg"; if ($use_zfs) { - write_config ($storage_cfg_zfs, $storage_cfg_fn); + write_config($storage_cfg_zfs, $storage_cfg_fn); } elsif ($use_btrfs) { - write_config ($storage_cfg_btrfs, $storage_cfg_fn); + write_config($storage_cfg_btrfs, $storage_cfg_fn); } elsif ($datadev) { - write_config ($storage_cfg_lvmthin, $storage_cfg_fn); + write_config($storage_cfg_lvmthin, $storage_cfg_fn); } else { - write_config ($storage_cfg_local, $storage_cfg_fn); + write_config($storage_cfg_local, $storage_cfg_fn); } run_command("chroot $targetdir /usr/bin/create_pmxcfs_db /tmp/pve /var/lib/pve-cluster/config.db"); - syscmd ("rm -rf $tmpdir"); + syscmd("rm -rf $tmpdir"); } }; my $err = $@; - update_progress (1, 0, 1, ""); + update_progress(1, 0, 1, ""); print $err if $err; @@ -1668,30 +1712,32 @@ _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'> final.pkglist"); + syscmd("chroot $targetdir /usr/bin/dpkg-query -W --showformat='\${package}\n'> final.pkglist"); } - syscmd ("umount $targetdir/tmp"); - syscmd ("umount $targetdir/proc"); - syscmd ("umount $targetdir/sys"); + syscmd("umount $targetdir/run"); + syscmd("umount $targetdir/mnt/hostrun"); + syscmd("umount $targetdir/tmp"); + syscmd("umount $targetdir/proc"); + syscmd("umount $targetdir/sys"); if ($use_zfs) { - syscmd ("zfs umount -a") == 0 || + syscmd("zfs umount -a") == 0 || die "unable to unmount zfs\n"; } else { - syscmd ("umount -d $targetdir"); + syscmd("umount -d $targetdir"); } if (!$err && $use_zfs) { - syscmd ("zfs set sync=standard $zfspoolname") == 0 || + syscmd("zfs set sync=standard $zfspoolname") == 0 || die "unable to set zfs properties\n"; - syscmd ("zfs set mountpoint=/ $zfspoolname/ROOT/$zfsrootvolname") == 0 || + syscmd("zfs set mountpoint=/ $zfspoolname/ROOT/$zfsrootvolname") == 0 || die "zfs set mountpoint failed\n"; - syscmd ("zpool set bootfs=$zfspoolname/ROOT/$zfsrootvolname $zfspoolname") == 0 || + syscmd("zpool set bootfs=$zfspoolname/ROOT/$zfsrootvolname $zfspoolname") == 0 || die "zfs set bootfs failed\n"; - syscmd ("zpool export $zfspoolname"); + syscmd("zpool export $zfspoolname"); } die $err if $err; @@ -1735,13 +1781,17 @@ sub display_html { my $data = file_get_contents($path); if ($filename eq 'license.htm') { - my $license = decode('utf8', file_get_contents("${proxmox_cddir}/EULA")); + my $license = eval { decode('utf8', file_get_contents("${proxmox_cddir}/EULA")) }; + if (my $err = $@) { + die $err if !$opt_testmode; + $license = "TESTMODE: Ignore non existent EULA...\n"; + } my $title = "END USER LICENSE AGREEMENT (EULA)"; $data =~ s/__LICENSE__/$license/; $data =~ s/__LICENSE_TITLE__/$title/; } - $htmlview->load_html_string($data, $url); + $htmlview->load_html($data, $url); $last_display_change = time(); } @@ -1752,12 +1802,12 @@ sub prev_function { $fctn = $step_number if !$fctn; $text = "_Previous" if !$text; - $prev->set_label ($text); + $prev_btn->set_label ($text); $step_number--; $steps[$step_number]->{function}(); - $prev->grab_focus (); + $prev_btn->grab_focus(); } sub set_next { @@ -1766,77 +1816,77 @@ sub set_next { $next_fctn = $fctn; my $step = $steps[$step_number]; $text //= $steps[$step_number]->{next_button} // '_Next'; - $next->set_label ($text); + $next->set_label($text); - $next->grab_focus (); + $next->grab_focus(); } sub create_main_window { - $window = Gtk3::Window->new (); - $window->set_default_size (1024, 768); + $window = Gtk3::Window->new(); + $window->set_default_size(1024, 768); $window->set_has_resize_grip(0); - $window->set_decorated (0) if !$opt_testmode; + $window->set_decorated(0) if !$opt_testmode; - my $vbox = Gtk3::VBox->new (0, 0); + my $vbox = Gtk3::VBox->new(0, 0); my $logofn = "$setup->{product}-banner.png"; my $image = Gtk3::Image->new_from_file("${proxmox_libdir}/$logofn"); - $vbox->pack_start ($image, 0, 0, 0); + $vbox->pack_start($image, 0, 0, 0); - my $hbox = Gtk3::HBox->new (0, 0); - $vbox->pack_start ($hbox, 1, 1, 0); + my $hbox = Gtk3::HBox->new(0, 0); + $vbox->pack_start($hbox, 1, 1, 0); # my $f1 = Gtk3::Frame->new ('test'); # $f1->set_shadow_type ('none'); # $hbox->pack_start ($f1, 1, 1, 0); - my $sep1 = Gtk3::HSeparator->new; - $vbox->pack_start ($sep1, 0, 0, 0); + my $sep1 = Gtk3::HSeparator->new(); + $vbox->pack_start($sep1, 0, 0, 0); - $cmdbox = Gtk3::HBox->new (); - $vbox->pack_start ($cmdbox, 0, 0, 10); + $cmdbox = Gtk3::HBox->new(); + $vbox->pack_start($cmdbox, 0, 0, 10); - $next = Gtk3::Button->new ('_Next'); - $next->signal_connect (clicked => sub { $last_display_change = 0; &$next_fctn (); }); - $cmdbox->pack_end ($next, 0, 0, 10); + $next = Gtk3::Button->new('_Next'); + $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); + $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); - $abort->signal_connect (clicked => sub { exit (-1); }); + my $abort = Gtk3::Button->new('_Abort'); + $abort->set_can_focus(0); + $cmdbox->pack_start($abort, 0, 0, 10); + $abort->signal_connect(clicked => sub { exit (-1); }); - my $vbox2 = Gtk3::VBox->new (0, 0); - $hbox->add ($vbox2); + my $vbox2 = Gtk3::VBox->new(0, 0); + $hbox->add($vbox2); - $htmlview = Gtk3::WebKit::WebView->new(); + $htmlview = Gtk3::WebKit2::WebView->new(); my $scrolls = Gtk3::ScrolledWindow->new(); $scrolls->add($htmlview); - my $hbox2 = Gtk3::HBox->new (0, 0); - $hbox2->pack_start ($scrolls, 1, 1, 0); + my $hbox2 = Gtk3::HBox->new(0, 0); + $hbox2->pack_start($scrolls, 1, 1, 0); - $vbox2->pack_start ($hbox2, 1, 1, 0); + $vbox2->pack_start($hbox2, 1, 1, 0); - my $vbox3 = Gtk3::VBox->new (0, 0); - $vbox2->pack_start ($vbox3, 0, 0, 0); + my $vbox3 = Gtk3::VBox->new(0, 0); + $vbox2->pack_start($vbox3, 0, 0, 0); my $sep2 = Gtk3::HSeparator->new; - $vbox3->pack_start ($sep2, 0, 0, 0); + $vbox3->pack_start($sep2, 0, 0, 0); - $inbox = Gtk3::HBox->new (0, 0); - $vbox3->pack_start ($inbox, 0, 0, 0); + $inbox = Gtk3::HBox->new(0, 0); + $vbox3->pack_start($inbox, 0, 0, 0); - $window->add ($vbox); + $window->add($vbox); $window->show_all; - $window->realize (); + $window->realize(); } sub cleanup_view { @@ -1886,16 +1936,16 @@ sub check_number { sub create_text_input { my ($default, $text) = @_; - my $hbox = Gtk3::HBox->new (0, 0); + my $hbox = Gtk3::HBox->new(0, 0); - my $label = Gtk3::Label->new ($text); - $label->set_size_request (150, -1); - $label->set_alignment (1, 0.5); - $hbox->pack_start ($label, 0, 0, 10); - my $e1 = Gtk3::Entry->new (); - $e1->set_width_chars (30); - $hbox->pack_start ($e1, 0, 0, 0); - $e1->set_text ($default); + my $label = Gtk3::Label->new($text); + $label->set_size_request(150, -1); + $label->set_alignment(1, 0.5); + $hbox->pack_start($label, 0, 0, 10); + my $e1 = Gtk3::Entry->new(); + $e1->set_width_chars(30); + $hbox->pack_start($e1, 0, 0, 0); + $e1->set_text($default); return ($hbox, $e1); } @@ -1966,8 +2016,8 @@ sub get_ip_config { sub display_message { my ($msg) = @_; - my $dialog = Gtk3::MessageDialog->new ($window, 'modal', - 'info', 'ok', $msg); + my $dialog = Gtk3::MessageDialog->new($window, 'modal', + 'info', 'ok', $msg); $dialog->run(); $dialog->destroy(); } @@ -1975,8 +2025,8 @@ sub display_message { sub display_error { my ($msg) = @_; - my $dialog = Gtk3::MessageDialog->new ($window, 'modal', - 'error', 'ok', $msg); + my $dialog = Gtk3::MessageDialog->new($window, 'modal', + 'error', 'ok', $msg); $dialog->run(); $dialog->destroy(); } @@ -1988,20 +2038,22 @@ sub create_ipconf_view { cleanup_view(); display_html(); - my $vbox = Gtk3::VBox->new (0, 0); - $inbox->pack_start ($vbox, 1, 0, 0); - my $hbox = Gtk3::HBox->new (0, 0); - $vbox->pack_start ($hbox, 0, 0, 10); - my $vbox2 = Gtk3::VBox->new (0, 0); - $hbox->add ($vbox2); + my $vbox = Gtk3::VBox->new(0, 0); + $inbox->pack_start($vbox, 1, 0, 0); + my $hbox = Gtk3::HBox->new(0, 0); + $vbox->pack_start($hbox, 0, 0, 10); + my $vbox2 = Gtk3::VBox->new(0, 0); + $hbox->add($vbox2); + my $ipaddr_text = $config->{ipaddress} // "192.168.100.2"; my $ipbox; ($ipbox, $ipconf_entry_addr) = - create_text_input ("192.168.100.2", 'IP Address:'); + create_text_input($ipaddr_text, 'IP Address:'); + my $netmask_text = $config->{netmask} // "255.255.255.0"; my $maskbox; ($maskbox, $ipconf_entry_mask) = - create_text_input ("255.255.255.0", 'Netmask:'); + create_text_input($netmask_text, 'Netmask:'); my $device_cb = Gtk3::ComboBoxText->new(); $device_cb->set_active(0); @@ -2013,11 +2065,17 @@ sub create_ipconf_view { }; my $device_active_map = {}; + my $device_active_reverse_map = {}; my $device_change_handler = sub { my $current = shift; - $ipconf->{selected} = $device_active_map->{$current->get_active()}; + + my $new = $device_active_map->{$current->get_active()}; + return if defined($ipconf->{selected}) && $new eq $ipconf->{selected}; + + $ipconf->{selected} = $new; my $iface = $ipconf->{ifaces}->{$ipconf->{selected}}; + $config->{mngmt_nic} = $iface->{name}; $ipconf_entry_addr->set_text($iface->{inet}->{addr} || $iface->{inet6}->{addr}) if $iface->{inet}->{addr} || $iface->{inet6}->{addr}; $ipconf_entry_mask->set_text($iface->{inet}->{mask} || $iface->{inet6}->{mask}) @@ -2027,57 +2085,60 @@ sub create_ipconf_view { my $i = 0; foreach my $index (sort keys %{$ipconf->{ifaces}}) { $device_cb->append_text(&$get_device_desc($ipconf->{ifaces}->{$index})); - $device_active_map->{$i} = $index; + $device_active_map->{$i} = $index; + $device_active_reverse_map->{$ipconf->{ifaces}->{$index}->{name}} = $i; if ($ipconf_first_view && $index == $ipconf->{default}) { $device_cb->set_active($i); &$device_change_handler($device_cb); $ipconf_first_view = 0; } - $device_cb->signal_connect ('changed' => $device_change_handler); + $device_cb->signal_connect('changed' => $device_change_handler); $i++; } - $device_cb->set_active(0) - if !($ipconf->{selected}); + if (my $nic = $config->{mngmt_nic}) { + $device_cb->set_active($device_active_reverse_map->{$nic} // 0); + } else { + $device_cb->set_active(0); + } - my $devicebox = Gtk3::HBox->new (0, 0); - my $label = Gtk3::Label->new ("Management Interface:"); - $label->set_size_request (150, -1); - $label->set_alignment (1, 0.5); - $devicebox->pack_start ($label, 0, 0, 10); - $devicebox->pack_start ($device_cb, 0, 0, 0); + my $devicebox = Gtk3::HBox->new(0, 0); + my $label = Gtk3::Label->new("Management Interface:"); + $label->set_size_request(150, -1); + $label->set_alignment(1, 0.5); + $devicebox->pack_start($label, 0, 0, 10); + $devicebox->pack_start($device_cb, 0, 0, 0); - $vbox2->pack_start ($devicebox, 0, 0, 2); + $vbox2->pack_start($devicebox, 0, 0, 2); - my $hn = $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); + create_text_input($hn, 'Hostname (FQDN):'); + $vbox2->pack_start($hostbox, 0, 0, 2); - $vbox2->pack_start ($ipbox, 0, 0, 2); + $vbox2->pack_start($ipbox, 0, 0, 2); - $vbox2->pack_start ($maskbox, 0, 0, 2); + $vbox2->pack_start($maskbox, 0, 0, 2); - $gateway = $ipconf->{gateway} || '192.168.100.1'; + $gateway = $config->{gateway} // $ipconf->{gateway} || '192.168.100.1'; my $gwbox; ($gwbox, $ipconf_entry_gw) = - create_text_input ($gateway, 'Gateway:'); + create_text_input($gateway, 'Gateway:'); - $vbox2->pack_start ($gwbox, 0, 0, 2); + $vbox2->pack_start($gwbox, 0, 0, 2); - $dnsserver = $ipconf->{dnsserver} || $gateway; + $dnsserver = $config->{dnsserver} // $ipconf->{dnsserver} || $gateway; my $dnsbox; ($dnsbox, $ipconf_entry_dns) = - create_text_input ($dnsserver, 'DNS Server:'); + create_text_input($dnsserver, 'DNS Server:'); - $vbox2->pack_start ($dnsbox, 0, 0, 0); + $vbox2->pack_start($dnsbox, 0, 0, 0); $inbox->show_all; - set_next (undef, sub { + set_next(undef, sub { # verify hostname @@ -2086,6 +2147,8 @@ sub create_ipconf_view { $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 @@ -2100,7 +2163,7 @@ sub create_ipconf_view { $hostname = $1; $domain = $2; } else { - display_message ("Hostname does not look like a fully qualified domain name."); + display_message("Hostname does not look like a fully qualified domain name."); $hostentry->grab_focus(); return; } @@ -2117,10 +2180,11 @@ sub create_ipconf_view { $ipaddress = $text; $ipversion = 6; } else { - display_message ("IP address is not valid."); + display_message("IP address is not valid."); $ipconf_entry_addr->grab_focus(); return; } + $config->{ipaddress} = $ipaddress; $text = $ipconf_entry_mask->get_text(); $text =~ s/^\s+//; @@ -2130,10 +2194,11 @@ sub create_ipconf_view { } elsif (($ipversion == 4) && defined($ipv4_mask_hash->{$text})) { $netmask = $text; } else { - display_message ("Netmask is not valid."); + display_message("Netmask is not valid."); $ipconf_entry_mask->grab_focus(); return; } + $config->{netmask} = $netmask; $text = $ipconf_entry_gw->get_text(); $text =~ s/^\s+//; @@ -2143,10 +2208,11 @@ sub create_ipconf_view { } elsif (($ipversion == 6) && ($text =~ m!^($IPV6RE)$!)) { $gateway = $text; } else { - display_message ("Gateway is not valid."); + display_message("Gateway is not valid."); $ipconf_entry_gw->grab_focus(); return; } + $config->{gateway} = $gateway; $text = $ipconf_entry_dns->get_text(); $text =~ s/^\s+//; @@ -2156,20 +2222,58 @@ sub create_ipconf_view { } elsif (($ipversion == 6) && ($text =~ m!^($IPV6RE)$!)) { $dnsserver = $text; } else { - display_message ("DNS server is not valid."); + display_message("DNS server is not valid."); $ipconf_entry_dns->grab_focus(); return; } + $config->{dnsserver} = $dnsserver; #print "TEST $ipaddress $netmask $gateway $dnsserver\n"; $step_number++; - create_extract_view(); + create_ack_view(); }); $hostentry->grab_focus(); } +sub create_ack_view { + + cleanup_view(); + + my $ack_template = "${proxmox_libdir}/html/ack_template.htm"; + my $ack_html = "${proxmox_libdir}/html/$steps[$step_number]->{html}"; + my $html_data = file_get_contents($ack_template); + + my %config_values = ( + __target_hd__ => join(' | ', @{$config_options->{target_hds}}), + __target_fs__ => $config_options->{filesys}, + __country__ => $cmap->{country}->{$country}->{name}, + __timezone__ => $timezone, + __keymap__ => $keymap, + __mailto__ => $mailto, + __interface__ => $ipconf->{ifaces}->{$ipconf->{selected}}->{name}, + __hostname__ => $hostname, + __ip__ => $ipaddress, + __netmask__ => $netmask, + __gateway__ => $gateway, + __dnsserver__ => $dnsserver, + ); + + while ( my ($k, $v) = each %config_values) { + $html_data =~ s/$k/$v/g; + } + + write_config($html_data, $ack_html); + + display_html(); + + set_next(undef, sub { + $step_number++; + create_extract_view(); + }); +} + sub get_device_desc { my ($devname, $size, $model) = @_; @@ -2205,7 +2309,7 @@ sub update_layout { $i++; } - $cb->set_active ($ind || $def || 0); + $cb->set_active($ind || $def || 0); } my $lastzonecb; @@ -2224,9 +2328,9 @@ sub update_zonelist { } my $cb = $lastzonecb = Gtk3::ComboBoxText->new(); - $cb->set_size_request (200, -1); + $cb->set_size_request(200, -1); - $cb->signal_connect ('changed' => sub { + $cb->signal_connect('changed' => sub { $timezone = $cb->get_active_text(); }); @@ -2240,61 +2344,61 @@ sub update_zonelist { my $i = 0; foreach my $zone (sort @za) { $ind = $i if $sel && $zone eq $sel; - $cb->append_text ($zone); + $cb->append_text($zone); $i++; } - $cb->set_active ($ind || 0); + $cb->set_active($ind || 0); $cb->show; - $box->pack_start ($cb, 0, 0, 0); + $box->pack_start($cb, 0, 0, 0); } sub create_password_view { - cleanup_view (); - - my $vbox2 = Gtk3::VBox->new (0, 0); - $inbox->pack_start ($vbox2, 1, 0, 0); - my $vbox = Gtk3::VBox->new (0, 0); - $vbox2->pack_start ($vbox, 0, 0, 10); + cleanup_view(); - my $hbox1 = Gtk3::HBox->new (0, 0); - my $label = Gtk3::Label->new ("Password"); - $label->set_size_request (150, -1); - $label->set_alignment (1, 0.5); - $hbox1->pack_start ($label, 0, 0, 10); - my $pwe1 = Gtk3::Entry->new (); - $pwe1->set_visibility (0); + my $vbox2 = Gtk3::VBox->new(0, 0); + $inbox->pack_start($vbox2, 1, 0, 0); + my $vbox = Gtk3::VBox->new(0, 0); + $vbox2->pack_start($vbox, 0, 0, 10); + + my $hbox1 = Gtk3::HBox->new(0, 0); + my $label = Gtk3::Label->new("Password"); + $label->set_size_request(150, -1); + $label->set_alignment(1, 0.5); + $hbox1->pack_start($label, 0, 0, 10); + my $pwe1 = Gtk3::Entry->new(); + $pwe1->set_visibility(0); $pwe1->set_text($password) if $password; - $pwe1->set_size_request (200, -1); - $hbox1->pack_start ($pwe1, 0, 0, 0); - - my $hbox2 = Gtk3::HBox->new (0, 0); - $label = Gtk3::Label->new ("Confirm"); - $label->set_size_request (150, -1); - $label->set_alignment (1, 0.5); - $hbox2->pack_start ($label, 0, 0, 10); - my $pwe2 = Gtk3::Entry->new (); - $pwe2->set_visibility (0); + $pwe1->set_size_request(200, -1); + $hbox1->pack_start($pwe1, 0, 0, 0); + + my $hbox2 = Gtk3::HBox->new(0, 0); + $label = Gtk3::Label->new("Confirm"); + $label->set_size_request(150, -1); + $label->set_alignment(1, 0.5); + $hbox2->pack_start($label, 0, 0, 10); + my $pwe2 = Gtk3::Entry->new(); + $pwe2->set_visibility(0); $pwe2->set_text($password) if $password; - $pwe2->set_size_request (200, -1); - $hbox2->pack_start ($pwe2, 0, 0, 0); - - my $hbox3 = Gtk3::HBox->new (0, 0); - $label = Gtk3::Label->new ("E-Mail"); - $label->set_size_request (150, -1); - $label->set_alignment (1, 0.5); - $hbox3->pack_start ($label, 0, 0, 10); - my $eme = Gtk3::Entry->new (); - $eme->set_size_request (200, -1); + $pwe2->set_size_request(200, -1); + $hbox2->pack_start($pwe2, 0, 0, 0); + + my $hbox3 = Gtk3::HBox->new(0, 0); + $label = Gtk3::Label->new("E-Mail"); + $label->set_size_request(150, -1); + $label->set_alignment(1, 0.5); + $hbox3->pack_start($label, 0, 0, 10); + my $eme = Gtk3::Entry->new(); + $eme->set_size_request(200, -1); $eme->set_text($mailto); - $hbox3->pack_start ($eme, 0, 0, 0); + $hbox3->pack_start($eme, 0, 0, 0); - $vbox->pack_start ($hbox1, 0, 0, 5); - $vbox->pack_start ($hbox2, 0, 0, 5); - $vbox->pack_start ($hbox3, 0, 0, 15); + $vbox->pack_start($hbox1, 0, 0, 5); + $vbox->pack_start($hbox2, 0, 0, 5); + $vbox->pack_start($hbox3, 0, 0, 15); $inbox->show_all; @@ -2306,27 +2410,27 @@ sub create_password_view { my $t2 = $pwe2->get_text; if (length ($t1) < 5) { - display_message ("Password is too short."); + display_message("Password is too short."); $pwe1->grab_focus(); return; } if ($t1 ne $t2) { - display_message ("Password does not match."); + display_message("Password does not match."); $pwe1->grab_focus(); return; } my $t3 = $eme->get_text; if ($t3 !~ m/^\S+\@\S+\.\S+$/) { - display_message ("E-Mail does not look like a valid address" . + display_message("E-Mail does not look like a valid address" . " (user\@domain.tld)"); $eme->grab_focus(); return; } if ($t3 eq 'mail@example.invalid') { - display_message ("Please enter a valid E-Mail address"); + display_message("Please enter a valid E-Mail address"); $eme->grab_focus(); return; } @@ -2344,37 +2448,37 @@ sub create_password_view { sub create_country_view { - cleanup_view (); + cleanup_view(); my $countryhash = $cmap->{countryhash}; my $ctr = $cmap->{country}; - my $vbox2 = Gtk3::VBox->new (0, 0); - $inbox->pack_start ($vbox2, 1, 0, 0); - my $vbox = Gtk3::VBox->new (0, 0); - $vbox2->pack_start ($vbox, 0, 0, 10); + my $vbox2 = Gtk3::VBox->new(0, 0); + $inbox->pack_start($vbox2, 1, 0, 0); + my $vbox = Gtk3::VBox->new(0, 0); + $vbox2->pack_start($vbox, 0, 0, 10); - my $w = Gtk3::Entry->new (); - $w->set_size_request (200, -1); + my $w = Gtk3::Entry->new(); + $w->set_size_request(200, -1); - my $c = Gtk3::EntryCompletion->new (); - $c->set_text_column (0); + my $c = Gtk3::EntryCompletion->new(); + $c->set_text_column(0); $c->set_minimum_key_length(0); - $c->set_popup_set_width (1); - $c->set_inline_completion (1); - - my $hbox2 = Gtk3::HBox->new (0, 0); - my $label = Gtk3::Label->new ("Time zone"); - $label->set_size_request (150, -1); - $label->set_alignment (1, 0.5); - $hbox2->pack_start ($label, 0, 0, 10); + $c->set_popup_set_width(1); + $c->set_inline_completion(1); + + my $hbox2 = Gtk3::HBox->new(0, 0); + my $label = Gtk3::Label->new("Time zone"); + $label->set_size_request(150, -1); + $label->set_alignment(1, 0.5); + $hbox2->pack_start($label, 0, 0, 10); update_zonelist ($hbox2); - my $hbox3 = Gtk3::HBox->new (0, 0); - $label = Gtk3::Label->new ("Keyboard Layout"); - $label->set_size_request (150, -1); - $label->set_alignment (1, 0.5); - $hbox3->pack_start ($label, 0, 0, 10); + my $hbox3 = Gtk3::HBox->new(0, 0); + $label = Gtk3::Label->new("Keyboard Layout"); + $label->set_size_request(150, -1); + $label->set_alignment(1, 0.5); + $hbox3->pack_start($label, 0, 0, 10); my $kmapcb = Gtk3::ComboBoxText->new(); $kmapcb->set_size_request (200, -1); @@ -2382,7 +2486,7 @@ sub create_country_view { $kmapcb->append_text ($layout); } - update_layout ($kmapcb); + update_layout($kmapcb); $hbox3->pack_start ($kmapcb, 0, 0, 0); $kmapcb->signal_connect ('changed' => sub { @@ -2400,9 +2504,9 @@ sub create_country_view { my $text = $entry->get_text; if (my $cc = $countryhash->{lc($text)}) { - update_zonelist ($hbox2, $cc); + update_zonelist($hbox2, $cc); my $kmap = $ctr->{$cc}->{kmap} || 'en-us'; - update_layout ($kmapcb, $kmap); + update_layout($kmapcb, $kmap); } }); @@ -2461,17 +2565,17 @@ sub create_country_view { $w->set_completion ($c); - my $hbox = Gtk3::HBox->new (0, 0); + my $hbox = Gtk3::HBox->new(0, 0); - $label = Gtk3::Label->new ("Country"); - $label->set_alignment (1, 0.5); - $label->set_size_request (150, -1); - $hbox->pack_start ($label, 0, 0, 10); - $hbox->pack_start ($w, 0, 0, 0); + $label = Gtk3::Label->new("Country"); + $label->set_alignment(1, 0.5); + $label->set_size_request(150, -1); + $hbox->pack_start($label, 0, 0, 10); + $hbox->pack_start($w, 0, 0, 0); - $vbox->pack_start ($hbox, 0, 0, 5); - $vbox->pack_start ($hbox2, 0, 0, 5); - $vbox->pack_start ($hbox3, 0, 0, 5); + $vbox->pack_start($hbox, 0, 0, 5); + $vbox->pack_start($hbox2, 0, 0, 5); + $vbox->pack_start($hbox3, 0, 0, 5); if ($country && $ctr->{$country}) { $w->set_text ($ctr->{$country}->{name}); @@ -2490,7 +2594,7 @@ sub create_country_view { create_password_view(); return; } else { - display_message ("Please select a country first."); + display_message("Please select a country first."); $w->grab_focus(); } }); @@ -2501,7 +2605,7 @@ sub create_country_view { my $target_hd_combo; my $target_hd_label; -my $hdopion_first_setup = 1; +my $hdoption_first_setup = 1; my $create_basic_grid = sub { my $grid = Gtk3::Grid->new(); @@ -2557,7 +2661,7 @@ my $create_raid_disk_grid = sub { }); } - if ($hdopion_first_setup) { + if ($hdoption_first_setup) { $disk_selector->set_active ($i+1) if $hds->[$i]; } else { my $hdind = 0; @@ -2689,7 +2793,7 @@ sub create_hdoption_view { # Filesystem type - my $label0 = Gtk3::Label->new ("Filesystem"); + my $label0 = Gtk3::Label->new("Filesystem"); $label0->set_alignment (1, 0.5); $grid->attach($label0, 0, $row, 1, 1); @@ -2722,6 +2826,12 @@ sub create_hdoption_view { $grid->attach($sep, 0, $row, 2, 1); $row++; + my $hw_raid_note = Gtk3::Label->new("Note: ZFS is not compatible with disks backed by a hardware RAID controller. For details see the reference documentation."); + $hw_raid_note->set_line_wrap(1); + $hw_raid_note->set_max_width_chars(30); + $hw_raid_note->set_visible(0); + $grid->attach($hw_raid_note, 0, $row++, 2, 1); + my $hdsize_labeled_widgets = []; # size compute @@ -2780,7 +2890,7 @@ sub create_hdoption_view { $grid->attach($options_stack, 0, $row, 2, 1); $row++; - $hdopion_first_setup = 0; + $hdoption_first_setup = 0; my $switch_view = sub { my $raid = $config_options->{filesys} =~ m/zfs|btrfs/; @@ -2789,6 +2899,7 @@ sub create_hdoption_view { $target_hd_combo->set_visible(!$raid); $options_stack->get_child_by_name("hdsize")->set_visible(!$raid); $options_stack->get_child_by_name("raiddisk")->set_visible($raid); + $hw_raid_note->set_visible($raid); $options_stack_switcher->set_visible($enable_zfs_opts); $options_stack->get_child_by_name("raidzfsadvanced")->set_visible($enable_zfs_opts); if ($raid) { @@ -2810,6 +2921,10 @@ sub create_hdoption_view { &$switch_view(); }); + my $sep2 = Gtk3::HSeparator->new(); + $sep2->set_visible(1); + $contarea->pack_end($sep2, 1, 1, 10); + $dialog->show(); $dialog->run(); @@ -2977,40 +3092,48 @@ sub get_btrfs_raid_setup { return ($devlist, $mode); } +my $last_hd_selected = 0; sub create_hdsel_view { - $prev->set_sensitive(1); # enable previous button at this point + $prev_btn->set_sensitive(1); # enable previous button at this point - cleanup_view (); + cleanup_view(); - my $vbox = Gtk3::VBox->new (0, 0); - $inbox->pack_start ($vbox, 1, 0, 0); - my $hbox = Gtk3::HBox->new (0, 0); - $vbox->pack_start ($hbox, 0, 0, 10); + my $vbox = Gtk3::VBox->new(0, 0); + $inbox->pack_start($vbox, 1, 0, 0); + my $hbox = Gtk3::HBox->new(0, 0); + $vbox->pack_start($hbox, 0, 0, 10); my ($disk, $devname, $size, $model) = @{@$hds[0]}; - $target_hd = $devname; + $target_hd = $devname if !defined($target_hd); - $target_hd_label = Gtk3::Label->new ("Target Harddisk: "); - $hbox->pack_start ($target_hd_label, 0, 0, 0); + $target_hd_label = Gtk3::Label->new("Target Harddisk: "); + $hbox->pack_start($target_hd_label, 0, 0, 0); $target_hd_combo = Gtk3::ComboBoxText->new(); foreach my $hd (@$hds) { ($disk, $devname, $size, $model) = @$hd; - $target_hd_combo->append_text (get_device_desc ($devname, $size, $model)); + $target_hd_combo->append_text (get_device_desc($devname, $size, $model)); } - $target_hd_combo->set_active (0); - $target_hd_combo->signal_connect (changed => sub { + my $raid = $config_options->{filesys} =~ m/zfs|btrfs/; + if ($raid) { + $target_hd_label->set_text("Target: $config_options->{filesys} "); + $target_hd_combo->set_visible(0); + $target_hd_combo->set_no_show_all(1); + } + $target_hd_combo->set_active($last_hd_selected); + $target_hd_combo->signal_connect(changed => sub { $a = shift->get_active; my ($disk, $devname) = @{@$hds[$a]}; + $last_hd_selected = $a; $target_hd = $devname; }); - $hbox->pack_start ($target_hd_combo, 0, 0, 10); + $hbox->pack_start($target_hd_combo, 0, 0, 10); - my $options = Gtk3::Button->new ('_Options'); + my $options = Gtk3::Button->new('_Options'); $options->signal_connect (clicked => \&create_hdoption_view); $hbox->pack_start ($options, 0, 0, 0); @@ -3019,57 +3142,57 @@ sub create_hdsel_view { display_html(); - set_next (undef, sub { + set_next(undef, sub { if ($config_options->{filesys} =~ m/zfs/) { - eval { get_zfs_raid_setup(); }; + my ($devlist) = eval { get_zfs_raid_setup() }; if (my $err = $@) { - display_message ("Warning: $err\n" . - "Please fix ZFS setup first."); - } else { - $step_number++; - create_country_view(); + display_message("Warning: $err\nPlease fix ZFS setup first."); + return; } + $config_options->{target_hds} = [ map { $_->[1] } @$devlist ]; } elsif ($config_options->{filesys} =~ m/btrfs/) { - eval { get_btrfs_raid_setup(); }; + my ($devlist) = eval { get_btrfs_raid_setup() }; if (my $err = $@) { - display_message ("Warning: $err\n" . - "Please fix BTRFS setup first."); - } else { - $step_number++; - create_country_view(); + display_message("Warning: $err\nPlease fix BTRFS setup first."); + return; } + $config_options->{target_hds} = [ map { $_->[1] } @$devlist ]; } else { - $step_number++; - create_country_view(); + $config_options->{target_hds} = [ $target_hd ]; } + + $step_number++; + create_country_view(); }); } sub create_extract_view { - cleanup_view (); + cleanup_view(); display_info(); $next->set_sensitive(0); + $prev_btn->set_sensitive(0); + $prev_btn->hide(); - my $vbox = Gtk3::VBox->new (0, 0); + my $vbox = Gtk3::VBox->new(0, 0); $inbox->pack_start ($vbox, 1, 0, 0); - my $hbox = Gtk3::HBox->new (0, 0); + my $hbox = Gtk3::HBox->new(0, 0); $vbox->pack_start ($hbox, 0, 0, 10); - my $vbox2 = Gtk3::VBox->new (0, 0); + my $vbox2 = Gtk3::VBox->new(0, 0); $hbox->pack_start ($vbox2, 0, 0, 0); - $progress_status = Gtk3::Label->new (''); + $progress_status = Gtk3::Label->new(''); $vbox2->pack_start ($progress_status, 1, 1, 0); $progress = Gtk3::ProgressBar->new; $progress->set_show_text(1); $progress->set_size_request (600, -1); - $vbox2->pack_start ($progress, 0, 0, 0); + $vbox2->pack_start($progress, 0, 0, 0); $inbox->show_all(); @@ -3077,12 +3200,12 @@ sub create_extract_view { mkdir $tdir; my $base = "${proxmox_cddir}/$setup->{product}-base.squashfs"; - eval { extract_data ($base, $tdir); }; + eval { extract_data($base, $tdir); }; my $err = $@; $next->set_sensitive(1); - set_next ("_Reboot", sub { exit (0); } ); + set_next("_Reboot", sub { exit (0); } ); if ($err) { display_html("fail.htm"); @@ -3095,7 +3218,7 @@ sub create_extract_view { sub create_intro_view { - $prev->set_sensitive(0); + $prev_btn->set_sensitive(0); cleanup_view(); @@ -3112,15 +3235,15 @@ sub create_intro_view { display_html(); $step_number++; - set_next ("I a_gree", \&create_hdsel_view); + set_next("I a_gree", \&create_hdsel_view); } -$ipconf = get_ip_config (); +$ipconf = get_ip_config(); $country = detect_country() if $ipconf->{default} || $opt_testmode; # read country, kmap and timezone infos -$cmap = read_cmap (); +$cmap = read_cmap(); if (!defined($cmap->{country}->{$country})) { print $logfd "ignoring detected country '$country', invalid or unknown\n"; @@ -3135,7 +3258,7 @@ if (!defined ($hds) || (scalar (@$hds) <= 0)) { print "no hardisks found\n"; $initial_error = 1; display_html("nohds.htm"); - set_next ("Reboot", sub { exit (0); } ); + set_next("Reboot", sub { exit(0); } ); } else { foreach my $hd (@$hds) { my ($disk, $devname) = @$hd; @@ -3148,7 +3271,7 @@ if (!$initial_error && (scalar keys %{ $ipconf->{ifaces} } == 0)) { print "no network interfaces found\n"; $initial_error = 1; display_html("nonics.htm"); - set_next ("Reboot", sub { exit (0); } ); + set_next("Reboot", sub { exit(0); } ); } create_intro_view () if !$initial_error;