From a9016a33abd292671be9326ad9a3a6acb6168215 Mon Sep 17 00:00:00 2001 From: Sergey Konev Date: Tue, 19 Nov 2024 02:58:18 +0300 Subject: [PATCH] Redisigned installer-distro-alt-server-v for PVE: -Uses net-ifupdown2 module instead of net-eth -No need for postinstall vmbr creation (net-ifupdown2 does that) --- .gear/rules | 2 +- installer-distro-alt-server-v.spec | 144 ------------------ installer-distro-virtualization-pve.spec | 79 ++++++++++ .../alterator-menu/module-expert-list | 0 .../alterator-menu/module-order-list | 2 +- .../alterator-menu/section-order-list | 0 .../installer-steps | 2 +- .../01-remove-installer-server-pkgs.sh | 0 .../postinstall.d/10-kvm.sh | 0 .../postinstall.d/20-alterator-menu.sh | 0 .../postinstall.d/30-server-role.sh | 0 .../preinstall.d/80-setup-user-groups | 0 12 files changed, 82 insertions(+), 147 deletions(-) delete mode 100644 installer-distro-alt-server-v.spec create mode 100644 installer-distro-virtualization-pve.spec rename {installer-distro-alt-server-v => installer-distro-virtualization-pve}/alterator-menu/module-expert-list (100%) rename {installer-distro-alt-server-v => installer-distro-virtualization-pve}/alterator-menu/module-order-list (91%) rename {installer-distro-alt-server-v => installer-distro-virtualization-pve}/alterator-menu/section-order-list (100%) rename {installer-distro-alt-server-v => installer-distro-virtualization-pve}/installer-steps (85%) rename {installer-distro-alt-server-v => installer-distro-virtualization-pve}/postinstall.d/01-remove-installer-server-pkgs.sh (100%) rename {installer-distro-alt-server-v => installer-distro-virtualization-pve}/postinstall.d/10-kvm.sh (100%) rename {installer-distro-alt-server-v => installer-distro-virtualization-pve}/postinstall.d/20-alterator-menu.sh (100%) rename {installer-distro-alt-server-v => installer-distro-virtualization-pve}/postinstall.d/30-server-role.sh (100%) rename {installer-distro-alt-server-v => installer-distro-virtualization-pve}/preinstall.d/80-setup-user-groups (100%) diff --git a/.gear/rules b/.gear/rules index 71f5a43..5c9414d 100644 --- a/.gear/rules +++ b/.gear/rules @@ -1 +1 @@ -tar: installer-distro-alt-server-v +tar: installer-distro-virtualization-pve diff --git a/installer-distro-alt-server-v.spec b/installer-distro-alt-server-v.spec deleted file mode 100644 index e9b4626..0000000 --- a/installer-distro-alt-server-v.spec +++ /dev/null @@ -1,144 +0,0 @@ -%define distro alt-server-v - -Name: installer-distro-%distro -Version: 10.1.0 -Release: alt2 - -Summary: Installer configuration (Server V) -License: GPLv2 -Group: System/Configuration/Other - -Url: http://www.altlinux.org/Installer -Source: %name-%version.tar -BuildArch: noarch - -%description -This package contains installer configuration hopefully suitable -for an ALT Linux based server distribution. - -It is derived from installer-distro-altlinux-generic. - -%package stage2 -Summary: Installer configuration and scripts (stage2 part) -License: GPLv2 -Group: System/Configuration/Other -Provides: installer-%distro-stage2 = %version -Requires: installer-stage2 -# modules -Requires: alterator-sysconfig -Requires: alterator-datetime -Requires: alterator-pkg -Requires: alterator-vm -Requires: alterator-notes - -%description stage2 -This package contains installer configuration hopefully suitable -for an ALT Linux based server distribution. - -The stage2 part is included into live installer system. - -%package stage3 -Summary: Installer configuration and scripts (stage3 part) -License: GPLv2 -Group: System/Configuration/Other -Provides: installer-%distro-stage3 = %version -# modules -Requires: alterator-users -Requires: alterator-root -Requires: alterator-luks -Requires: alterator-net-eth dhcpcd -Requires: alterator-net-bond alterator-net-bridge -Requires: alterator-net-general -Requires: installer-stage3 -Requires: installer-feature-create-vmbr-stage3 -Requires: installer-feature-online-repo -Requires: installer-feature-nfs-server-stage3 -Requires: installer-feature-powerbutton-stage3 - -%description stage3 -This package contains installer configuration hopefully suitable -for an ALT Linux based server distribution. - -The stage3 part is installed onto the new system's root -and executed off there during installation process. - -%prep -%setup - -%install -%define install2dir %_datadir/install2 -mkdir -p %buildroot%install2dir -cp -a * %buildroot%install2dir/ - -%files stage2 -%install2dir/*.d/* -%install2dir/alterator-menu -%install2dir/installer-steps - -%files stage3 - -%changelog -* Fri Jun 16 2023 Andrew A. Vasilyev 10.1.0-alt2 -- drop installer-feature-sudo-enable-by-default-stage3 - -* Wed Apr 12 2023 Andrew A. Vasilyev 10.1.0-alt1 -- move initinstall.d/05-vm-profile to separate package volumes-profile-alt-server-v - -* Tue Dec 28 2021 Alexey Shabalin 10.0.0-alt2 -- decrease minimal root size to 7GB - -* Mon Dec 27 2021 Alexey Shabalin 10.0.0-alt1 -- define swap not more then 2GB -- define minimal root part as 15GB -- define minimal var part as 1GB - -* Tue Jun 01 2021 Andrew A. Vasilyev 9.2.0-alt1 -- simplify FS profiles - -* Mon Jul 06 2020 Alexey Shabalin 9.0.1-alt1 -- update title for /var/lib/vz (ALT #38193) -- drop Generic server (large /srv) profile in vm -- switch from alterator-grub to installer-feature-bootloader in m-p - -* Thu Feb 13 2020 Andrew A. Vasilyev 9.0.0-alt3 -- add vmbr creation for PVE - -* Thu Sep 26 2019 Alexey Shabalin 9.0.0-alt2 -- add support vd* disks in vm profile -- rename /var/lib/libvirt/images -> /var/lib/libvirt - -* Wed Sep 25 2019 Alexey Shabalin 9.0.0-alt1 -- add OpenVZ server (large /var/lib/vz) -- add Podman server (large /var/lib/containers) -- update alterator-menu lists - -* Wed Aug 21 2019 Alexey Shabalin 7.0.6-alt1 -- vm -> vm-ortodox -- add preinstall and postinstall scripts -- update Requires and Provides - -* Wed Aug 21 2019 Alexey Shabalin 7.0.5-alt1 -- update title in vm-profile - -* Thu Jul 11 2019 Alexey Shabalin 7.0.4-alt1 -- /var/lib/libvirt -> /var/lib/libvirt/images -- add LXD HN server (large /var/lib/lxd) - -* Fri Jun 14 2019 Alexey Shabalin 7.0.3-alt1 -- package as name alt-server-v for Server Virtualization -- update vm profile for server-v - -* Fri Mar 11 2016 Michael Shigorin 7.0.2-alt1 -- tweaked disk partitioning profiles towards capping the size - of partitions differing from the "main" one (otherwise it's - prone to e.g. three largish partitions of which two will be - likely mostly empty forever) -- changed profile order so that "generic server" comes first - -* Mon Oct 28 2013 Michael Shigorin 7.0.1-alt1 -- added a few more disk partitioning profiles (closes: #29483) -- fixed silly typo in steps file (non-root user *is* added now) - -* Mon Jul 15 2013 Michael Shigorin 7.0.0-alt1 -- initial release based on installer-distro-altlinux-generic 7.0.1-alt1 -- get things back somewhat closer to a useful (not test) distribution diff --git a/installer-distro-virtualization-pve.spec b/installer-distro-virtualization-pve.spec new file mode 100644 index 0000000..9a575f6 --- /dev/null +++ b/installer-distro-virtualization-pve.spec @@ -0,0 +1,79 @@ +%define distro virtualization-pve + +Name: installer-distro-%distro +Version: 1.0.1 +Release: alt1 + +Summary: Installer configuration (PVE) +License: GPLv2 +Group: System/Configuration/Other + +Url: http://www.altlinux.org/Installer +Source: %name-%version.tar +BuildArch: noarch + +%description +This package contains installer configuration +for an ALT Linux PVE distribution. + +It is derived from installer-distro-alt-server-v. + +%package stage2 +Summary: Installer configuration and scripts (stage2 part) +License: GPLv2 +Group: System/Configuration/Other +Provides: installer-%distro-stage2 = %version +Requires: installer-stage2 +# modules +Requires: alterator-sysconfig +Requires: alterator-datetime +Requires: alterator-pkg +Requires: alterator-vm +Requires: alterator-notes + +%description stage2 +This package contains installer configuration +for an ALT Linux PVE distribution. + +The stage2 part is included into live installer system. + +%package stage3 +Summary: Installer configuration and scripts (stage3 part) +License: GPLv2 +Group: System/Configuration/Other +Provides: installer-%distro-stage3 = %version +# modules +Requires: alterator-users +Requires: alterator-root +Requires: alterator-luks +Requires: alterator-net-ifupdown2 +Requires: installer-stage3 +Requires: installer-feature-online-repo +Requires: installer-feature-nfs-server-stage3 +Requires: installer-feature-powerbutton-stage3 + +%description stage3 +This package contains installer configuration +for an ALT Linux PVE distribution. + +The stage3 part is installed onto the new system's root +and executed off there during installation process. + +%prep +%setup + +%install +%define install2dir %_datadir/install2 +mkdir -p %buildroot%install2dir +cp -a * %buildroot%install2dir/ + +%files stage2 +%install2dir/*.d/* +%install2dir/alterator-menu +%install2dir/installer-steps + +%files stage3 + +%changelog +* Tue Nov 19 2024 Sergey Konev 1.0.1-alt1 +- Init package (based on installer-distro-alt-server-v) diff --git a/installer-distro-alt-server-v/alterator-menu/module-expert-list b/installer-distro-virtualization-pve/alterator-menu/module-expert-list similarity index 100% rename from installer-distro-alt-server-v/alterator-menu/module-expert-list rename to installer-distro-virtualization-pve/alterator-menu/module-expert-list diff --git a/installer-distro-alt-server-v/alterator-menu/module-order-list b/installer-distro-virtualization-pve/alterator-menu/module-order-list similarity index 91% rename from installer-distro-alt-server-v/alterator-menu/module-order-list rename to installer-distro-virtualization-pve/alterator-menu/module-order-list index b4a8b3c..33c77b6 100644 --- a/installer-distro-alt-server-v/alterator-menu/module-order-list +++ b/installer-distro-virtualization-pve/alterator-menu/module-order-list @@ -17,6 +17,6 @@ netinst root -net-eth +net-ifupdown2 net-iptables net-dnat diff --git a/installer-distro-alt-server-v/alterator-menu/section-order-list b/installer-distro-virtualization-pve/alterator-menu/section-order-list similarity index 100% rename from installer-distro-alt-server-v/alterator-menu/section-order-list rename to installer-distro-virtualization-pve/alterator-menu/section-order-list diff --git a/installer-distro-alt-server-v/installer-steps b/installer-distro-virtualization-pve/installer-steps similarity index 85% rename from installer-distro-alt-server-v/installer-steps rename to installer-distro-virtualization-pve/installer-steps index 48866bc..8765947 100644 --- a/installer-distro-alt-server-v/installer-steps +++ b/installer-distro-virtualization-pve/installer-steps @@ -5,7 +5,7 @@ vm-ortodox pkg installer-preinstall grub -installer-network +net-ifupdown2 users-root users-add luks diff --git a/installer-distro-alt-server-v/postinstall.d/01-remove-installer-server-pkgs.sh b/installer-distro-virtualization-pve/postinstall.d/01-remove-installer-server-pkgs.sh similarity index 100% rename from installer-distro-alt-server-v/postinstall.d/01-remove-installer-server-pkgs.sh rename to installer-distro-virtualization-pve/postinstall.d/01-remove-installer-server-pkgs.sh diff --git a/installer-distro-alt-server-v/postinstall.d/10-kvm.sh b/installer-distro-virtualization-pve/postinstall.d/10-kvm.sh similarity index 100% rename from installer-distro-alt-server-v/postinstall.d/10-kvm.sh rename to installer-distro-virtualization-pve/postinstall.d/10-kvm.sh diff --git a/installer-distro-alt-server-v/postinstall.d/20-alterator-menu.sh b/installer-distro-virtualization-pve/postinstall.d/20-alterator-menu.sh similarity index 100% rename from installer-distro-alt-server-v/postinstall.d/20-alterator-menu.sh rename to installer-distro-virtualization-pve/postinstall.d/20-alterator-menu.sh diff --git a/installer-distro-alt-server-v/postinstall.d/30-server-role.sh b/installer-distro-virtualization-pve/postinstall.d/30-server-role.sh similarity index 100% rename from installer-distro-alt-server-v/postinstall.d/30-server-role.sh rename to installer-distro-virtualization-pve/postinstall.d/30-server-role.sh diff --git a/installer-distro-alt-server-v/preinstall.d/80-setup-user-groups b/installer-distro-virtualization-pve/preinstall.d/80-setup-user-groups similarity index 100% rename from installer-distro-alt-server-v/preinstall.d/80-setup-user-groups rename to installer-distro-virtualization-pve/preinstall.d/80-setup-user-groups