X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=proxinstall;h=a1c3dc6967fbdb98f0fa2e5be435163e4300267d;hb=f2bd075317c5233af3a90f6e8c8f94091f107141;hp=2f7de72ec1d1ea09b905e55a31ba8cc61bfb4e99;hpb=bdeca87222f7c73e5819b22b2d90f03674ab5e77;p=pve-installer.git diff --git a/proxinstall b/proxinstall index 2f7de72..a1c3dc6 100755 --- a/proxinstall +++ b/proxinstall @@ -24,13 +24,6 @@ use ProxmoxInstallerSetup; my $setup = ProxmoxInstallerSetup::setup(); -my $release = $setup->{release}; - -my $kapi = `uname -r`; -chomp $kapi; - -my $enable_btrfs = $setup->{enable_btrfs}; - my $opt_testmode; if (!$ENV{G_SLICE} || $ENV{G_SLICE} ne "always-malloc") { @@ -44,6 +37,7 @@ if (!GetOptions ('testmode=s' => \$opt_testmode)) { my $zfstestpool = "test_rpool"; my $zfspoolname = $opt_testmode ? $zfstestpool : 'rpool'; +my $zfsrootvolname = "$setup->{product}-1"; my $storage_cfg_zfs = <<__EOD__; dir: local @@ -785,8 +779,8 @@ sub zfs_create_rpool { syscmd ("zfs create $zfspoolname/data") == 0 || die "unable to create zfs $zfspoolname/data volume\n"; - syscmd ("zfs create $zfspoolname/ROOT/pve-1") == 0 || - die "unable to create zfs $zfspoolname/ROOT/pve-1 volume\n"; + 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 || @@ -966,16 +960,18 @@ sub partition_bootable_zfs_disk { 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'; + my $vgname = $setup->{product}; + + my $rootdev = "/dev/$vgname/root"; + my $datadev = "/dev/$vgname/data"; + my $swapfile = "/dev/$vgname/swap"; # we use --metadatasize 250k, which results in "pe_start = 512" # so pe_start is aligned on a 128k boundary (advantage for SSDs) syscmd ("/sbin/pvcreate --metadatasize 250k -y -ff $lvmdev") == 0 || die "unable to initialize physical volume $lvmdev\n"; - syscmd ("/sbin/vgcreate pve $lvmdev") == 0 || - die "unable to create volume group 'pve'\n"; + syscmd ("/sbin/vgcreate $vgname $lvmdev") == 0 || + die "unable to create volume group '$vgname'\n"; my $hdgb = int($os_size/(1024*1024)); my $space = (($hdgb > 128) ? 16 : ($hdgb/8))*1024*1024; @@ -1006,19 +1002,19 @@ sub create_lvm_volumes { $config_options->{maxvz}*1024*1024 : $rest; } - syscmd ("/sbin/lvcreate -L${swap_size}K -nswap pve") == 0 || + syscmd ("/sbin/lvcreate -L${swap_size}K -nswap $vgname") == 0 || die "unable to create swap volume\n"; - syscmd ("/sbin/lvcreate -L${rootsize}K -nroot pve") == 0 || + syscmd ("/sbin/lvcreate -L${rootsize}K -nroot $vgname") == 0 || die "unable to create root volume\n"; - syscmd ("/sbin/lvcreate -L${rest}K -ndata pve") == 0 || + syscmd ("/sbin/lvcreate -L${rest}K -ndata $vgname") == 0 || die "unable to create data volume\n"; - syscmd ("/sbin/lvconvert --yes --type thin-pool pve/data") == 0 || + syscmd ("/sbin/lvconvert --yes --type thin-pool $vgname/data") == 0 || die "unable to create data thin-pool\n"; - syscmd ("/sbin/vgchange -a y pve") == 0 || + syscmd ("/sbin/vgchange -a y $vgname") == 0 || die "unable to activate volume group\n"; return ($rootdev, $datadev, $swapfile); @@ -1065,7 +1061,7 @@ sub extract_data { if ($filesys =~ m/zfs/) { $target_hd = undef; # do not use this config $use_zfs = 1; - $targetdir = "/$zfspoolname/ROOT/pve-1"; + $targetdir = "/$zfspoolname/ROOT/$zfsrootvolname"; } elsif ($filesys =~ m/btrfs/) { $target_hd = undef; # do not use this config $use_btrfs = 1; @@ -1251,12 +1247,15 @@ sub extract_data { mkdir "$targetdir/var"; mkdir "$targetdir/var/lib"; - mkdir "$targetdir/var/lib/vz"; - mkdir "$targetdir/var/lib/pve"; - if ($use_btrfs) { - syscmd("btrfs subvolume create $targetdir/var/lib/pve/local-btrfs") == 0 || - die "unable to create btrfs subvolume\n"; + if ($setup->{product} eq 'pve') { + mkdir "$targetdir/var/lib/vz"; + mkdir "$targetdir/var/lib/pve"; + + if ($use_btrfs) { + syscmd("btrfs subvolume create $targetdir/var/lib/pve/local-btrfs") == 0 || + die "unable to create btrfs subvolume\n"; + } } display_html ("extract2-rulesystem.htm"); @@ -1318,22 +1317,30 @@ sub extract_data { my $ntype = $ipversion == 4 ? 'inet' : 'inet6'; - my $bridge_port = $ipconf->{ifaces}->{$ipconf->{selected}}->{name}; + my $ethdev = $ipconf->{ifaces}->{$ipconf->{selected}}->{name}; - $ifaces .= "iface $bridge_port $ntype manual\n"; + if ($setup->{bridged_network}) { + $ifaces .= "iface $ethdev $ntype manual\n"; - $ifaces .= - "\nauto vmbr0\niface vmbr0 $ntype static\n" . - "\taddress $ipaddress\n" . - "\tnetmask $netmask\n" . - "\tgateway $gateway\n" . - "\tbridge_ports $bridge_port\n" . - "\tbridge_stp off\n" . - "\tbridge_fd 0\n"; + $ifaces .= + "\nauto vmbr0\niface vmbr0 $ntype static\n" . + "\taddress $ipaddress\n" . + "\tnetmask $netmask\n" . + "\tgateway $gateway\n" . + "\tbridge_ports $ethdev\n" . + "\tbridge_stp off\n" . + "\tbridge_fd 0\n"; + } else { + $ifaces .= "auto $ethdev\n" . + "iface $ethdev $ntype static\n" . + "\taddress $ipaddress\n" . + "\tnetmask $netmask\n" . + "\tgateway $gateway\n"; + } foreach my $iface (sort keys %{$ipconf->{ifaces}}) { my $name = $ipconf->{ifaces}->{$iface}->{name}; - next if $name eq $bridge_port; + next if $name eq $ethdev; $ifaces .= "\niface $name $ntype manual\n"; } @@ -1423,7 +1430,7 @@ locales locales/default_environment_locale select en_US.UTF-8 locales locales/locales_to_be_generated select en_US.UTF-8 UTF-8 samba-common samba-common/dhcp boolean false samba-common samba-common/workgroup string WORKGROUP -postfix postfix/main_mailer_type select Local only +postfix postfix/main_mailer_type select No configuration keyboard-configuration keyboard-configuration/xkb-keymap select $xkmap d-i debian-installer/locale select en_US.UTF-8 grub-pc grub-pc/install_devices select $grub_install_devices_txt @@ -1468,10 +1475,6 @@ _EOD } }); - debconfig_set ($targetdir, <<_EOD); -postfix postfix/main_mailer_type select No configuration -_EOD - unlink "$targetdir/etc/mailname"; $postfix_main_cf =~ s/__FQDN__/${hostname}.${domain}/; write_config ($postfix_main_cf, "$targetdir/etc/postfix/main.cf"); @@ -1503,17 +1506,28 @@ _EOD # allow ssh root login syscmd ("sed -i 's/^PermitRootLogin.*/PermitRootLogin yes/' '$targetdir/etc/ssh/sshd_config'"); - - # save installer settings - my $ucc = uc ($country); - debconfig_set ($targetdir, <<_EOD); -pve-manager pve-manager/country string $ucc -_EOD + + if ($setup->{product} eq 'pmg') { + # install initial clamav DB + my $srcdir = "${proxmox_cddir}/proxmox/clamav"; + foreach my $fn ("main.cvd", "bytecode.cvd", "daily.cvd", "safebrowsing.cvd") { + syscmd ("cp \"$srcdir/$fn\" \"$targetdir/var/lib/clamav\"") == 0 || + die "installation of clamav db file '$fn' failed\n"; + } + syscmd("chroot $targetdir /bin/chown clamav:clamav -R /var/lib/clamav") == 0 || + die "unable to set owner for clamav database files\n"; + } + + if ($setup->{product} eq 'pve') { + # save installer settings + my $ucc = uc ($country); + debconfig_set($targetdir, "pve-manager pve-manager/country string $ucc\n"); + } update_progress (0.8, 0.95, 1, "make system bootable"); if ($use_zfs) { - syscmd ("sed -i -e 's/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"root=ZFS=$zfspoolname\\/ROOT\\/pve-1 boot=zfs\"/' $targetdir/etc/default/grub") == 0 || + syscmd ("sed -i -e 's/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"root=ZFS=$zfspoolname\\/ROOT\\/$zfsrootvolname boot=zfs\"/' $targetdir/etc/default/grub") == 0 || die "unable to update /etc/default/grub\n"; } @@ -1521,6 +1535,15 @@ _EOD diversion_remove ($targetdir, "/usr/sbin/update-grub"); diversion_remove ($targetdir, "/usr/sbin/update-initramfs"); + my $kapi; + foreach my $fn (<$targetdir/lib/modules/*>) { + if ($fn =~ m!/(\d+\.\d+\.\d+-\d+-pve)$!) { + die "found multiple kernels\n" if defined($kapi); + $kapi = $1; + } + } + die "unable to detect kernel version\n" if !defined($kapi); + if (!$opt_testmode) { unlink ("$targetdir/etc/mtab"); @@ -1576,33 +1599,42 @@ _EOD run_command ("chroot $targetdir /usr/sbin/chpasswd", undef, "root:$octets\n"); - # create pmxcfs DB + if ($setup->{product} eq 'pmg') { + mkdir "/etc/pmg"; + # save admin email + write_config ("#Unix Superuser\nroot:1:0::root:${mailto}:::\n", + "/etc/pmg/user.conf"); - my $tmpdir = "$targetdir/tmp/pve"; - mkdir $tmpdir; + } elsif ($setup->{product} eq 'pve') { - # write vnc keymap to datacenter.cfg - my $vnckmap = $cmap->{kmap}->{$keymap}->{kvm} || 'en-us'; - write_config ("keyboard: $vnckmap\n", - "$tmpdir/datacenter.cfg"); + # create pmxcfs DB - # save admin email - write_config ("user:root\@pam:1:0:::${mailto}::\n", - "$tmpdir/user.cfg"); + my $tmpdir = "$targetdir/tmp/pve"; + mkdir $tmpdir; - # write storage.cfg - my $strorage_cfg_fn = "$tmpdir/storage.cfg"; - if ($use_zfs) { - write_config ($storage_cfg_zfs, $strorage_cfg_fn); - } elsif ($use_btrfs) { - write_config ($storage_cfg_btrfs, $strorage_cfg_fn); - } else { - write_config ($storage_cfg_lvmthin, $strorage_cfg_fn); - } + # write vnc keymap to datacenter.cfg + my $vnckmap = $cmap->{kmap}->{$keymap}->{kvm} || 'en-us'; + write_config ("keyboard: $vnckmap\n", + "$tmpdir/datacenter.cfg"); + + # save admin email + write_config ("user:root\@pam:1:0:::${mailto}::\n", + "$tmpdir/user.cfg"); - run_command("chroot $targetdir /usr/bin/create_pmxcfs_db /tmp/pve /var/lib/pve-cluster/config.db"); + # write storage.cfg + my $strorage_cfg_fn = "$tmpdir/storage.cfg"; + if ($use_zfs) { + write_config ($storage_cfg_zfs, $strorage_cfg_fn); + } elsif ($use_btrfs) { + write_config ($storage_cfg_btrfs, $strorage_cfg_fn); + } else { + write_config ($storage_cfg_lvmthin, $strorage_cfg_fn); + } - syscmd ("rm -rf $tmpdir"); + run_command("chroot $targetdir /usr/bin/create_pmxcfs_db /tmp/pve /var/lib/pve-cluster/config.db"); + + syscmd ("rm -rf $tmpdir"); + } }; my $err = $@; @@ -1615,10 +1647,9 @@ _EOD my $elapsed = Time::HiRes::tv_interval($starttime); print "Elapsed extract time: $elapsed\n"; - syscmd ("chroot $targetdir /usr/bin/dpkg-query -W --showformat='\${package}\n'> pve-final.pkglist"); + syscmd ("chroot $targetdir /usr/bin/dpkg-query -W --showformat='\${package}\n'> final.pkglist"); } - syscmd ("umount $targetdir/var/lib/vz"); syscmd ("umount $targetdir/tmp"); syscmd ("umount $targetdir/proc"); syscmd ("umount $targetdir/sys"); @@ -1634,10 +1665,10 @@ _EOD syscmd ("zfs set sync=standard $zfspoolname") == 0 || die "unable to set zfs properties\n"; - syscmd ("zfs set mountpoint=/ $zfspoolname/ROOT/pve-1") == 0 || + syscmd ("zfs set mountpoint=/ $zfspoolname/ROOT/$zfsrootvolname") == 0 || die "zfs set mountpoint failed\n"; - syscmd ("zpool set bootfs=$zfspoolname/ROOT/pve-1 $zfspoolname") == 0 || + syscmd ("zpool set bootfs=$zfspoolname/ROOT/$zfsrootvolname $zfspoolname") == 0 || die "zfs set bootfs failed\n"; syscmd ("zpool export $zfspoolname"); } @@ -1944,7 +1975,8 @@ sub create_ipconf_view { $vbox2->pack_start ($devicebox, 0, 0, 2); - my $hn = $ipconf->{domain} ? "pve.$ipconf->{domain}" : 'pve.example.invalid'; + my $hn = $ipconf->{domain} ? + "$setup->{product}.$ipconf->{domain}" : "$setup->{product}.example.invalid"; my ($hostbox, $hostentry) = create_text_input ($hn, 'Hostname (FQDN):'); @@ -2566,7 +2598,7 @@ sub create_hdoption_view { 'zfs (RAIDZ-2)', 'zfs (RAIDZ-3)']; push @$fstype, 'btrfs (RAID0)', 'btrfs (RAID1)', 'btrfs (RAID10)' - if $enable_btrfs; + if $setup->{enable_btrfs}; my $tcount = 0; foreach my $tmp (@$fstype) {