From a157170c10151cac4058ead1e36d1fd4e49a49a2 Mon Sep 17 00:00:00 2001 From: Trevor Batley Date: Tue, 2 Jul 2024 16:49:43 +1000 Subject: [PATCH] change sme10 to sme11 and centos7 to rocky8 --- EFI/BOOT/grub.cfg | 8 ++-- Packages/comps.xml | 72 ++++++++++++++++---------------- Packages/sme-kickstart.cfg | 13 +++--- README.md | 4 +- ReleaseNotes | 29 ++++++------- isolinux/grub.conf | 6 +-- isolinux/isolinux.cfg | 16 +++---- netinstall/EFI/BOOT/grub.cfg | 8 ++-- netinstall/isolinux/isolinux.cfg | 16 +++---- netinstall/ks.cfg | 8 ++-- updates/README.txt | 5 ++- 11 files changed, 93 insertions(+), 92 deletions(-) diff --git a/EFI/BOOT/grub.cfg b/EFI/BOOT/grub.cfg index d256e94..a0aa937 100644 --- a/EFI/BOOT/grub.cfg +++ b/EFI/BOOT/grub.cfg @@ -20,20 +20,20 @@ set timeout=60 search --no-floppy --set=root -l 'SME Server' ### BEGIN /etc/grub.d/10_linux ### -menuentry 'Install Koozali SME Server 10' --class fedora --class gnu-linux --class gnu --class os { +menuentry 'Install Koozali SME Server 11' --class fedora --class gnu-linux --class gnu --class os { linuxefi /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=SME\x20Server quiet inst.ks=hd:LABEL=SME\x20Server:/Packages/base/sme-kickstart.cfg initrdefi /images/pxeboot/initrd.img } -menuentry 'Install Koozali SME Server 10 in text mode' --class fedora --class gnu-linux --class gnu --class os { +menuentry 'Install Koozali SME Server 11 in text mode' --class fedora --class gnu-linux --class gnu --class os { linuxefi /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=SME\x20Server quiet inst.ks=hd:LABEL=SME\x20Server:/Packages/base/sme-kickstart.cfg text initrdefi /images/pxeboot/initrd.img } -menuentry 'Test this media & install Koozali SME Server 10' --class fedora --class gnu-linux --class gnu --class os { +menuentry 'Test this media & install Koozali SME Server 11' --class fedora --class gnu-linux --class gnu --class os { linuxefi /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=SME\x20Server rd.live.check quiet inst.ks=hd:LABEL=SME\x20Server:/Packages/base/sme-kickstart.cfg initrdefi /images/pxeboot/initrd.img } submenu 'Troubleshooting -->' { - menuentry 'Install Koozali SME Server 10 in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { + menuentry 'Install Koozali SME Server 11 in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { linuxefi /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=SME\x20Server xdriver=vesa nomodeset quiet inst.ks=hd:LABEL=SME\x20Server:/Packages/base/sme-kickstart.cfg initrdefi /images/pxeboot/initrd.img } diff --git a/Packages/comps.xml b/Packages/comps.xml index 4fb5cc7..54d8a64 100644 --- a/Packages/comps.xml +++ b/Packages/comps.xml @@ -163,42 +163,42 @@ false false - e-smith-apache - e-smith-backup - e-smith-base - e-smith-cvm-unix-local - e-smith-devtools - e-smith-dnscache - e-smith-domains - e-smith-email - e-smith-flexbackup - e-smith-formmagick - e-smith-grub - e-smith-hosts - e-smith-ibays - e-smith-ldap - e-smith-lib - e-smith-lib-compspec - e-smith-LPRng - e-smith-manager - e-smith-ntp - e-smith-nutUPS - e-smith-oidentd - e-smith-openssh - e-smith-packetfilter - e-smith-portforwarding - e-smith-pptpd - e-smith-proftpd - e-smith-proxy - e-smith-qmail - e-smith-qmailanalog - e-smith-quota - e-smith-viewlogfiles - e-smith-radiusd - e-smith-runit - e-smith-samba - e-smith-test - e-smith-tinydns + smeserver-apache + smeserver-backup + smeserver-base + smeserver-cvm-unix-local + smeserver-devtools + smeserver-dnscache + smeserver-domains + smeserver-email + smeserver-flexbackup + smeserver-formmagick + smeserver-grub + smeserver-hosts + smeserver-ibays + smeserver-ldap + smeserver-lib + smeserver-lib-compspec + smeserver-LPRng + smeserver-manager + smeserver-ntp + smeserver-nutUPS + smeserver-oidentd + smeserver-openssh + smeserver-packetfilter + smeserver-portforwarding + smeserver-pptpd + smeserver-proftpd + smeserver-proxy + smeserver-qmail + smeserver-qmailanalog + smeserver-quota + smeserver-viewlogfiles + smeserver-radiusd + smeserver-runit + smeserver-samba + smeserver-test + smeserver-tinydns smeserver-audittools smeserver-clamav smeserver-dovecot diff --git a/Packages/sme-kickstart.cfg b/Packages/sme-kickstart.cfg index 4c226e7..cd58126 100644 --- a/Packages/sme-kickstart.cfg +++ b/Packages/sme-kickstart.cfg @@ -15,7 +15,7 @@ user --name=installer --uid=9999 eula --agreed # Partitioning from pre section -%include /tmp/part-include +# %include /tmp/part-include # Disable kdump %addon com_redhat_kdump --disable @@ -24,12 +24,9 @@ eula --agreed # Add netinstall repos #this one gives curl 6 errors on netinstall while added manually works from time to time -#url --mirrorlist https://mirrorlist.koozali.org/mirrorlist/smeos-10-x86_64 -#repo --name=smeupdates --mirrorlist https://mirrorlist.koozali.org/mirrorlist/smeupdates-10-x86_64 -#repo --name=smeos --baseurl http://distro.ibiblio.org/pub/linux/distributions/smeserver/releases/10/smeos/x86_64/ -#repo --name=smeupdates --baseurl http://distro.ibiblio.org/pub/linux/distributions/smeserver/releases/10/smeupdates/x86_64/ -repo --name=smeos --mirrorlist https://mirrorlist.koozali.org/mirrorlist/smeos-10-x86_64 -repo --name=smeupdates --mirrorlist https://mirrorlist.koozali.org/mirrorlist/smeupdates-10-x86_64 +#url --mirrorlist https://mirrorlist.koozali.org/mirrorlist/smeos-11-x86_64 +repo --name=smeos --mirrorlist https://mirrorlist.koozali.org/mirrorlist/smeos-11-x86_64 +repo --name=smeupdates --mirrorlist https://mirrorlist.koozali.org/mirrorlist/smeupdates-11-x86_64 # Packages to install %packages @@ -251,7 +248,7 @@ EOF fi echo "Final part-include output:" -cat /tmp/part-include +# cat /tmp/part-include %end diff --git a/README.md b/README.md index 74daee8..526fd81 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ -# smeserver-pungi +# ![smeserver-pungi](https://www.koozali.org/images/koozali/Logo/Png/Koozali_logo_2016.png) -pungi/koji scripts and configuration files used to genreate smeserver repositories and various image types for install/update \ No newline at end of file +pungi/koji scripts and configuration files used to genreate smeserver repositories and various image types for install/update diff --git a/ReleaseNotes b/ReleaseNotes index 630508a..d2b1e77 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -3,10 +3,10 @@ Koozali SME Server 10.1 Release Notes 12 Sep 2022 The Koozali SME Server development team is pleased to announce the -release of SME Server 10.1 which will be an update release of SME Server. +release of SME Server 11.0 which will be an update release of SME Server. -This release is based on CentOS 7. CentOS 7.# has an EOL of -30 June 2024. +This release is based on Rocky 8. Rocky 8.# has an EOL of +31 May 2029. ********************************************************** Koozali SME Server users are encouraged to update production servers @@ -14,10 +14,10 @@ to this release. ********************************************************** Additional notes on Koozali SME Server 10 can be found at -https://wiki.contribs.org/SME_Server_10.0_Development +https://wiki.contribs.org/SME_Server_11.0_Development -SME10 Roadmap - -https://wiki.contribs.org/SME10_Roadmap#SME_10_Final +SME11 Roadmap - +https://wiki.contribs.org/SME10_Roadmap#SME_11_Final Bug reports and reports of potential bugs should be raised in the bug tracker (and only there, please); @@ -29,8 +29,8 @@ https://lists.contribs.org/pipermail/updatesannounce/ Download ======== -You can download SME Server 10.1 from -https://mirror.koozali.org/smeserver/releases/10.1/ +You can download SME Server 11.0 from +https://mirror.koozali.org/smeserver/releases/11.0/ or for other methods see: https://wiki.koozali.org/SME_Server:Download @@ -74,7 +74,7 @@ It is necessary to backup and then restore. In-place point updates within a major release are supported. -Restore of a sme9 console or workstation backup is now fully supported +Restore of a sme10 console or workstation backup is now fully supported there are cautions to be aware of and followed, see wiki and forum notes. From the many, small and large, fixes and updates the highlights are: @@ -104,7 +104,7 @@ A large number other minor under the hood changes and upstream updates and fixes. ===== -The time and effort that has gone into getting SME 10.1 to release has been +The time and effort that has gone into getting SME 11.0 to release has been extensive, an attempt to list and detail the work that has been done in recent months would not do justice to the effort made, thank you one and all for your time and help. @@ -113,7 +113,8 @@ In particular thank you for the consistent efforts of: Jean Phillipe Pialasse John Crisp Brian Read -Michel Begue +Terry Fage +Trevor Batley Zsolt Vasarhelyi The changes that have been implemented to ensure the Koozali Sme Server way @@ -121,7 +122,7 @@ is fully implemented have been considered and extensive. Major changes in this release ============================= -This release is based on CentOS 7.# +This release is based on Rocky 8.# Changes in this release ======================= @@ -129,14 +130,14 @@ see above and below General features ================ -Based on CentOS 7.9.2009 and all available updates +Based on Rocky 8.9 and all available updates Detailed changes in this release ======================= Only the changes since SME Server 10 final are listed, autogenerated from the changelogs. -Packages altered by Centos, Redhat, and Fedora-associated developers are +Packages altered by Rocky, Redhat, and Fedora-associated developers are not included. The changelogs are written per package diff --git a/isolinux/grub.conf b/isolinux/grub.conf index f9e82c4..7c52cdc 100644 --- a/isolinux/grub.conf +++ b/isolinux/grub.conf @@ -3,15 +3,15 @@ default=2 splashimage=@SPLASHPATH@ timeout 60 hiddenmenu -title Install Koozali SME Server 10 +title Install Koozali SME Server 11 findiso kernel @KERNELPATH@ @ROOT@ quiet initrd @INITRDPATH@ -title Install Koozali SME Server 10 in text mode +title Install Koozali SME Server 11 in text mode findiso kernel @KERNELPATH@ @ROOT@ quiet text initrd @INITRDPATH@ -title Test this media & install Koozali SME Server 10 +title Test this media & install Koozali SME Server 11 findiso kernel @KERNELPATH@ @ROOT@ rd.live.check quiet initrd @INITRDPATH@ diff --git a/isolinux/isolinux.cfg b/isolinux/isolinux.cfg index 6489c2c..f3812db 100644 --- a/isolinux/isolinux.cfg +++ b/isolinux/isolinux.cfg @@ -8,7 +8,7 @@ display boot.msg # the menu itself for as long as the screen remains in graphics mode. menu clear menu background splash.png -menu title Koozali SME Server 10.1 +menu title Koozali SME Server 11.0 menu vshift 8 menu rows 18 menu margin 8 @@ -59,27 +59,27 @@ menu separator # insert an empty line menu separator # insert an empty line label linux - menu label ^Install Koozali SME Server 10 + menu label ^Install Koozali SME Server 11 text help This GUI interface uses a kick-start to prepare your disk, - If you use the partitioning menu, it will use the CentOS + If you use the partitioning menu, it will use the Rocky default instead, and you will need to restart the installer. endtext kernel vmlinuz append initrd=initrd.img initcall_blacklist=clocksource_done_booting inst.stage2=hd:LABEL=SME\x20Server inst.ks=hd:LABEL=SME\x20Server:/Packages/base/sme-kickstart.cfg quiet label text - menu label ^Install Koozali SME Server 10 in text mode + menu label ^Install Koozali SME Server 11 in text mode text help This text interface uses a kick-start to prepare your disk, - If you use the partitioning menu, it will use the CentOS + If you use the partitioning menu, it will use the Rocky default instead, and you will need to restart the installer. endtext kernel vmlinuz append initrd=initrd.img initcall_blacklist=clocksource_done_booting inst.stage2=hd:LABEL=SME\x20Server inst.ks=hd:LABEL=SME\x20Server:/Packages/base/sme-kickstart.cfg text quiet label check - menu label Test this ^media & install Koozali SME Server 10 + menu label Test this ^media & install Koozali SME Server 11 menu default kernel vmlinuz append initrd=initrd.img initcall_blacklist=clocksource_done_booting inst.stage2=hd:LABEL=SME\x20Server inst.ks=hd:LABEL=SME\x20Server:/Packages/base/sme-kickstart.cfg rd.live.check quiet @@ -92,10 +92,10 @@ menu begin ^Troubleshooting label vesa menu indent count 5 - menu label Install Koozali SME Server 10 in ^basic graphics mode + menu label Install Koozali SME Server 11 in ^basic graphics mode text help Try this option out if you're having trouble installing - Koozali SME Server 10. + Koozali SME Server 11. endtext kernel vmlinuz append initrd=initrd.img initcall_blacklist=clocksource_done_booting inst.stage2=hd:LABEL=SME\x20Server inst.ks=hd:LABEL=SME\x20Server:/Packages/base/sme-kickstart.cfg xdriver=vesa nomodeset quiet diff --git a/netinstall/EFI/BOOT/grub.cfg b/netinstall/EFI/BOOT/grub.cfg index 7d32557..9ad54a4 100644 --- a/netinstall/EFI/BOOT/grub.cfg +++ b/netinstall/EFI/BOOT/grub.cfg @@ -20,20 +20,20 @@ set timeout=60 search --no-floppy --set=root -l 'SME Server' ### BEGIN /etc/grub.d/10_linux ### -menuentry 'Install Koozali SME Server 10' --class fedora --class gnu-linux --class gnu --class os { +menuentry 'Install Koozali SME Server 11' --class fedora --class gnu-linux --class gnu --class os { linuxefi /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=SME\x20Server quiet inst.ks=hd:LABEL=SME\x20Server:/ks.cfg initrdefi /images/pxeboot/initrd.img } -menuentry 'Install Koozali SME Server 10 in text mode' --class fedora --class gnu-linux --class gnu --class os { +menuentry 'Install Koozali SME Server 11 in text mode' --class fedora --class gnu-linux --class gnu --class os { linuxefi /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=SME\x20Server quiet inst.ks=hd:LABEL=SME\x20Server:/ks.cfg text initrdefi /images/pxeboot/initrd.img } -menuentry 'Test this media & install Koozali SME Server 10' --class fedora --class gnu-linux --class gnu --class os { +menuentry 'Test this media & install Koozali SME Server 11' --class fedora --class gnu-linux --class gnu --class os { linuxefi /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=SME\x20Server rd.live.check quiet inst.ks=hd:LABEL=SME\x20Server:/ks.cfg initrdefi /images/pxeboot/initrd.img } submenu 'Troubleshooting -->' { - menuentry 'Install Koozali SME Server 10 in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { + menuentry 'Install Koozali SME Server 11 in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { linuxefi /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=SME\x20Server xdriver=vesa nomodeset quiet inst.ks=hd:LABEL=SME\x20Server:/ks.cfg initrdefi /images/pxeboot/initrd.img } diff --git a/netinstall/isolinux/isolinux.cfg b/netinstall/isolinux/isolinux.cfg index df4a7f1..d57beb7 100644 --- a/netinstall/isolinux/isolinux.cfg +++ b/netinstall/isolinux/isolinux.cfg @@ -8,7 +8,7 @@ display boot.msg # the menu itself for as long as the screen remains in graphics mode. menu clear menu background splash.png -menu title Koozali SME Server 10.1 +menu title Koozali SME Server 11.0 menu vshift 8 menu rows 18 menu margin 8 @@ -59,29 +59,29 @@ menu separator # insert an empty line menu separator # insert an empty line label linux - menu label ^Install Koozali SME Server 10 + menu label ^Install Koozali SME Server 11 text help Default GUI install uses kick-start to prepare your disk, then will let you setup the repo that you want to install from. - If you use the GUI partitioning menu, it will use the CentOS default + If you use the GUI partitioning menu, it will use the Rocky default instead of our settings, and you will need to restart the installer. endtext kernel vmlinuz append initrd=initrd.img inst.stage2=hd:LABEL=SME\x20Server quiet inst.ks=hd:LABEL=SME\x20Server:/ks.cfg label text - menu label ^Install Koozali SME Server 10 in text mode + menu label ^Install Koozali SME Server 11 in text mode text help This text interface uses a kick-start to prepare your disk, then let you setup the repo that you want. If you use the - partitioning menu, it will use the CentOS default instead + partitioning menu, it will use the Rocky default instead of our settings, and you will need to restart the installer. endtext kernel vmlinuz append initrd=initrd.img inst.stage2=hd:LABEL=SME\x20Server quiet inst.ks=hd:LABEL=SME\x20Server:/ks.cfg text label check - menu label Test this ^media & install Koozali SME Server 10 + menu label Test this ^media & install Koozali SME Server 11 menu default kernel vmlinuz append initrd=initrd.img inst.stage2=hd:LABEL=SME\x20Server rd.live.check quiet inst.ks=hd:LABEL=SME\x20Server:/ks.cfg @@ -94,10 +94,10 @@ menu begin ^Troubleshooting label vesa menu indent count 5 - menu label Install Koozali SME Server 10 in ^basic graphics mode + menu label Install Koozali SME Server 11 in ^basic graphics mode text help Try this option out if you're having trouble installing - Koozali SME Server 10. + Koozali SME Server 11. endtext kernel vmlinuz append initrd=initrd.img inst.stage2=hd:LABEL=SME\x20Server xdriver=vesa nomodeset quiet inst.ks=hd:LABEL=SME\x20Server:/ks.cfg diff --git a/netinstall/ks.cfg b/netinstall/ks.cfg index 49cd8af..3e76627 100644 --- a/netinstall/ks.cfg +++ b/netinstall/ks.cfg @@ -15,7 +15,7 @@ user --name=installer --uid=9999 eula --agreed # Partitioning from pre section -%include /tmp/part-include +# %include /tmp/part-include # Disable kdump %addon com_redhat_kdump --disable @@ -23,9 +23,9 @@ eula --agreed # Add netinstall repos -url --mirrorlist https://mirrorlist.koozali.org/mirrorlist/smeos-10-x86_64 -repo --name=smeupdates --mirrorlist https://mirrorlist.koozali.org/mirrorlist/smeupdates-10-x86_64 -repo --name=remi-safe --baseurl http://rpms.famillecollet.com/enterprise/7/safe/x86_6/ +url --mirrorlist https://mirrorlist.koozali.org/mirrorlist/smeos-11-x86_64 +repo --name=smeupdates --mirrorlist https://mirrorlist.koozali.org/mirrorlist/smeupdates-11-x86_64 +repo --name=remi-safe --baseurl http://rpms.famillecollet.com/enterprise/8/safe/x86_6/ #url --url http://distro.ibiblio.org/pub/linux/distributions/smeserver/releases/10/smeos/x86_64/ #repo --name=smeupdates --baseurl http://distro.ibiblio.org/pub/linux/distributions/smeserver/releases/10/smeupdates/x86_64/ diff --git a/updates/README.txt b/updates/README.txt index 8f59b61..b813f43 100644 --- a/updates/README.txt +++ b/updates/README.txt @@ -1,6 +1,9 @@ SME Server Developers --------------------- -#SME 10 +#SME 11 +?? + +#SME10 we put only translations there for package/install modification we use product img