From 10184126738a8d419ef5bf403d23f641cc4f48ac Mon Sep 17 00:00:00 2001 From: Trevor Cooper Date: Tue, 12 Jul 2022 08:02:13 -0700 Subject: [PATCH 01/15] add %post installation of VBoxGuestAdditions --- Rocky-8-Vagrant-Vbox.ks | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/Rocky-8-Vagrant-Vbox.ks b/Rocky-8-Vagrant-Vbox.ks index 94ad14f..6e67717 100644 --- a/Rocky-8-Vagrant-Vbox.ks +++ b/Rocky-8-Vagrant-Vbox.ks @@ -110,6 +110,26 @@ account required pam_succeed_if.so user notin root:vagrant :quit EOF +# Install VBoxGuestAdditions for installed kernel +kver=$(rpm -q --queryformat="%{VERSION}-%{RELEASE}.%{ARCH}" kernel) +dnf -y install kernel-devel gcc make perl elfutils-libelf-devel +curl -L -o /tmp/vboxadditions.iso https://download.virtualbox.org/virtualbox/6.1.34/VBoxGuestAdditions_6.1.34.iso +mkdir -p /media/VBoxGuestAdditions +mount -o loop,ro /tmp/vboxadditions.iso /media/VBoxGuestAdditions +mkdir -p /tmp/VBoxGuestAdditions +sh /media/VBoxGuestAdditions/VBoxLinuxAdditions.run --nox11 --noexec --keep --target /tmp/VBoxGuestAdditions +pushd /tmp/VBoxGuestAdditions +./install.sh +/sbin/rcvboxadd quicksetup all +popd +ls "/lib/modules/${kver}/misc/" +modinfo "/lib/modules/${kver}/misc/vboxsf.ko" +rm -rf /tmp/VBoxGuestAdditions +umount /media/VBoxGuestAdditions +rm -f /tmp/vboxadditions.iso +rmdir /media/VBoxGuestAdditions +dnf -y remove kernel-devel gcc make perl elfutils-libelf-devel + # systemd should generate a new machine id during the first boot, to # avoid having multiple Vagrant instances with the same id in the local # network. /etc/machine-id should be empty, but it must exist to prevent -- 2.39.3 From f5a5d044e983542f3646d21b856288fc3d03d82d Mon Sep 17 00:00:00 2001 From: lumarel Date: Sun, 24 Jul 2022 00:29:30 +0200 Subject: [PATCH 02/15] Add VMware Vagrant kickstart --- Rocky-8-Vagrant-VMware.ks | 151 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 151 insertions(+) create mode 100644 Rocky-8-Vagrant-VMware.ks diff --git a/Rocky-8-Vagrant-VMware.ks b/Rocky-8-Vagrant-VMware.ks new file mode 100644 index 0000000..34a3ceb --- /dev/null +++ b/Rocky-8-Vagrant-VMware.ks @@ -0,0 +1,151 @@ +text +keyboard --vckeymap us +lang en_US +skipx +network --bootproto=dhcp --device=link --activate --onboot=on +rootpw --plaintext vagrant +firewall --disabled +timezone --utc UTC +services --enabled=vmtoolsd +# The biosdevname and ifnames options ensure we get "eth0" as our interface +# even in environments like virtualbox that emulate a real NW card +bootloader --timeout=1 --append="no_timer_check console=tty0 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0 elevator=noop" +zerombr +clearpart --all --initlabel +reqpart +part / --fstype=xfs --asprimary --size=1024 --grow + +user --name=vagrant --plaintext --password=vagrant + +shutdown + +%packages --instLangs=en +bash-completion +man-pages +bzip2 +rsync +nfs-utils +cifs-utils +chrony +yum-utils +open-vm-tools +# Vagrant boxes aren't normally visible, no need for Plymouth +-plymouth +# Microcode updates cannot work in a VM +-microcode_ctl +# Firmware packages are not needed in a VM +-iwl100-firmware +-iwl1000-firmware +-iwl105-firmware +-iwl135-firmware +-iwl2000-firmware +-iwl2030-firmware +-iwl3160-firmware +-iwl3945-firmware +-iwl4965-firmware +-iwl5000-firmware +-iwl5150-firmware +-iwl6000-firmware +-iwl6000g2a-firmware +-iwl6050-firmware +-iwl7260-firmware +# Don't build rescue initramfs +-dracut-config-rescue +%end + +# kdump needs to reserve 160MB + 2bits/4kB RAM, and automatic allocation only +# works on systems with at least 2GB RAM (which excludes most Vagrant boxes) +# CBS doesn't support %addon yet https://bugs.centos.org/view.php?id=12169 +%addon com_redhat_kdump --disable +%end + +%post +# configure swap to a file +fallocate -l 2G /swapfile +chmod 600 /swapfile +mkswap /swapfile +echo "/swapfile none swap defaults 0 0" >> /etc/fstab + +# sudo +echo "%vagrant ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/vagrant +chmod 0440 /etc/sudoers.d/vagrant + +# Fix for https://github.com/CentOS/sig-cloud-instance-build/issues/38 +cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF +DEVICE="eth0" +BOOTPROTO="dhcp" +ONBOOT="yes" +TYPE="Ethernet" +PERSISTENT_DHCLIENT="yes" +EOF + +# sshd: disable password authentication and DNS checks +ex -s /etc/ssh/sshd_config <>/etc/sysconfig/sshd <> /home/vagrant/.ssh/authorized_keys +chmod 600 /home/vagrant/.ssh/authorized_keys +chown -R vagrant:vagrant /home/vagrant/.ssh + +# Fix for issue #76, regular users can gain admin privileges via su +ex -s /etc/pam.d/su <<'EOF' +# allow vagrant to use su, but prevent others from becoming root or vagrant +/^account\s\+sufficient\s\+pam_succeed_if.so uid = 0 use_uid quiet$/ +:append +account [success=1 default=ignore] \\ + pam_succeed_if.so user = vagrant use_uid quiet +account required pam_succeed_if.so user notin root:vagrant +. +:update +:quit +EOF + +# systemd should generate a new machine id during the first boot, to +# avoid having multiple Vagrant instances with the same id in the local +# network. /etc/machine-id should be empty, but it must exist to prevent +# boot errors (e.g. systemd-journald failing to start). +:>/etc/machine-id + +echo 'vag' > /etc/yum/vars/infra + +# Blacklist the floppy module to avoid probing timeouts +echo blacklist floppy > /etc/modprobe.d/nofloppy.conf +chcon -u system_u -r object_r -t modules_conf_t /etc/modprobe.d/nofloppy.conf + +# Customize the initramfs +pushd /etc/dracut.conf.d +# Enable VMware PVSCSI support for VMware Fusion guests. +echo 'add_drivers+=" vmw_pvscsi "' > vmware-fusion-drivers.conf +echo 'add_drivers+=" hv_netvsc hv_storvsc hv_utils hv_vmbus hid-hyperv "' > hyperv-drivers.conf +# There's no floppy controller, but probing for it generates timeouts +echo 'omit_drivers+=" floppy "' > nofloppy.conf +popd +# Fix the SELinux context of the new files +restorecon -f - < Date: Thu, 1 Sep 2022 10:24:50 -0700 Subject: [PATCH 03/15] start initial clean up for 8 kickstarts --- Rocky-8-GenericCloud.ks | 140 ++++++++++++++++++++-------------------- 1 file changed, 71 insertions(+), 69 deletions(-) diff --git a/Rocky-8-GenericCloud.ks b/Rocky-8-GenericCloud.ks index 2d13920..c6f74b3 100644 --- a/Rocky-8-GenericCloud.ks +++ b/Rocky-8-GenericCloud.ks @@ -1,27 +1,87 @@ -url --url http://dl.rockylinux.org/pub/rocky/8/BaseOS/$basearch/os/ text +lang en_US.UTF-8 +keyboard us +timezone UTC --isUtc +# Disk +bootloader --append="console=ttyS0,115200n8 no_timer_check crashkernel=auto net.ifnames=0" --location=mbr --timeout=1 --boot-drive=vda auth --enableshadow --passalgo=sha512 -shutdown +selinux --enforcing firewall --enabled --service=ssh firstboot --disable -ignoredisk --only-use=vda -keyboard us -# System language -lang en_US.UTF-8 # Network information network --bootproto=dhcp --device=link --activate --onboot=on network --hostname=localhost.localdomain # Root password -rootpw --iscrypted thereisnopasswordanditslocked -selinux --enforcing services --disabled="kdump" --enabled="NetworkManager,sshd,rsyslog,chronyd,cloud-init,cloud-init-local,cloud-config,cloud-final,rngd" -timezone UTC --isUtc -# Disk -bootloader --append="console=ttyS0,115200n8 no_timer_check crashkernel=auto net.ifnames=0" --location=mbr --timeout=1 --boot-drive=vda +rootpw --iscrypted thereisnopasswordanditslocked + +# Partition stuff zerombr clearpart --all --initlabel reqpart part / --fstype="xfs" --ondisk=vda --size=8000 --grow +shutdown + +url --url http://dl.rockylinux.org/pub/rocky/8/BaseOS/$basearch/os/ + +%packages +@core +chrony +dnf +yum +cloud-init +cloud-utils-growpart +NetworkManager +dracut-config-generic +dracut-norescue +firewalld +gdisk +grub2 +kernel +nfs-utils +rsync +tar +dnf-utils +yum-utils +-aic94xx-firmware +-alsa-firmware +-alsa-lib +-alsa-tools-firmware +-ivtv-firmware +-iwl100-firmware +-iwl1000-firmware +-iwl105-firmware +-iwl135-firmware +-iwl2000-firmware +-iwl2030-firmware +-iwl3160-firmware +-iwl3945-firmware +-iwl4965-firmware +-iwl5000-firmware +-iwl5150-firmware +-iwl6000-firmware +-iwl6000g2a-firmware +-iwl6000g2b-firmware +-iwl6050-firmware +-iwl7260-firmware +-libertas-sd8686-firmware +-libertas-sd8787-firmware +-libertas-usb8388-firmware +-biosdevname +-iprutils +-plymouth + +python3-jsonschema +qemu-guest-agent +dhcp-client +cockpit-ws +cockpit-system +-langpacks-* +-langpacks-en + +rocky-release +rng-tools +%end %post --erroronfail passwd -d root @@ -146,61 +206,3 @@ true %end -%packages -@core -chrony -dnf -yum -cloud-init -cloud-utils-growpart -NetworkManager -dracut-config-generic -dracut-norescue -firewalld -gdisk -grub2 -kernel -nfs-utils -rsync -tar -dnf-utils -yum-utils --aic94xx-firmware --alsa-firmware --alsa-lib --alsa-tools-firmware --ivtv-firmware --iwl100-firmware --iwl1000-firmware --iwl105-firmware --iwl135-firmware --iwl2000-firmware --iwl2030-firmware --iwl3160-firmware --iwl3945-firmware --iwl4965-firmware --iwl5000-firmware --iwl5150-firmware --iwl6000-firmware --iwl6000g2a-firmware --iwl6000g2b-firmware --iwl6050-firmware --iwl7260-firmware --libertas-sd8686-firmware --libertas-sd8787-firmware --libertas-usb8388-firmware --biosdevname --iprutils --plymouth - -python3-jsonschema -qemu-guest-agent -dhcp-client -cockpit-ws -cockpit-system --langpacks-* --langpacks-en - -rocky-release -rng-tools -%end -- 2.39.3 From 14390a1ce04ff46c5484f2bed726c52c76ea7af8 Mon Sep 17 00:00:00 2001 From: Neil Hanlon Date: Tue, 11 Oct 2022 13:58:32 -0400 Subject: [PATCH 04/15] Add oracle --- Rocky-8-OCP.ks | 298 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 298 insertions(+) create mode 100644 Rocky-8-OCP.ks diff --git a/Rocky-8-OCP.ks b/Rocky-8-OCP.ks new file mode 100644 index 0000000..b42b039 --- /dev/null +++ b/Rocky-8-OCP.ks @@ -0,0 +1,298 @@ +text +repo --name="BaseOS" --baseurl=http://dl.rockylinux.org/pub/rocky/8/BaseOS/$basearch/os/ +repo --name="AppStream" --baseurl=http://dl.rockylinux.org/pub/rocky/8/AppStream/$basearch/os/ + +url --url http://dl.rockylinux.org/pub/rocky/8/BaseOS/$basearch/os/ + +auth --enableshadow --passalgo=sha512 +reboot +firewall --enabled --service=ssh +firstboot --disable +ignoredisk --only-use=vda +keyboard us +# System language +lang en_US.UTF-8 +# Network information +network --bootproto=dhcp --device=link --activate --onboot=on +network --hostname=localhost.localdomain +# Root password +rootpw --plaintext rocky +selinux --enforcing +services --disabled="kdump" --enabled="NetworkManager,sshd,rsyslog,chronyd,cloud-init,cloud-init-local,cloud-config,cloud-final,rngd" +timezone UTC --isUtc +# Disk +bootloader --append="console=ttyS0,115200n8 console=tty0 no_timer_check crashkernel=auto net.ifnames=0 LANG=en_US.UTF-8 transparent_hugepage=never rd.luks=0 rd.md=0 rd.dm=0 rd.lvm.vg=rocky rd.lvm.lv=rocky/root rd.net.timeout.dhcp=10" --location=mbr --timeout=1 --boot-drive=vda + +clearpart --all --initlabel --drives vda +part /boot --fstype xfs --size 1024 --asprimary --ondisk vda +part /boot/efi --fstype vfat --size 512 --asprimary --ondisk vda + +part pv.01 --ondisk=vda --size=1 --grow --asprimary +volgroup rocky pv.01 +logvol / --vgname=rocky --size=3000 --name=root --grow + +%post --erroronfail + +# setup systemd to boot to the right runlevel +rm -f /etc/systemd/system/default.target +ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target +echo . + +dnf -C -y remove linux-firmware + +# Remove firewalld; it is required to be present for install/image building. +# but we dont ship it in cloud +dnf -C -y remove firewalld --setopt="clean_requirements_on_remove=1" +dnf -C -y remove avahi\* +sed -i '/^#NAutoVTs=.*/ a\ +NAutoVTs=0' /etc/systemd/logind.conf + +cat > /etc/sysconfig/network << EOF +NETWORKING=yes +NOZEROCONF=yes +EOF + +# Remove build-time resolvers to fix #16948 +echo > /etc/resolv.conf + +# For cloud images, 'eth0' _is_ the predictable device name, since +# we don't want to be tied to specific virtual (!) hardware +rm -f /etc/udev/rules.d/70* +ln -s /dev/null /etc/udev/rules.d/80-net-name-slot.rules + +# simple eth0 config, again not hard-coded to the build hardware +cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF +DEVICE="eth0" +BOOTPROTO="dhcp" +ONBOOT="yes" +TYPE="Ethernet" +USERCTL="yes" +PEERDNS="yes" +IPV6INIT="no" +PERSISTENT_DHCLIENT="1" +EOF + +echo "virtual-guest" > /etc/tuned/active_profile + +# generic localhost names +cat > /etc/hosts << EOF +127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 +::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 + +EOF +echo . + +systemctl mask tmp.mount + +cat < /etc/sysconfig/kernel +# UPDATEDEFAULT specifies if new-kernel-pkg should make +# new kernels the default +UPDATEDEFAULT=yes + +# DEFAULTKERNEL specifies the default kernel package type +DEFAULTKERNEL=kernel +EOL + +# make sure firstboot doesn't start +echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot + +# rocky cloud user +echo -e 'rocky\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers +sed -i 's/name: cloud-user/name: rocky/g' /etc/cloud/cloud.cfg + +dnf clean all + +# XXX instance type markers - MUST match Rocky Infra expectation +echo 'oci' > /etc/yum/vars/infra + +# change dhcp client retry/timeouts to resolve #6866 +cat >> /etc/dhcp/dhclient.conf << EOF + +timeout 300; +retry 60; +EOF + + +rm -rf /var/log/yum.log +rm -rf "/var/lib/yum/*" +rm -rf /root/install.log +rm -rf /root/install.log.syslog +rm -rf /root/anaconda-ks.cfg +rm -rf /var/log/anaconda* + +rm -f /var/lib/systemd/random-seed + +cat /dev/null > /etc/machine-id + +echo "Fixing SELinux contexts." +touch /var/log/cron +touch /var/log/boot.log +mkdir -p /var/cache/yum +/usr/sbin/fixfiles -R -a restore + +# remove these for debugging +sed -i -e 's/ rhgb quiet//' /boot/grub/grub.conf + +# enable resizing on copied AMIs +echo 'install_items+=" sgdisk "' > /etc/dracut.conf.d/sgdisk.conf + +# OCI - Need iscsi as a dracut module +echo 'add_dracutmodules+="iscsi"' > /etc/dracut.conf.d/iscsi.conf + +# OCI - Virtio drivers +echo 'add_drivers+="virtio virtio_blk virtio_net virtio_pci virtio_ring virtio_scsi virtio_console"' > /etc/dracut.conf.d/virtio.conf + +# OCI - YOLO +mkdir -p /usr/lib/dracut/modules.d/95oci +OCIDRACUT="H4sIAGtFHmMAA+2WWW/bOBCA/Vr+illZzQXoluPUhgMURYrmpS02fevuGpJIWYQVUiWpJoHr/15S +crLZZBs3QA8U5QfYosQ5NUNSrRRBTfMAi6xoVXDOcVsT6ePg2YgXNBh8C0LNeDTqrpq7124cpfF4 +nIzT8fhwEEaj+HA8gNE38b6FVqpMAAwE5+ohuW3zvyjtw/UnLMtr4lFZSOrlV00mpS+rR/rYUv84 +StJBlIx10ZNREscD/SRNkwGE3yXjO/zm9R/+EeSUBbJCQ/AOPNANQCYgK1LXniwEbdQUKMOEKU9l +ufT6eUbrqRby8kzSwuNlKYmaQDo1JrQhcjkBJWdHIC9mKUg9TIEoKGlN1FVDZtobGr7NVFFB11nm +3YLikNU1v4A8ozXwVgEtQVUEullM5RKKjGkZQTJ8BTmBkrcMo6Eg5QTeiCxvFxMYJmESxWGYImRc +wYLo8i7gOMDkY8Dauob4eCeCT5/Ah1uN7+mhbmx0+vrs5M93s10kZo67Mp6Hec2L5WTtIB1Oby3n +vIYQBPa76P1+XcDODrwHj4DjCgf+nprYGSDQlFwA69KgDNy93ooERpR5uD8FzDs5w3utv+qEnz6d +HKwdmIHTudE2TdgFZ4qyltwodGk2mZBk3snNO0dfTlh7vc722sQ9bcftInCMmiCqFQyiG+lN2HPC +ipm7J5WYC9LUWUH+VXMC/fsrLp39TgtzRuAe3RQpKr5JcAJnS9o0lC3AveXD930HjnfiR4lDl/7y +XC5uqUkjT7CZdgJ13gSdHbP+FcHebSNOr3VJFYSopGgXfWX1S21ZmgV109c3rYCuwzgxe6oJ+/Ts +xdkpbPR5oyhn15l+leR/kuw13L6BdeFAEgwehd3gn7fP372a+QdusBK9ilSYmniq9RTc1eU0MBKB +HnwI11P9n6x3/ycP3QsXme4E56VeoNr4g9GZt/az9zbLdrac//29p7f3tnn8wb9h2/dfchjdOf/D +OIns+f8j2Jz/+iD/4V8ARUWK5d4+rNCTzRkTojVCmDSEYXl/gjJdqrruJ8zNvOJ8CY0gXqt3NTg6 +0vufjg5T8YXvVkeb+dkv3GKxWCwWi8VisVgsFovFYrFYLBaLxWL5jnwGdMMrBgAoAAA=" + +base64 -d <<<"$OCIDRACUT" | tar -xz + +OCICLOUDCFG="IyBPQ0kgY2xvdWQtaW5pdCBjb25maWd1cmF0aW9uCmRhdGFzb3VyY2VfbGlzdDogWydPcmFjbGUn +LCAnT3BlblN0YWNrJ10KZGF0YXNvdXJjZToKICBPcGVuU3RhY2s6CiAgICBtZXRhZGF0YV91cmxz +OiBbJ2h0dHA6Ly8xNjkuMjU0LjE2OS4yNTQnXQogICAgdGltZW91dDogMTAKICAgIG1heF93YWl0 +OiAyMAoKIyBzd2FwIGZpbGUKc3dhcDoKICAgZmlsZW5hbWU6IC8uc3dhcGZpbGUKICAgc2l6ZTog +ImF1dG8iCgpjbG91ZF9pbml0X21vZHVsZXM6CiMgT0NJOiBkaXNrX3NldHVwIGlzIGRpc2FibGVk +CiMtIGRpc2tfc2V0dXAKIC0gbWlncmF0b3IKIC0gYm9vdGNtZAogLSB3cml0ZS1maWxlcwojIE9D +STogVGhlIGdyb3dwYXJ0IG1vZHVsZSBpcyBkaXNhYmxlZCBieSBkZWZhdWx0LiBUbyBlbmFibGUg +YXV0b21hdGljIGJvb3Qgdm9sdW1lIHJlc2l6aW5nLCB1bmNvbW1lbnQKIyB0aGUgYmVsb3cgZW50 +cnkgZm9yICctIGdyb3dwYXJ0JyBhbmQgcmVib290LiBBbGwgdGhlIGRlcGVuZGVudCBwYWNrYWdl +cyBmb3IgdGhlIGdyb3dwYXJ0CiMgbW9kdWxlIHRvIHdvcmsgc3VjaCBhcyBjbG91ZC11dGlscy1n +cm93cGFydCBhbmQgZ2Rpc2sgYXJlIGFscmVhZHkgaW5jbHVkZWQgaW4gdGhlIGltYWdlLgojLSBn +cm93cGFydAogLSByZXNpemVmcwojIE9DSTogc2V0X2hvc3RuYW1lLCB1cGRhdGVfaG9zdG5hbWUs +IHVwZGF0ZV9ldGNfaG9zdHMgYXJlIGRpc2FibGVkCiMtIHNldF9ob3N0bmFtZQojLSB1cGRhdGVf +aG9zdG5hbWUKIy0gdXBkYXRlX2V0Y19ob3N0cwogLSByc3lzbG9nCiAtIHVzZXJzLWdyb3Vwcwog +LSBzc2gKCmNsb3VkX2NvbmZpZ19tb2R1bGVzOgogLSBtb3VudHMKIC0gbG9jYWxlCiAtIHNldC1w +YXNzd29yZHMKIyBPQ0k6IHJoX3N1YnNjcmlwdGlvbiBpcyBkaXNhYmxlZAojLSByaF9zdWJzY3Jp +cHRpb24KIC0geXVtLWFkZC1yZXBvCiAtIHBhY2thZ2UtdXBkYXRlLXVwZ3JhZGUtaW5zdGFsbAog +LSB0aW1lem9uZQogLSBudHAKIC0gcHVwcGV0CiAtIGNoZWYKIC0gc2FsdC1taW5pb24KIC0gbWNv +bGxlY3RpdmUKIC0gZGlzYWJsZS1lYzItbWV0YWRhdGEKIC0gcnVuY21kCgpjbG91ZF9maW5hbF9t +b2R1bGVzOgogLSByaWdodHNjYWxlX3VzZXJkYXRhCiAtIHNjcmlwdHMtcGVyLW9uY2UKIC0gc2Ny +aXB0cy1wZXItYm9vdAogLSBzY3JpcHRzLXBlci1pbnN0YW5jZQogLSBzY3JpcHRzLXVzZXIKIC0g +c3NoLWF1dGhrZXktZmluZ2VycHJpbnRzCiAtIGtleXMtdG8tY29uc29sZQogLSBwaG9uZS1ob21l +CiAtIGZpbmFsLW1lc3NhZ2UKIyBPQ0k6IHBvd2VyLXN0YXRlLWNoYW5nZSBpcyBkaXNhYmxlZAoj +LSBwb3dlci1zdGF0ZS1jaGFuZ2UKCg==" + +base64 -d <<<"$OCICLOUDCFG" >> /etc/cloud/cloud.cfg.d/99_oci.cfg + +# Rerun dracut for the installed kernel (not the running kernel): +KERNEL_VERSION=$(rpm -q kernel --qf '%%{V}-%%{R}.%%{arch}\n') +dracut -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION + +# OCI needs Iscsi +grubby --args="libiscsi.debug_libiscsi_eh=1 netroot=iscsi:169.254.0.2:::1:iqn.2015-02.oracle.boot:uefi ip=dhcp rd.iscsi.bypass rd.iscsi.param=node.session.timeo.replacement_timeout=6000" --update-kernel "/boot/vmlinuz-$KERNEL_VERSION" + +passwd -d root +passwd -l root + +# Copyright (C) 2020 Oracle Corp., Inc. All rights reserved. +# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl +# +# /usr/lib/oci-linux-config/cloud/scripts/initramfs-mod/net.sh +# + +echo "$(date) - OCI initramfs network modification script started." + +# Symlink network config files where cloud-init >= 19.4 expects them +DRACUT_CFG=/run/initramfs/state/etc/sysconfig/network-scripts +CI_DIR=/run +if [ -d $DRACUT_CFG ]; then + FILE_COUNT=`ls $DRACUT_CFG | wc -l` + if [ $FILE_COUNT -eq 0 ]; then + # Create dummy file if dracut did not create network device config + dummycfg=$CI_DIR/net-dummy.conf + echo "DEVICE=\"dummy\"" > $dummycfg + echo "BOOTPROTO=dhcp" >> $dummycfg + echo "$(date) - Creating dummy config $dummycfg." + else + for dcfg in $DRACUT_CFG/*; do + filename=${dcfg##*/} + devname=${filename##ifcfg-} + cicfg=$CI_DIR/net-$devname.conf + if [ ! -e $cicfg ]; then + echo "$(date) - Creating symlink from $dcfg to $cicfg." + ln -s $dcfg $cicfg + fi + done + fi +fi + +echo "$(date) - OCI initramfs network modification script done." +true + +%end + +%packages +@core +chrony +dnf +yum +cloud-init +cloud-utils-growpart +NetworkManager +dracut-config-generic +firewalld +gdisk +grub2 +kernel +nfs-utils +rsync +tar +dnf-utils +yum-utils +-aic94xx-firmware +-alsa-firmware +-alsa-lib +-alsa-tools-firmware +-ivtv-firmware +-iwl100-firmware +-iwl1000-firmware +-iwl105-firmware +-iwl135-firmware +-iwl2000-firmware +-iwl2030-firmware +-iwl3160-firmware +-iwl3945-firmware +-iwl4965-firmware +-iwl5000-firmware +-iwl5150-firmware +-iwl6000-firmware +-iwl6000g2a-firmware +-iwl6000g2b-firmware +-iwl6050-firmware +-iwl7260-firmware +-libertas-sd8686-firmware +-libertas-sd8787-firmware +-libertas-usb8388-firmware +-biosdevname +-iprutils +-plymouth + +python3-jsonschema +qemu-guest-agent +dhcp-client +cockpit-ws +cockpit-system +-langpacks-* +-langpacks-en + + +iscsi-initiator-utils + +rocky-release +rng-tools +%end -- 2.39.3 From 625f058ba40984986f49d8385ee185544e643d67 Mon Sep 17 00:00:00 2001 From: Neil Hanlon Date: Tue, 11 Oct 2022 16:13:10 -0400 Subject: [PATCH 05/15] install oci-utils from oracle repository --- Rocky-8-OCP.ks | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/Rocky-8-OCP.ks b/Rocky-8-OCP.ks index b42b039..5ea40fb 100644 --- a/Rocky-8-OCP.ks +++ b/Rocky-8-OCP.ks @@ -1,6 +1,7 @@ text repo --name="BaseOS" --baseurl=http://dl.rockylinux.org/pub/rocky/8/BaseOS/$basearch/os/ repo --name="AppStream" --baseurl=http://dl.rockylinux.org/pub/rocky/8/AppStream/$basearch/os/ +repo --name="oraclelinux-addons" --baseurl=http://yum.oracle.com/repo/OracleLinux/OL8/addons/$basearch/ --install --includepkgs="oci-utils" url --url http://dl.rockylinux.org/pub/rocky/8/BaseOS/$basearch/os/ @@ -136,6 +137,10 @@ sed -i -e 's/ rhgb quiet//' /boot/grub/grub.conf # enable resizing on copied AMIs echo 'install_items+=" sgdisk "' > /etc/dracut.conf.d/sgdisk.conf + +# OCI - Start ocid on boot +systemctl enable ocid.service + # OCI - Need iscsi as a dracut module echo 'add_dracutmodules+="iscsi"' > /etc/dracut.conf.d/iscsi.conf @@ -239,25 +244,37 @@ true %packages @core chrony -dnf -yum cloud-init cloud-utils-growpart -NetworkManager +cockpit-system +cockpit-ws +dhcp-client +dnf +dnf-utils dracut-config-generic firewalld gdisk grub2 +iscsi-initiator-utils kernel +NetworkManager nfs-utils +oci-utils +python3-jsonschema +qemu-guest-agent +rng-tools +rocky-release rsync tar -dnf-utils +yum yum-utils + -aic94xx-firmware -alsa-firmware -alsa-lib -alsa-tools-firmware +-biosdevname +-iprutils -ivtv-firmware -iwl100-firmware -iwl1000-firmware @@ -275,24 +292,10 @@ yum-utils -iwl6000g2b-firmware -iwl6050-firmware -iwl7260-firmware +-langpacks-* +-langpacks-en -libertas-sd8686-firmware -libertas-sd8787-firmware -libertas-usb8388-firmware --biosdevname --iprutils -plymouth - -python3-jsonschema -qemu-guest-agent -dhcp-client -cockpit-ws -cockpit-system --langpacks-* --langpacks-en - - -iscsi-initiator-utils - -rocky-release -rng-tools %end -- 2.39.3 From 45714dfb0232c250ac299fac5ab7fc0d7e949966 Mon Sep 17 00:00:00 2001 From: Louis Abel Date: Tue, 11 Oct 2022 22:25:44 -0700 Subject: [PATCH 06/15] add initial LVM kickstarts --- Rocky-8-Azure-LVM.ks | 308 ++++++++++++++++++++++++++++++++++++ Rocky-8-EC2-LVM.ks | 223 ++++++++++++++++++++++++++ Rocky-8-GenericCloud-LVM.ks | 210 ++++++++++++++++++++++++ 3 files changed, 741 insertions(+) create mode 100644 Rocky-8-Azure-LVM.ks create mode 100644 Rocky-8-EC2-LVM.ks create mode 100644 Rocky-8-GenericCloud-LVM.ks diff --git a/Rocky-8-Azure-LVM.ks b/Rocky-8-Azure-LVM.ks new file mode 100644 index 0000000..640e9f9 --- /dev/null +++ b/Rocky-8-Azure-LVM.ks @@ -0,0 +1,308 @@ +text +url --url http://dl.rockylinux.org/pub/rocky/8/BaseOS/$basearch/os/ + +auth --enableshadow --passalgo=sha512 +shutdown +firewall --enabled --service=ssh +firstboot --disable +ignoredisk --only-use=vda +keyboard us +# System language +lang en_US.UTF-8 +# Network information +network --bootproto=dhcp --device=link --activate --onboot=on +network --hostname=localhost.localdomain +# Root password +rootpw --iscrypted thereisnopasswordanditslocked +selinux --enforcing +services --disabled="kdump" --enabled="NetworkManager,sshd,rsyslog,chronyd,cloud-init,cloud-init-local,cloud-config,cloud-final,rngd" +timezone UTC --isUtc +# Disk +bootloader --append="rootdelay=300 console=ttyS0 earlyprintk=ttyS0 no_timer_check crashkernel=auto net.ifnames=0" --location=mbr --timeout=1 --boot-drive=vda +zerombr +clearpart --all --initlabel +part /boot --fstype xfs --size 1024 --asprimary --ondisk vda +part /boot/efi --fstype vfat --size 512 --asprimary --ondisk vda +reqpart +part pv.01 --size=1 --ondisk=vda --asprimary --grow +volgroup rocky pv.01 +logvol / --vgname=rocky --size=8000 --name=root --grow + + +%post --erroronfail +passwd -d root +passwd -l root + +### +# Common Cloud Tweaks +### + +# pvgrub support +echo -n "Creating grub.conf for pvgrub" +rootuuid=$( awk '$2=="/" { print $1 };' /etc/fstab ) +mkdir /boot/grub +echo -e 'default=0\ntimeout=0\n\n' > /boot/grub/grub.conf +for kv in $( ls -1v /boot/vmlinuz* |grep -v rescue |sed s/.*vmlinuz-// ); do + echo "title Rocky Linux 8 ($kv)" >> /boot/grub/grub.conf + echo -e "\troot (hd0)" >> /boot/grub/grub.conf + echo -e "\tkernel /boot/vmlinuz-$kv ro root=$rootuuid console=hvc0 LANG=en_US.UTF-8" >> /boot/grub/grub.conf + echo -e "\tinitrd /boot/initramfs-$kv.img" >> /boot/grub/grub.conf + echo +done +ln -sf grub.conf /boot/grub/menu.lst +ln -sf /boot/grub/grub.conf /etc/grub.conf + +# setup systemd to boot to the right runlevel +rm -f /etc/systemd/system/default.target +ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target +echo . + +# remove linux-firmware as we're virt and it's half a gig +dnf -C -y remove linux-firmware + +# Remove firewalld; it is required to be present for install/image building. +# but we dont ship it in cloud +dnf -C -y remove firewalld --setopt="clean_requirements_on_remove=1" +dnf -C -y remove avahi\* +sed -i '/^#NAutoVTs=.*/ a\ +NAutoVTs=0' /etc/systemd/logind.conf + +echo "virtual-guest" > /etc/tuned/active_profile + +### +# Networking Changes +### + +# For cloud images, 'eth0' _is_ the predictable device name, since +# we don't want to be tied to specific virtual (!) hardware +rm -f /etc/udev/rules.d/70* +ln -s /dev/null /etc/udev/rules.d/80-net-name-slot.rules + +# simple eth0 config, again not hard-coded to the build hardware +cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF +DEVICE=eth0 +ONBOOT=yes +BOOTPROTO=dhcp +TYPE=Ethernet +USERCTL=no +PEERDNS=yes +IPV6INIT=no +NM_CONTROLLED=yes +IPV4_DHCP_TIMEOUT=300 +EOF + +cat << EOF | tee -a /etc/NetworkManager/conf.d/dhcp-timeout.conf +# Configure dhcp timeout to 300s by default +[connection] +ipv4.dhcp-timeout=300 +EOF + + +cat > /etc/sysconfig/network << EOF +NETWORKING=yes +NOZEROCONF=yes +EOF + +# Remove build-time resolvers to fix #16948 +echo > /etc/resolv.conf + +# generic localhost names +cat > /etc/hosts << EOF +127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 +::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 + +EOF +echo . + + +### +# Services +### + +systemctl mask tmp.mount + +### +# azure +### +# Setup WALinux Agent +dnf -y install WALinuxAgent +systemctl enable waagent + +# Configure waagent for cloud-init +sed -i 's/Provisioning.UseCloudInit=n/Provisioning.UseCloudInit=y/g' /etc/waagent.conf +sed -i 's/Provisioning.Enabled=y/Provisioning.Enabled=n/g' /etc/waagent.conf + + + +# Azure: handle sr-iov and networkmanaeger +cat << EOF | tee -a /etc/udev/rules.d/68-azure-sriov-nm-unmanaged.rules +# Accelerated Networking on Azure exposes a new SRIOV interface to the VM. +# This interface is transparently bonded to the synthetic interface, +# so NetworkManager should just ignore any SRIOV interfaces. +SUBSYSTEM=="net", DRIVERS=="hv_pci", ACTION=="add", ENV{NM_UNMANAGED}="1" +EOF + +# Azure: Time sync for linux +## Setup udev rule for ptp_hyperv +cat << EOF | tee -a /etc/udev/rules.d/98-hyperv-ptp.rules +## See: https://docs.microsoft.com/en-us/azure/virtual-machines/linux/time-sync#check-for-ptp-clock-source +SUBSYSTEM=="ptp", ATTR{clock_name}=="hyperv", SYMLINK += "ptp_hyperv" +EOF + +# Configure chrony to use ptp_hyperv +cat << EOF | tee -a /etc/chrony.conf +# Setup hyperv PTP device as refclock +refclock PHC /dev/ptp_hyperv poll 3 dpoll -2 offset 0 stratum 2 +EOF + +# Azure: Blacklist modules +cat << EOF | tee -a /etc/modprobe.d/azure-blacklist.conf +blacklist amdgpu +blacklist nouveau +blacklist radeon +EOF + +# Azure: cloud-init customizations for Hyperv +cat << EOF | tee /etc/cloud/cloud.cfg.d/10-azure-kvp.cfg +# Enable logging to the Hyper-V kvp in Azure +reporting: + logging: + type: log + telemetry: + type: hyperv +EOF + +### +# Kernel and Drivers +### + +# Add drivers when building in VMWare, Vbox, or KVM (KVM) +cat << EOF | tee -a /etc/dracut.conf.d/80-azure.conf +add_drivers+=" hv_vmbus hv_netvsc hv_storvsc " +EOF + +dracut -f -v + +cat < /etc/sysconfig/kernel +# UPDATEDEFAULT specifies if new-kernel-pkg should make +# new kernels the default +UPDATEDEFAULT=yes + +# DEFAULTKERNEL specifies the default kernel package type +DEFAULTKERNEL=kernel +EOL + +# make sure firstboot doesn't start +echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot + +# rocky cloud user +echo -e 'rocky\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers +sed -i 's/name: cloud-user/name: rocky/g' /etc/cloud/cloud.cfg + +dnf clean all + +# XXX instance type markers - MUST match Rocky Infra expectation +echo 'azure' > /etc/yum/vars/infra + +# change dhcp client retry/timeouts to resolve #6866 + + +### +# Cleanup +### + +### +# Azure Cleanup +### +sudo rm -f /var/log/waagent.log +sudo cloud-init clean +waagent -force -deprovision+user + + +# Commont cleanup +rm -f ~/.bash_history +export HISTSIZE=0 + +rm -f /var/lib/systemd/random-seed +rm -rf /root/anaconda-ks.cfg +rm -rf /root/install.log +rm -rf /root/install.log.syslog +rm -rf /var/lib/yum/* +rm -rf /var/log/anaconda* +rm -rf /var/log/yum.log + +# Wipe machineid +cat /dev/null > /etc/machine-id + +# Fix selinux +touch /var/log/cron +touch /var/log/boot.log +mkdir -p /var/cache/yum +/usr/sbin/fixfiles -R -a restore + +true + +%end + +%packages +@core +chrony +dnf +yum +cloud-init +cloud-utils-growpart +NetworkManager +dracut-config-generic +dracut-norescue +firewalld +gdisk +grub2 +kernel +nfs-utils +rsync +tar +dnf-utils +yum-utils +-aic94xx-firmware +-alsa-firmware +-alsa-lib +-alsa-tools-firmware +-ivtv-firmware +-iwl100-firmware +-iwl1000-firmware +-iwl105-firmware +-iwl135-firmware +-iwl2000-firmware +-iwl2030-firmware +-iwl3160-firmware +-iwl3945-firmware +-iwl4965-firmware +-iwl5000-firmware +-iwl5150-firmware +-iwl6000-firmware +-iwl6000g2a-firmware +-iwl6000g2b-firmware +-iwl6050-firmware +-iwl7260-firmware +-libertas-sd8686-firmware +-libertas-sd8787-firmware +-libertas-usb8388-firmware +-biosdevname +-iprutils +-plymouth + +python3-jsonschema +qemu-guest-agent +dhcp-client +cockpit-ws +cockpit-system +-langpacks-* +-langpacks-en + +rocky-release +rng-tools + +WALinuxAgent +hyperv-daemons + +%end diff --git a/Rocky-8-EC2-LVM.ks b/Rocky-8-EC2-LVM.ks new file mode 100644 index 0000000..2f1582a --- /dev/null +++ b/Rocky-8-EC2-LVM.ks @@ -0,0 +1,223 @@ +text +auth --enableshadow --passalgo=sha512 +shutdown +firewall --enabled --service=ssh +firstboot --disable +keyboard us +# System language +lang en_US.UTF-8 +# Network information +network --bootproto=dhcp --device=link --activate --onboot=on +network --hostname=localhost.localdomain +# Root password +rootpw --iscrypted thereisnopasswordanditslocked +selinux --enforcing +services --disabled="kdump" --enabled="NetworkManager,sshd,rsyslog,chronyd,cloud-init,cloud-init-local,cloud-config,cloud-final,rngd" +timezone UTC --isUtc +# Disk +bootloader --append="console=ttyS0,115200n8 no_timer_check crashkernel=auto net.ifnames=0 nvme_core.io_timeout=4294967295 nvme_core.max_retries=10" --location=mbr --timeout=1 --boot-drive=vda +zerombr +clearpart --all --initlabel +reqpart +part pv.01 --size=1 --ondisk=vda --asprimary --grow +volgroup rocky pv.01 +logvol / --vgname=rocky --size=8000 --name=root --grow + +%pre --erroronfail +/usr/sbin/parted -s /dev/vda mklabel gpt +%end + +%post --erroronfail +passwd -d root +passwd -l root + +# pvgrub support +echo -n "Creating grub.conf for pvgrub" +rootuuid=$( awk '$2=="/" { print $1 };' /etc/fstab ) +mkdir /boot/grub +echo -e 'default=0\ntimeout=0\n\n' > /boot/grub/grub.conf +for kv in $( ls -1v /boot/vmlinuz* |grep -v rescue |sed s/.*vmlinuz-// ); do + echo "title Rocky Linux 8 ($kv)" >> /boot/grub/grub.conf + echo -e "\troot (hd0)" >> /boot/grub/grub.conf + echo -e "\tkernel /boot/vmlinuz-$kv ro root=$rootuuid console=hvc0 LANG=en_US.UTF-8" >> /boot/grub/grub.conf + echo -e "\tinitrd /boot/initramfs-$kv.img" >> /boot/grub/grub.conf + echo +done +ln -sf grub.conf /boot/grub/menu.lst +ln -sf /boot/grub/grub.conf /etc/grub.conf + +# setup systemd to boot to the right runlevel +rm -f /etc/systemd/system/default.target +ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target +echo . + +dnf -C -y remove linux-firmware + +# Remove firewalld; it is required to be present for install/image building. +# but we dont ship it in cloud +dnf -C -y remove firewalld --setopt="clean_requirements_on_remove=1" +dnf -C -y remove avahi\* +sed -i '/^#NAutoVTs=.*/ a\ +NAutoVTs=0' /etc/systemd/logind.conf + +cat > /etc/sysconfig/network << EOF +NETWORKING=yes +NOZEROCONF=yes +EOF + +# For cloud images, 'eth0' _is_ the predictable device name, since +# we don't want to be tied to specific virtual (!) hardware +rm -f /etc/udev/rules.d/70* +ln -s /dev/null /etc/udev/rules.d/80-net-name-slot.rules + +# simple eth0 config, again not hard-coded to the build hardware +cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF +DEVICE="eth0" +BOOTPROTO="dhcp" +ONBOOT="yes" +TYPE="Ethernet" +USERCTL="yes" +PEERDNS="yes" +IPV6INIT="no" +PERSISTENT_DHCLIENT="1" +EOF + +echo "virtual-guest" > /etc/tuned/active_profile + +# generic localhost names +cat > /etc/hosts << EOF +127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 +::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 + +EOF +echo . + +systemctl mask tmp.mount + +cat < /etc/sysconfig/kernel +# UPDATEDEFAULT specifies if new-kernel-pkg should make +# new kernels the default +UPDATEDEFAULT=yes + +# DEFAULTKERNEL specifies the default kernel package type +DEFAULTKERNEL=kernel +EOL + +# make sure firstboot doesn't start +echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot + +# rocky cloud user +echo -e 'rocky\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers +sed -i 's/name: cloud-user/name: rocky/g' /etc/cloud/cloud.cfg + +dnf clean all + +# XXX instance type markers - MUST match Rocky Infra expectation +echo 'ec2' > /etc/yum/vars/infra + +# change dhcp client retry/timeouts to resolve #6866 +cat >> /etc/dhcp/dhclient.conf << EOF + +timeout 300; +retry 60; +EOF + + +rm -rf /var/log/yum.log +rm -rf /var/lib/yum/* +rm -rf /root/install.log +rm -rf /root/install.log.syslog +rm -rf /root/anaconda-ks.cfg +rm -rf /var/log/anaconda* + +rm -f /var/lib/systemd/random-seed + +cat /dev/null > /etc/machine-id + +echo "Fixing SELinux contexts." +touch /var/log/cron +touch /var/log/boot.log +mkdir -p /var/cache/yum +/usr/sbin/fixfiles -R -a restore + +# remove these for ec2 debugging +sed -i -e 's/ rhgb quiet//' /boot/grub/grub.conf + +cat > /etc/modprobe.d/blacklist-nouveau.conf << EOL +blacklist nouveau +EOL + +# enable resizing on copied AMIs +echo 'install_items+=" sgdisk "' > /etc/dracut.conf.d/sgdisk.conf + +echo 'add_drivers+="xen-netfront xen-blkfront "' > /etc/dracut.conf.d/xen.conf +# Rerun dracut for the installed kernel (not the running kernel): +KERNEL_VERSION=$(rpm -q kernel --qf '%{V}-%{R}.%{arch}\n') +dracut -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION + + +# reorder console entries +sed -i 's/console=tty0/console=tty0 console=ttyS0,115200n8/' /boot/grub2/grub.cfg + +true + +%end + +%packages +@core +chrony +dnf +yum +cloud-init +cloud-utils-growpart +NetworkManager +dracut-config-generic +dracut-norescue +firewalld +gdisk +grub2 +kernel +nfs-utils +rsync +tar +dnf-utils +yum-utils +-aic94xx-firmware +-alsa-firmware +-alsa-lib +-alsa-tools-firmware +-ivtv-firmware +-iwl100-firmware +-iwl1000-firmware +-iwl105-firmware +-iwl135-firmware +-iwl2000-firmware +-iwl2030-firmware +-iwl3160-firmware +-iwl3945-firmware +-iwl4965-firmware +-iwl5000-firmware +-iwl5150-firmware +-iwl6000-firmware +-iwl6000g2a-firmware +-iwl6000g2b-firmware +-iwl6050-firmware +-iwl7260-firmware +-libertas-sd8686-firmware +-libertas-sd8787-firmware +-libertas-usb8388-firmware +-biosdevname +-iprutils +-plymouth + +python3-jsonschema +qemu-guest-agent +dhcp-client +cockpit-ws +cockpit-system +-langpacks-* +-langpacks-en + +rocky-release +rng-tools +%end diff --git a/Rocky-8-GenericCloud-LVM.ks b/Rocky-8-GenericCloud-LVM.ks new file mode 100644 index 0000000..b6e1783 --- /dev/null +++ b/Rocky-8-GenericCloud-LVM.ks @@ -0,0 +1,210 @@ +text +lang en_US.UTF-8 +keyboard us +timezone UTC --isUtc +# Disk +bootloader --append="console=ttyS0,115200n8 no_timer_check crashkernel=auto net.ifnames=0" --location=mbr --timeout=1 --boot-drive=vda +auth --enableshadow --passalgo=sha512 +selinux --enforcing +firewall --enabled --service=ssh +firstboot --disable +# Network information +network --bootproto=dhcp --device=link --activate --onboot=on +network --hostname=localhost.localdomain +# Root password +services --disabled="kdump" --enabled="NetworkManager,sshd,rsyslog,chronyd,cloud-init,cloud-init-local,cloud-config,cloud-final,rngd" +rootpw --iscrypted thereisnopasswordanditslocked + +# Partition stuff +zerombr +clearpart --all --initlabel +reqpart +part pv.01 --size=1 --ondisk=vda --asprimary --grow +volgroup rocky pv.01 +logvol / --vgname=rocky --size=8000 --name=root --grow +shutdown + +url --url http://dl.rockylinux.org/pub/rocky/8/BaseOS/$basearch/os/ + +%packages +@core +chrony +dnf +yum +cloud-init +cloud-utils-growpart +NetworkManager +dracut-config-generic +dracut-norescue +firewalld +gdisk +grub2 +kernel +nfs-utils +rsync +tar +dnf-utils +yum-utils +-aic94xx-firmware +-alsa-firmware +-alsa-lib +-alsa-tools-firmware +-ivtv-firmware +-iwl100-firmware +-iwl1000-firmware +-iwl105-firmware +-iwl135-firmware +-iwl2000-firmware +-iwl2030-firmware +-iwl3160-firmware +-iwl3945-firmware +-iwl4965-firmware +-iwl5000-firmware +-iwl5150-firmware +-iwl6000-firmware +-iwl6000g2a-firmware +-iwl6000g2b-firmware +-iwl6050-firmware +-iwl7260-firmware +-libertas-sd8686-firmware +-libertas-sd8787-firmware +-libertas-usb8388-firmware +-biosdevname +-iprutils +-plymouth + +python3-jsonschema +qemu-guest-agent +dhcp-client +cockpit-ws +cockpit-system +-langpacks-* +-langpacks-en + +rocky-release +rng-tools +%end + +%post --erroronfail +passwd -d root +passwd -l root + +# pvgrub support +echo -n "Creating grub.conf for pvgrub" +rootuuid=$( awk '$2=="/" { print $1 };' /etc/fstab ) +mkdir /boot/grub +echo -e 'default=0\ntimeout=0\n\n' > /boot/grub/grub.conf +for kv in $( ls -1v /boot/vmlinuz* |grep -v rescue |sed s/.*vmlinuz-// ); do + echo "title Rocky Linux 8 ($kv)" >> /boot/grub/grub.conf + echo -e "\troot (hd0)" >> /boot/grub/grub.conf + echo -e "\tkernel /boot/vmlinuz-$kv ro root=$rootuuid console=hvc0 LANG=en_US.UTF-8" >> /boot/grub/grub.conf + echo -e "\tinitrd /boot/initramfs-$kv.img" >> /boot/grub/grub.conf + echo +done +ln -sf grub.conf /boot/grub/menu.lst +ln -sf /boot/grub/grub.conf /etc/grub.conf + +# setup systemd to boot to the right runlevel +rm -f /etc/systemd/system/default.target +ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target +echo . + +dnf -C -y remove linux-firmware + +# Remove firewalld; it is required to be present for install/image building. +# but we dont ship it in cloud +dnf -C -y remove firewalld --setopt="clean_requirements_on_remove=1" +dnf -C -y remove avahi\* +sed -i '/^#NAutoVTs=.*/ a\ +NAutoVTs=0' /etc/systemd/logind.conf + +cat > /etc/sysconfig/network << EOF +NETWORKING=yes +NOZEROCONF=yes +EOF + +# Remove build-time resolvers to fix #16948 +echo > /etc/resolv.conf + +# For cloud images, 'eth0' _is_ the predictable device name, since +# we don't want to be tied to specific virtual (!) hardware +rm -f /etc/udev/rules.d/70* +ln -s /dev/null /etc/udev/rules.d/80-net-name-slot.rules + +# simple eth0 config, again not hard-coded to the build hardware +cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF +DEVICE="eth0" +BOOTPROTO="dhcp" +ONBOOT="yes" +TYPE="Ethernet" +USERCTL="yes" +PEERDNS="yes" +IPV6INIT="no" +PERSISTENT_DHCLIENT="1" +EOF + +echo "virtual-guest" > /etc/tuned/active_profile + +# generic localhost names +cat > /etc/hosts << EOF +127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 +::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 + +EOF +echo . + +systemctl mask tmp.mount + +cat < /etc/sysconfig/kernel +# UPDATEDEFAULT specifies if new-kernel-pkg should make +# new kernels the default +UPDATEDEFAULT=yes + +# DEFAULTKERNEL specifies the default kernel package type +DEFAULTKERNEL=kernel +EOL + +# make sure firstboot doesn't start +echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot + +# rocky cloud user +echo -e 'rocky\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers +sed -i 's/name: cloud-user/name: rocky/g' /etc/cloud/cloud.cfg + +dnf clean all + +# XXX instance type markers - MUST match Rocky Infra expectation +echo 'genclo' > /etc/yum/vars/infra + +# change dhcp client retry/timeouts to resolve #6866 +cat >> /etc/dhcp/dhclient.conf << EOF + +timeout 300; +retry 60; +EOF + + +rm -rf /var/log/yum.log +rm -rf /var/lib/yum/* +rm -rf /root/install.log +rm -rf /root/install.log.syslog +rm -rf /root/anaconda-ks.cfg +rm -rf /var/log/anaconda* + +rm -f /var/lib/systemd/random-seed + +cat /dev/null > /etc/machine-id + +echo "Fixing SELinux contexts." +touch /var/log/cron +touch /var/log/boot.log +mkdir -p /var/cache/yum +/usr/sbin/fixfiles -R -a restore + +# reorder console entries +sed -i 's/console=tty0/console=tty0 console=ttyS0,115200n8/' /boot/grub2/grub.cfg + +true + +%end + -- 2.39.3 From 8037753a511459726e54846aba5eb75bc9045aeb Mon Sep 17 00:00:00 2001 From: Louis Abel Date: Fri, 11 Nov 2022 13:43:10 -0700 Subject: [PATCH 07/15] bump to 8.7 --- Rocky-8-KDE.ks | 10 +++++----- Rocky-8-Workstation-Lite.ks | 10 +++++----- Rocky-8-Workstation-Mainline.ks | 10 +++++----- Rocky-8-Workstation.ks | 10 +++++----- Rocky-8-XFCE.ks | 10 +++++----- live/8/prod/mainline/rocky-repo-mainline.ks | 10 +++++----- live/8/prod/rocky-repo-epel.ks | 10 +++++----- live/8/prod/rocky-repo.ks | 10 +++++----- live/8/stage/mainline/rocky-repo-mainline.ks | 10 +++++----- live/8/stage/rocky-repo-epel.ks | 10 +++++----- live/8/stage/rocky-repo.ks | 10 +++++----- 11 files changed, 55 insertions(+), 55 deletions(-) diff --git a/Rocky-8-KDE.ks b/Rocky-8-KDE.ks index 926f223..54c39c6 100644 --- a/Rocky-8-KDE.ks +++ b/Rocky-8-KDE.ks @@ -15,11 +15,11 @@ network --bootproto=dhcp --device=link --activate # Firewall configuration firewall --enabled --service=mdns # Use network installation -url --url="http://dl.rockylinux.org/pub/rocky/8.6/BaseOS/$basearch/os/" -repo --name="BaseOS" --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/BaseOS/$basearch/os/ --cost=200 -repo --name="AppStream" --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/AppStream/$basearch/os/ --cost=200 -repo --name="PowerTools" --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/PowerTools/$basearch/os/ --cost=200 -repo --name="extras" --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/extras/$basearch/os --cost=200 +url --url="http://dl.rockylinux.org/pub/rocky/8.7/BaseOS/$basearch/os/" +repo --name="BaseOS" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/BaseOS/$basearch/os/ --cost=200 +repo --name="AppStream" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/AppStream/$basearch/os/ --cost=200 +repo --name="PowerTools" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/PowerTools/$basearch/os/ --cost=200 +repo --name="extras" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/extras/$basearch/os --cost=200 repo --name="epel" --baseurl=https://dl.fedoraproject.org/pub/epel/8/Everything/$basearch/ --cost=200 repo --name="epel-modular" --baseurl=https://dl.fedoraproject.org/pub/epel/8/Modular/$basearch/ --cost=200 # System timezone diff --git a/Rocky-8-Workstation-Lite.ks b/Rocky-8-Workstation-Lite.ks index 1275916..5c143e5 100644 --- a/Rocky-8-Workstation-Lite.ks +++ b/Rocky-8-Workstation-Lite.ks @@ -15,11 +15,11 @@ network --bootproto=dhcp --device=link --activate # Firewall configuration firewall --enabled --service=mdns # Use network installation -url --url="http://dl.rockylinux.org/pub/rocky/8.6/BaseOS/$basearch/os/" -repo --name="BaseOS" --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/BaseOS/$basearch/os/ --cost=200 -repo --name="AppStream" --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/AppStream/$basearch/os/ --cost=200 -repo --name="PowerTools" --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/PowerTools/$basearch/os/ --cost=200 -repo --name="extras" --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/extras/$basearch/os --cost=200 +url --url="http://dl.rockylinux.org/pub/rocky/8.7/BaseOS/$basearch/os/" +repo --name="BaseOS" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/BaseOS/$basearch/os/ --cost=200 +repo --name="AppStream" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/AppStream/$basearch/os/ --cost=200 +repo --name="PowerTools" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/PowerTools/$basearch/os/ --cost=200 +repo --name="extras" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/extras/$basearch/os --cost=200 # System timezone timezone US/Eastern # SELinux configuration diff --git a/Rocky-8-Workstation-Mainline.ks b/Rocky-8-Workstation-Mainline.ks index d4d0b69..e9958f6 100644 --- a/Rocky-8-Workstation-Mainline.ks +++ b/Rocky-8-Workstation-Mainline.ks @@ -21,13 +21,13 @@ selinux --enforcing # System services services --disabled="sshd" --enabled="NetworkManager,ModemManager" -repo --name="BaseOS" --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/BaseOS/$basearch/os/ --cost=200 -repo --name="AppStream" --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/AppStream/$basearch/os/ --cost=200 -repo --name="PowerTools" --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/PowerTools/$basearch/os/ --cost=200 -repo --name="extras" --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/extras/$basearch/os --cost=200 +repo --name="BaseOS" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/BaseOS/$basearch/os/ --cost=200 +repo --name="AppStream" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/AppStream/$basearch/os/ --cost=200 +repo --name="PowerTools" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/PowerTools/$basearch/os/ --cost=200 +repo --name="extras" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/extras/$basearch/os --cost=200 repo --name="elrepo-kernel" --baseurl=https://elrepo.org/linux/kernel/el8/$basearch/ --cost=200 # Use network installation -url --url="http://dl.rockylinux.org/pub/rocky/8.6/BaseOS/$basearch/os/" +url --url="http://dl.rockylinux.org/pub/rocky/8.7/BaseOS/$basearch/os/" # System bootloader configuration bootloader --location=none # Clear the Master Boot Record diff --git a/Rocky-8-Workstation.ks b/Rocky-8-Workstation.ks index d007f33..acc57a2 100644 --- a/Rocky-8-Workstation.ks +++ b/Rocky-8-Workstation.ks @@ -15,11 +15,11 @@ network --bootproto=dhcp --device=link --activate # Firewall configuration firewall --enabled --service=mdns # Use network installation -url --url="http://dl.rockylinux.org/pub/rocky/8.6/BaseOS/$basearch/os/" -repo --name="BaseOS" --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/BaseOS/$basearch/os/ --cost=200 -repo --name="AppStream" --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/AppStream/$basearch/os/ --cost=200 -repo --name="PowerTools" --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/PowerTools/$basearch/os/ --cost=200 -repo --name="extras" --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/extras/$basearch/os --cost=200 +url --url="http://dl.rockylinux.org/pub/rocky/8.7/BaseOS/$basearch/os/" +repo --name="BaseOS" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/BaseOS/$basearch/os/ --cost=200 +repo --name="AppStream" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/AppStream/$basearch/os/ --cost=200 +repo --name="PowerTools" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/PowerTools/$basearch/os/ --cost=200 +repo --name="extras" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/extras/$basearch/os --cost=200 # System timezone timezone US/Eastern # SELinux configuration diff --git a/Rocky-8-XFCE.ks b/Rocky-8-XFCE.ks index 8e4c6f6..18d2e95 100644 --- a/Rocky-8-XFCE.ks +++ b/Rocky-8-XFCE.ks @@ -15,11 +15,11 @@ network --bootproto=dhcp --device=link --activate # Firewall configuration firewall --enabled --service=mdns # Use network installation -url --url="http://dl.rockylinux.org/pub/rocky/8.6/BaseOS/$basearch/os/" -repo --name="BaseOS" --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/BaseOS/$basearch/os/ --cost=200 -repo --name="AppStream" --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/AppStream/$basearch/os/ --cost=200 -repo --name="PowerTools" --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/PowerTools/$basearch/os/ --cost=200 -repo --name="extras" --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/extras/$basearch/os --cost=200 +url --url="http://dl.rockylinux.org/pub/rocky/8.7/BaseOS/$basearch/os/" +repo --name="BaseOS" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/BaseOS/$basearch/os/ --cost=200 +repo --name="AppStream" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/AppStream/$basearch/os/ --cost=200 +repo --name="PowerTools" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/PowerTools/$basearch/os/ --cost=200 +repo --name="extras" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/extras/$basearch/os --cost=200 repo --name="epel" --baseurl=https://dl.fedoraproject.org/pub/epel/8/Everything/$basearch/ --cost=200 repo --name="epel-modular" --baseurl=https://dl.fedoraproject.org/pub/epel/8/Modular/$basearch/ --cost=200 # System timezone diff --git a/live/8/prod/mainline/rocky-repo-mainline.ks b/live/8/prod/mainline/rocky-repo-mainline.ks index 8157eec..10f6a5d 100644 --- a/live/8/prod/mainline/rocky-repo-mainline.ks +++ b/live/8/prod/mainline/rocky-repo-mainline.ks @@ -1,14 +1,14 @@ # These should change based on the major/minor release # Deps repo, there are some anaconda packages that are *not* available by default -repo --name=BaseOS --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/BaseOS/$basearch/os/ -repo --name=AppStream --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/AppStream/$basearch/os/ -repo --name=PowerTools --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/PowerTools/$basearch/os/ -repo --name=extras --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/extras/$basearch/os +repo --name=BaseOS --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/BaseOS/$basearch/os/ +repo --name=AppStream --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/AppStream/$basearch/os/ +repo --name=PowerTools --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/PowerTools/$basearch/os/ +repo --name=extras --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/extras/$basearch/os # ELRepo repo --name="elrepo-kernel" --baseurl=https://elrepo.org/linux/kernel/el8/$basearch/ --cost=200 # URL to the base os repo -url --url=http://dl.rockylinux.org/pub/rocky/8.6/BaseOS/$basearch/os/ +url --url=http://dl.rockylinux.org/pub/rocky/8.7/BaseOS/$basearch/os/ #url --url=http://10.100.0.1/pub/deps diff --git a/live/8/prod/rocky-repo-epel.ks b/live/8/prod/rocky-repo-epel.ks index 8fe92a0..2608d6c 100644 --- a/live/8/prod/rocky-repo-epel.ks +++ b/live/8/prod/rocky-repo-epel.ks @@ -1,15 +1,15 @@ # These should change based on the major/minor release # Deps repo, there are some anaconda packages that are *not* available by default -repo --name=BaseOS --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/BaseOS/$basearch/os/ -repo --name=AppStream --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/AppStream/$basearch/os/ -repo --name=PowerTools --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/PowerTools/$basearch/os/ -repo --name=extras --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/extras/$basearch/os +repo --name=BaseOS --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/BaseOS/$basearch/os/ +repo --name=AppStream --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/AppStream/$basearch/os/ +repo --name=PowerTools --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/PowerTools/$basearch/os/ +repo --name=extras --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/extras/$basearch/os # EPEL (required for KDE and XFCE) repo --name=epel --cost=200 --baseurl=https://dl.fedoraproject.org/pub/epel/8/Everything/$basearch/ repo --name=epel-modular --cost=200 --baseurl=https://dl.fedoraproject.org/pub/epel/8/Modular/$basearch/ # URL to the base os repo -url --url=http://dl.rockylinux.org/pub/rocky/8.6/BaseOS/$basearch/os/ +url --url=http://dl.rockylinux.org/pub/rocky/8.7/BaseOS/$basearch/os/ #url --url=http://10.100.0.1/pub/deps diff --git a/live/8/prod/rocky-repo.ks b/live/8/prod/rocky-repo.ks index 134bb27..0da5f4b 100644 --- a/live/8/prod/rocky-repo.ks +++ b/live/8/prod/rocky-repo.ks @@ -1,10 +1,10 @@ # These should change based on the major/minor release # Base repos -repo --name=BaseOS --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/BaseOS/$basearch/os/ -repo --name=AppStream --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/AppStream/$basearch/os/ -repo --name=PowerTools --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/PowerTools/$basearch/os/ -repo --name=extras --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/extras/$basearch/os +repo --name=BaseOS --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/BaseOS/$basearch/os/ +repo --name=AppStream --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/AppStream/$basearch/os/ +repo --name=PowerTools --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/PowerTools/$basearch/os/ +repo --name=extras --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/extras/$basearch/os # URL to the base os repo -url --url=http://dl.rockylinux.org/pub/rocky/8.6/BaseOS/$basearch/os/ +url --url=http://dl.rockylinux.org/pub/rocky/8.7/BaseOS/$basearch/os/ diff --git a/live/8/stage/mainline/rocky-repo-mainline.ks b/live/8/stage/mainline/rocky-repo-mainline.ks index 9473d22..082abe9 100644 --- a/live/8/stage/mainline/rocky-repo-mainline.ks +++ b/live/8/stage/mainline/rocky-repo-mainline.ks @@ -1,14 +1,14 @@ # These should change based on the major/minor release # Deps repo, there are some anaconda packages that are *not* available by default -repo --name=BaseOS --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/8.6/BaseOS/$basearch/os/ -repo --name=AppStream --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/8.6/AppStream/$basearch/os/ -repo --name=PowerTools --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/8.6/PowerTools/$basearch/os/ -repo --name=extras --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/8.6/extras/$basearch/os +repo --name=BaseOS --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/8.7/BaseOS/$basearch/os/ +repo --name=AppStream --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/8.7/AppStream/$basearch/os/ +repo --name=PowerTools --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/8.7/PowerTools/$basearch/os/ +repo --name=extras --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/8.7/extras/$basearch/os # ELRepo repo --name="elrepo-kernel" --baseurl=https://elrepo.org/linux/kernel/el8/$basearch/ --cost=200 # URL to the base os repo -url --url=http://dl.rockylinux.org/stg/rocky/8.6/BaseOS/$basearch/os/ +url --url=http://dl.rockylinux.org/stg/rocky/8.7/BaseOS/$basearch/os/ #url --url=http://10.100.0.1/pub/deps diff --git a/live/8/stage/rocky-repo-epel.ks b/live/8/stage/rocky-repo-epel.ks index a104f83..bd3b1fa 100644 --- a/live/8/stage/rocky-repo-epel.ks +++ b/live/8/stage/rocky-repo-epel.ks @@ -1,15 +1,15 @@ # These should change based on the major/minor release # Deps repo, there are some anaconda packages that are *not* available by default -repo --name=BaseOS --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/8.6/BaseOS/$basearch/os/ -repo --name=AppStream --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/8.6/AppStream/$basearch/os/ -repo --name=PowerTools --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/8.6/PowerTools/$basearch/os/ -repo --name=extras --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/8.6/extras/$basearch/os +repo --name=BaseOS --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/8.7/BaseOS/$basearch/os/ +repo --name=AppStream --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/8.7/AppStream/$basearch/os/ +repo --name=PowerTools --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/8.7/PowerTools/$basearch/os/ +repo --name=extras --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/8.7/extras/$basearch/os # EPEL (required for KDE and XFCE) repo --name=epel --cost=200 --baseurl=https://dl.fedoraproject.org/pub/epel/8/Everything/$basearch/ repo --name=epel-modular --cost=200 --baseurl=https://dl.fedoraproject.org/pub/epel/8/Modular/$basearch/ # URL to the base os repo -url --url=http://dl.rockylinux.org/stg/rocky/8.6/BaseOS/$basearch/os/ +url --url=http://dl.rockylinux.org/stg/rocky/8.7/BaseOS/$basearch/os/ #url --url=http://10.100.0.1/pub/deps diff --git a/live/8/stage/rocky-repo.ks b/live/8/stage/rocky-repo.ks index 7d96b47..647dbc1 100644 --- a/live/8/stage/rocky-repo.ks +++ b/live/8/stage/rocky-repo.ks @@ -1,10 +1,10 @@ # These should change based on the major/minor release # Base repos -repo --name=BaseOS --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/8.6/BaseOS/$basearch/os/ -repo --name=AppStream --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/8.6/AppStream/$basearch/os/ -repo --name=PowerTools --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/8.6/PowerTools/$basearch/os/ -repo --name=extras --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/8.6/extras/$basearch/os +repo --name=BaseOS --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/8.7/BaseOS/$basearch/os/ +repo --name=AppStream --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/8.7/AppStream/$basearch/os/ +repo --name=PowerTools --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/8.7/PowerTools/$basearch/os/ +repo --name=extras --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/8.7/extras/$basearch/os # URL to the base os repo -url --url=http://dl.rockylinux.org/stg/rocky/8.6/BaseOS/$basearch/os/ +url --url=http://dl.rockylinux.org/stg/rocky/8.7/BaseOS/$basearch/os/ -- 2.39.3 From 7b2c3008d924e6e0993c384dc55c354cb1aa923a Mon Sep 17 00:00:00 2001 From: Louis Abel Date: Sat, 12 Nov 2022 00:50:37 -0700 Subject: [PATCH 08/15] add mate --- Rocky-8-MATE.ks | 553 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 553 insertions(+) create mode 100644 Rocky-8-MATE.ks diff --git a/Rocky-8-MATE.ks b/Rocky-8-MATE.ks new file mode 100644 index 0000000..7821987 --- /dev/null +++ b/Rocky-8-MATE.ks @@ -0,0 +1,553 @@ +# Generated by pykickstart v3.36 +#version=DEVEL +# X Window System configuration information +xconfig --startxonboot +# Keyboard layouts +keyboard 'us' +# Root password +rootpw --iscrypted --lock locked +# System language +lang en_US.UTF-8 +# Shutdown after installation +shutdown +# Network information +network --bootproto=dhcp --device=link --activate +# Firewall configuration +firewall --enabled --service=mdns +# Use network installation +url --url="http://dl.rockylinux.org/pub/rocky/8.7/BaseOS/$basearch/os/" +repo --name="BaseOS" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/BaseOS/$basearch/os/ --cost=200 +repo --name="AppStream" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/AppStream/$basearch/os/ --cost=200 +repo --name="PowerTools" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/PowerTools/$basearch/os/ --cost=200 +repo --name="extras" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/extras/$basearch/os --cost=200 +repo --name="epel" --baseurl=https://dl.fedoraproject.org/pub/epel/8/Everything/$basearch/ --cost=200 +# System timezone +timezone US/Eastern +# SELinux configuration +selinux --enforcing +# System services +services --disabled="sshd" --enabled="NetworkManager,ModemManager" +# System bootloader configuration +bootloader --location=none +# Clear the Master Boot Record +zerombr +# Partition clearing information +clearpart --all +# Disk partitioning information +part / --fstype="ext4" --size=5120 +part / --size=7168 + +%post +# FIXME: it'd be better to get this installed from a package +cat > /etc/rc.d/init.d/livesys << EOF +#!/bin/bash +# +# live: Init script for live image +# +# chkconfig: 345 00 99 +# description: Init script for live image. +### BEGIN INIT INFO +# X-Start-Before: display-manager chronyd +### END INIT INFO + +. /etc/init.d/functions + +if ! strstr "\`cat /proc/cmdline\`" rd.live.image || [ "\$1" != "start" ]; then + exit 0 +fi + +if [ -e /.liveimg-configured ] ; then + configdone=1 +fi + +exists() { + which \$1 >/dev/null 2>&1 || return + \$* +} + +livedir="LiveOS" +for arg in \`cat /proc/cmdline\` ; do + if [ "\${arg##rd.live.dir=}" != "\${arg}" ]; then + livedir=\${arg##rd.live.dir=} + continue + fi + if [ "\${arg##live_dir=}" != "\${arg}" ]; then + livedir=\${arg##live_dir=} + fi +done + +# Enable swap unless requested otherwise +swaps=\`blkid -t TYPE=swap -o device\` +if ! strstr "\`cat /proc/cmdline\`" noswap && [ -n "\$swaps" ] ; then + for s in \$swaps ; do + action "Enabling swap partition \$s" swapon \$s + done +fi +if ! strstr "\`cat /proc/cmdline\`" noswap && [ -f /run/initramfs/live/\${livedir}/swap.img ] ; then + action "Enabling swap file" swapon /run/initramfs/live/\${livedir}/swap.img +fi + +# Support for persistent homes +mountPersistentHome() { + # support label/uuid + if [ "\${homedev##LABEL=}" != "\${homedev}" -o "\${homedev##UUID=}" != "\${homedev}" ]; then + homedev=\`/sbin/blkid -o device -t "\$homedev"\` + fi + + # if we're given a file rather than a blockdev, loopback it + if [ "\${homedev##mtd}" != "\${homedev}" ]; then + # mtd devs don't have a block device but get magic-mounted with -t jffs2 + mountopts="-t jffs2" + elif [ ! -b "\$homedev" ]; then + loopdev=\`losetup -f\` + if [ "\${homedev##/run/initramfs/live}" != "\${homedev}" ]; then + action "Remounting live store r/w" mount -o remount,rw /run/initramfs/live + fi + losetup \$loopdev \$homedev + homedev=\$loopdev + fi + + # if it's encrypted, we need to unlock it + if [ "\$(/sbin/blkid -s TYPE -o value \$homedev 2>/dev/null)" = "crypto_LUKS" ]; then + echo + echo "Setting up encrypted /home device" + plymouth ask-for-password --command="cryptsetup luksOpen \$homedev EncHome" + homedev=/dev/mapper/EncHome + fi + + # and finally do the mount + mount \$mountopts \$homedev /home + # if we have /home under what's passed for persistent home, then + # we should make that the real /home. useful for mtd device on olpc + if [ -d /home/home ]; then mount --bind /home/home /home ; fi + [ -x /sbin/restorecon ] && /sbin/restorecon /home + if [ -d /home/liveuser ]; then USERADDARGS="-M" ; fi +} + +# Help locate persistent homes +findPersistentHome() { + for arg in \`cat /proc/cmdline\` ; do + if [ "\${arg##persistenthome=}" != "\${arg}" ]; then + homedev=\${arg##persistenthome=} + fi + done +} + +if strstr "\`cat /proc/cmdline\`" persistenthome= ; then + findPersistentHome +elif [ -e /run/initramfs/live/\${livedir}/home.img ]; then + homedev=/run/initramfs/live/\${livedir}/home.img +fi + +# Mount the persistent home if it's available +if ! strstr "\`cat /proc/cmdline\`" nopersistenthome && [ -n "\$homedev" ] ; then + action "Mounting persistent /home" mountPersistentHome +fi + +if [ -n "\$configdone" ]; then + exit 0 +fi + +# Create the liveuser (no password) so automatic logins and sudo works +action "Adding live user" useradd \$USERADDARGS -c "Live System User" liveuser +passwd -d liveuser > /dev/null +usermod -aG wheel liveuser > /dev/null + +# Same for root +passwd -d root > /dev/null + +# Turn off firstboot (similar to a DVD/minimal install, where it asks +# for the user to accept the EULA before bringing up a TTY) +systemctl --no-reload disable firstboot-text.service 2> /dev/null || : +systemctl --no-reload disable firstboot-graphical.service 2> /dev/null || : +systemctl stop firstboot-text.service 2> /dev/null || : +systemctl stop firstboot-graphical.service 2> /dev/null || : + +# Prelinking damages the images +sed -i 's/PRELINKING=yes/PRELINKING=no/' /etc/sysconfig/prelink &>/dev/null || : + +# Turn off mdmonitor by default +systemctl --no-reload disable mdmonitor.service 2> /dev/null || : +systemctl --no-reload disable mdmonitor-takeover.service 2> /dev/null || : +systemctl stop mdmonitor.service 2> /dev/null || : +systemctl stop mdmonitor-takeover.service 2> /dev/null || : + +# Even if there isn't gnome, this doesn't hurt. +gsettings set org.gnome.software download-updates 'false' || : + +# Disable cron +systemctl --no-reload disable crond.service 2> /dev/null || : +systemctl --no-reload disable atd.service 2> /dev/null || : +systemctl stop crond.service 2> /dev/null || : +systemctl stop atd.service 2> /dev/null || : + +# Disable abrt +systemctl --no-reload disable abrtd.service 2> /dev/null || : +systemctl stop abrtd.service 2> /dev/null || : + +# Don't sync the system clock when running live (RHBZ #1018162) +sed -i 's/rtcsync//' /etc/chrony.conf + +# Mark things as configured +touch /.liveimg-configured + +# add static hostname to work around xauth bug +# https://bugzilla.redhat.com/show_bug.cgi?id=679486 +# the hostname must be something else than 'localhost' +# https://bugzilla.redhat.com/show_bug.cgi?id=1370222 +echo "localhost-live" > /etc/hostname + +EOF + +# HAL likes to start late. +cat > /etc/rc.d/init.d/livesys-late << EOF +#!/bin/bash +# +# live: Late init script for live image +# +# chkconfig: 345 99 01 +# description: Late init script for live image. + +. /etc/init.d/functions + +if ! strstr "\`cat /proc/cmdline\`" rd.live.image || [ "\$1" != "start" ] || [ -e /.liveimg-late-configured ] ; then + exit 0 +fi + +exists() { + which \$1 >/dev/null 2>&1 || return + \$* +} + +touch /.liveimg-late-configured + +# Read some stuff out of the kernel cmdline +for o in \`cat /proc/cmdline\` ; do + case \$o in + ks=*) + ks="--kickstart=\${o#ks=}" + ;; + xdriver=*) + xdriver="\${o#xdriver=}" + ;; + esac +done + +# If liveinst or textinst is given, start installer +if strstr "\`cat /proc/cmdline\`" liveinst ; then + plymouth --quit + /usr/sbin/liveinst \$ks +fi +if strstr "\`cat /proc/cmdline\`" textinst ; then + plymouth --quit + /usr/sbin/liveinst --text \$ks +fi + +# Configure X, allowing user to override xdriver +if [ -n "\$xdriver" ]; then + cat > /etc/X11/xorg.conf.d/00-xdriver.conf <> /etc/fstab << EOF +vartmp /var/tmp tmpfs defaults 0 0 +EOF + +# PackageKit likes to play games. Let's fix that. +rm -f /var/lib/rpm/__db* +releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release) +basearch=$(uname -i) +rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial +echo "Packages within this LiveCD" +rpm -qa +# Note that running rpm recreates the rpm db files which aren't needed or wanted +rm -f /var/lib/rpm/__db* + +# go ahead and pre-make the man -k cache (#455968) +/usr/bin/mandb + +# make sure there aren't core files lying around +rm -f /core* + +# remove random seed, the newly installed instance should make it's own +rm -f /var/lib/systemd/random-seed + +# convince readahead not to collect +# FIXME: for systemd + +echo 'File created by kickstart. See systemd-update-done.service(8).' \ + | tee /etc/.updated >/var/.updated + +# Drop the rescue kernel and initramfs, we don't need them on the live media itself. +# See bug 1317709 +rm -f /boot/*-rescue* + +# Disable network service here, as doing it in the services line +# fails due to RHBZ #1369794 - the error is expected +/sbin/chkconfig network off + +# Remove machine-id on generated images +rm -f /etc/machine-id +touch /etc/machine-id + +%end + +%post --nochroot +cp $INSTALL_ROOT/usr/share/licenses/*-release/* $LIVE_ROOT/ + +# only works on x86_64 +if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then + # For livecd-creator builds + if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi + cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS + + # For lorax/livemedia-creator builds + sed -i ' + /## make boot.iso/ i\ + # Add livecd-iso-to-disk script to .iso filesystem at /LiveOS/\ + <% f = "usr/bin/livecd-iso-to-disk" %>\ + %if exists(f):\ + install ${f} ${LIVEDIR}/${f|basename}\ + %endif\ + ' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl +fi + +%end + +%post +# mate configuration + +cat >> /etc/rc.d/init.d/livesys << EOF +# make the installer show up +if [ -f /usr/share/applications/liveinst.desktop ]; then + # Show harddisk install in shell dash + sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop "" +fi +mkdir /home/liveuser/Desktop +cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop +chmod +x /home/liveuser/Desktop/liveinst.desktop + +# move to anaconda - probably not required for MATE. +mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop + +if [ -f /usr/share/anaconda/gnome/fedora-welcome.desktop ]; then + mkdir -p ~liveuser/.config/autostart + cp /usr/share/anaconda/gnome/fedora-welcome.desktop /usr/share/applications/ + cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/ +fi + +# rebuild schema cache with any overrides we installed +glib-compile-schemas /usr/share/glib-2.0/schemas + +# set up lightdm autologin +sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf +sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf +sed -i 's/^#show-language-selector=.*/show-language-selector=true/' /etc/lightdm/lightdm-gtk-greeter.conf + +# set MATE as default session, otherwise login will fail +sed -i 's/^#user-session=.*/user-session=mate/' /etc/lightdm/lightdm.conf + +# Turn off PackageKit-command-not-found while uninstalled +if [ -f /etc/PackageKit/CommandNotFound.conf ]; then + sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf +fi + +# The updater applet might or might not exist +rm -f /etc/xdg/autostart/org.mageia.dnfdragora-updater.desktop + +# reset selinux contexts +chown -R liveuser:liveuser /home/liveuser/ +restorecon -R /home/liveuser/ + +EOF + +# this doesn't come up automatically. not sure why. +systemctl enable --force lightdm.service + +# CRB needs to be enabled for EPEL to function. +dnf config-manager --set-enabled powertools + +%end + +%packages +@anaconda-tools +@base-x +@core +@dial-up +@fonts +@guest-desktop-agents +@hardware-support +@input-methods +@multimedia +@standard +NetworkManager-adsl +NetworkManager-bluetooth +NetworkManager-l2tp-gnome +NetworkManager-libreswan-gnome +NetworkManager-openconnect-gnome +NetworkManager-openvpn-gnome +NetworkManager-ovs +NetworkManager-ppp +NetworkManager-pptp-gnome +NetworkManager-team +NetworkManager-wifi +NetworkManager-wwan +aajohan-comfortaa-fonts +anaconda +anaconda-install-env-deps +anaconda-live +atril +atril-caja +atril-thumbnailer +caja +caja-actions +chkconfig +dconf-editor +dracut-live +efi-filesystem +efibootmgr +efivar-libs +engrampa +eom +epel-release +f36-backgrounds-extras-mate +f36-backgrounds-mate +filezilla +firefox +firewall-applet +firewall-config +glibc-all-langpacks +gnome-disk-utility +gnome-epub-thumbnailer +gparted +grub2-common +grub2-efi-*64 +grub2-efi-*64-cdboot +grub2-pc-modules +grub2-tools +grub2-tools-efi +grub2-tools-extra +grub2-tools-minimal +grubby +gstreamer1-plugins-ugly-free +gtk2-engines +gucharmap +gvfs-fuse +gvfs-gphoto2 +gvfs-mtp +gvfs-smb +hexchat +initial-setup-gui +initscripts +kernel +kernel-modules +kernel-modules-extra +libmatekbd +libmatemixer +libmateweather +libreoffice-calc +libreoffice-emailmerge +libreoffice-graphicfilter +libreoffice-impress +libreoffice-writer +libsecret +lightdm +lm_sensors +marco +mate-applets +mate-backgrounds +mate-calc +mate-control-center +mate-desktop +mate-dictionary +mate-disk-usage-analyzer +mate-icon-theme +mate-media +mate-menus +mate-menus-preferences-category-menu +mate-notification-daemon +mate-panel +mate-polkit +mate-power-manager +mate-screensaver +mate-screenshot +mate-search-tool +mate-sensors-applet +mate-session-manager +mate-settings-daemon +mate-system-log +mate-system-monitor +mate-terminal +mate-themes +mate-user-admin +mate-user-guide +mate-utils +memtest86+ +mozo +network-manager-applet +nm-connection-editor +orca +p7zip +p7zip-plugins +parole +pavucontrol +pipewire +pluma +pluma-plugins +rocky-backgrounds +seahorse +seahorse-caja +setroubleshoot +shim-*64 +slick-greeter-mate +syslinux +thunderbird +tigervnc +usermode-gtk +vim-enhanced +xdg-user-dirs-gtk +xmodmap +xrdb +yelp +-@3d-printing +-@admin-tools +-audacious +-brasero +-evolution-help +-fedora-icon-theme +-gnome-icon-theme +-gnome-icon-theme-symbolic +-gnome-logs +-gnome-software +-gnome-user-docs +-hplip +-isdn4k-utils +-mpage +-sane-backends +-shim-unsigned-*64 +-systemd-oomd-defaults +-telnet +-xane-gimp +-xsane + +%end -- 2.39.3 From 9da709ac7886f575a785655c44e694e7ef225006 Mon Sep 17 00:00:00 2001 From: Neil Hanlon Date: Sat, 12 Nov 2022 11:15:07 -0500 Subject: [PATCH 09/15] Always use stg --- Rocky-8-Azure-LVM.ks | 2 +- Rocky-8-Azure.ks | 2 +- Rocky-8-GenericCloud-LVM.ks | 2 +- Rocky-8-GenericCloud.ks | 2 +- Rocky-8-KDE.ks | 2 +- Rocky-8-MATE.ks | 2 +- Rocky-8-OCP.ks | 2 +- Rocky-8-Vagrant-Vbox.ks | 2 +- Rocky-8-Workstation-Lite.ks | 2 +- Rocky-8-Workstation-Mainline.ks | 2 +- Rocky-8-Workstation.ks | 2 +- Rocky-8-XFCE.ks | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Rocky-8-Azure-LVM.ks b/Rocky-8-Azure-LVM.ks index 640e9f9..97905f1 100644 --- a/Rocky-8-Azure-LVM.ks +++ b/Rocky-8-Azure-LVM.ks @@ -1,5 +1,5 @@ text -url --url http://dl.rockylinux.org/pub/rocky/8/BaseOS/$basearch/os/ +url --url https://dl.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ auth --enableshadow --passalgo=sha512 shutdown diff --git a/Rocky-8-Azure.ks b/Rocky-8-Azure.ks index 3aeb563..8d56f77 100644 --- a/Rocky-8-Azure.ks +++ b/Rocky-8-Azure.ks @@ -1,5 +1,5 @@ text -url --url http://dl.rockylinux.org/pub/rocky/8/BaseOS/$basearch/os/ +url --url https://dl.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ auth --enableshadow --passalgo=sha512 shutdown diff --git a/Rocky-8-GenericCloud-LVM.ks b/Rocky-8-GenericCloud-LVM.ks index b6e1783..1499a81 100644 --- a/Rocky-8-GenericCloud-LVM.ks +++ b/Rocky-8-GenericCloud-LVM.ks @@ -24,7 +24,7 @@ volgroup rocky pv.01 logvol / --vgname=rocky --size=8000 --name=root --grow shutdown -url --url http://dl.rockylinux.org/pub/rocky/8/BaseOS/$basearch/os/ +url --url https://dl.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ %packages @core diff --git a/Rocky-8-GenericCloud.ks b/Rocky-8-GenericCloud.ks index c6f74b3..053aad6 100644 --- a/Rocky-8-GenericCloud.ks +++ b/Rocky-8-GenericCloud.ks @@ -22,7 +22,7 @@ reqpart part / --fstype="xfs" --ondisk=vda --size=8000 --grow shutdown -url --url http://dl.rockylinux.org/pub/rocky/8/BaseOS/$basearch/os/ +url --url https://dl.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ %packages @core diff --git a/Rocky-8-KDE.ks b/Rocky-8-KDE.ks index 54c39c6..e452d90 100644 --- a/Rocky-8-KDE.ks +++ b/Rocky-8-KDE.ks @@ -15,7 +15,7 @@ network --bootproto=dhcp --device=link --activate # Firewall configuration firewall --enabled --service=mdns # Use network installation -url --url="http://dl.rockylinux.org/pub/rocky/8.7/BaseOS/$basearch/os/" +url --url https://dl.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ repo --name="BaseOS" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/BaseOS/$basearch/os/ --cost=200 repo --name="AppStream" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/AppStream/$basearch/os/ --cost=200 repo --name="PowerTools" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/PowerTools/$basearch/os/ --cost=200 diff --git a/Rocky-8-MATE.ks b/Rocky-8-MATE.ks index 7821987..d22552d 100644 --- a/Rocky-8-MATE.ks +++ b/Rocky-8-MATE.ks @@ -15,7 +15,7 @@ network --bootproto=dhcp --device=link --activate # Firewall configuration firewall --enabled --service=mdns # Use network installation -url --url="http://dl.rockylinux.org/pub/rocky/8.7/BaseOS/$basearch/os/" +url --url https://dl.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ repo --name="BaseOS" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/BaseOS/$basearch/os/ --cost=200 repo --name="AppStream" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/AppStream/$basearch/os/ --cost=200 repo --name="PowerTools" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/PowerTools/$basearch/os/ --cost=200 diff --git a/Rocky-8-OCP.ks b/Rocky-8-OCP.ks index 5ea40fb..95962a1 100644 --- a/Rocky-8-OCP.ks +++ b/Rocky-8-OCP.ks @@ -3,7 +3,7 @@ repo --name="BaseOS" --baseurl=http://dl.rockylinux.org/pub/rocky/8/BaseOS/$base repo --name="AppStream" --baseurl=http://dl.rockylinux.org/pub/rocky/8/AppStream/$basearch/os/ repo --name="oraclelinux-addons" --baseurl=http://yum.oracle.com/repo/OracleLinux/OL8/addons/$basearch/ --install --includepkgs="oci-utils" -url --url http://dl.rockylinux.org/pub/rocky/8/BaseOS/$basearch/os/ +url --url https://dl.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ auth --enableshadow --passalgo=sha512 reboot diff --git a/Rocky-8-Vagrant-Vbox.ks b/Rocky-8-Vagrant-Vbox.ks index 94ad14f..0b45926 100644 --- a/Rocky-8-Vagrant-Vbox.ks +++ b/Rocky-8-Vagrant-Vbox.ks @@ -1,4 +1,4 @@ -url --url=http://dl.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os +url --url https://dl.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ repo --name=AppStream --baseurl=http://dl.rockylinux.org/pub/rocky/8/AppStream/x86_64/os text keyboard --vckeymap us diff --git a/Rocky-8-Workstation-Lite.ks b/Rocky-8-Workstation-Lite.ks index 5c143e5..6dc087a 100644 --- a/Rocky-8-Workstation-Lite.ks +++ b/Rocky-8-Workstation-Lite.ks @@ -15,7 +15,7 @@ network --bootproto=dhcp --device=link --activate # Firewall configuration firewall --enabled --service=mdns # Use network installation -url --url="http://dl.rockylinux.org/pub/rocky/8.7/BaseOS/$basearch/os/" +url --url https://dl.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ repo --name="BaseOS" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/BaseOS/$basearch/os/ --cost=200 repo --name="AppStream" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/AppStream/$basearch/os/ --cost=200 repo --name="PowerTools" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/PowerTools/$basearch/os/ --cost=200 diff --git a/Rocky-8-Workstation-Mainline.ks b/Rocky-8-Workstation-Mainline.ks index e9958f6..ab04db0 100644 --- a/Rocky-8-Workstation-Mainline.ks +++ b/Rocky-8-Workstation-Mainline.ks @@ -27,7 +27,7 @@ repo --name="PowerTools" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/PowerT repo --name="extras" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/extras/$basearch/os --cost=200 repo --name="elrepo-kernel" --baseurl=https://elrepo.org/linux/kernel/el8/$basearch/ --cost=200 # Use network installation -url --url="http://dl.rockylinux.org/pub/rocky/8.7/BaseOS/$basearch/os/" +url --url https://dl.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ # System bootloader configuration bootloader --location=none # Clear the Master Boot Record diff --git a/Rocky-8-Workstation.ks b/Rocky-8-Workstation.ks index acc57a2..5f20245 100644 --- a/Rocky-8-Workstation.ks +++ b/Rocky-8-Workstation.ks @@ -15,7 +15,7 @@ network --bootproto=dhcp --device=link --activate # Firewall configuration firewall --enabled --service=mdns # Use network installation -url --url="http://dl.rockylinux.org/pub/rocky/8.7/BaseOS/$basearch/os/" +url --url https://dl.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ repo --name="BaseOS" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/BaseOS/$basearch/os/ --cost=200 repo --name="AppStream" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/AppStream/$basearch/os/ --cost=200 repo --name="PowerTools" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/PowerTools/$basearch/os/ --cost=200 diff --git a/Rocky-8-XFCE.ks b/Rocky-8-XFCE.ks index 18d2e95..79d1345 100644 --- a/Rocky-8-XFCE.ks +++ b/Rocky-8-XFCE.ks @@ -15,7 +15,7 @@ network --bootproto=dhcp --device=link --activate # Firewall configuration firewall --enabled --service=mdns # Use network installation -url --url="http://dl.rockylinux.org/pub/rocky/8.7/BaseOS/$basearch/os/" +url --url https://dl.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ repo --name="BaseOS" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/BaseOS/$basearch/os/ --cost=200 repo --name="AppStream" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/AppStream/$basearch/os/ --cost=200 repo --name="PowerTools" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/PowerTools/$basearch/os/ --cost=200 -- 2.39.3 From de39e0426946c17c9c257b993dd937fa22b2cc08 Mon Sep 17 00:00:00 2001 From: Neil Hanlon Date: Sat, 12 Nov 2022 11:21:52 -0500 Subject: [PATCH 10/15] Rename these so they can build as variant with empanadas --- Rocky-8-Azure.ks => Rocky-8-Azure-Base.ks | 0 Rocky-8-EC2.ks => Rocky-8-EC2-Base.ks | 0 Rocky-8-GenericCloud.ks => Rocky-8-GenericCloud-Base.ks | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename Rocky-8-Azure.ks => Rocky-8-Azure-Base.ks (100%) rename Rocky-8-EC2.ks => Rocky-8-EC2-Base.ks (100%) rename Rocky-8-GenericCloud.ks => Rocky-8-GenericCloud-Base.ks (100%) diff --git a/Rocky-8-Azure.ks b/Rocky-8-Azure-Base.ks similarity index 100% rename from Rocky-8-Azure.ks rename to Rocky-8-Azure-Base.ks diff --git a/Rocky-8-EC2.ks b/Rocky-8-EC2-Base.ks similarity index 100% rename from Rocky-8-EC2.ks rename to Rocky-8-EC2-Base.ks diff --git a/Rocky-8-GenericCloud.ks b/Rocky-8-GenericCloud-Base.ks similarity index 100% rename from Rocky-8-GenericCloud.ks rename to Rocky-8-GenericCloud-Base.ks -- 2.39.3 From d0a188ba1dec7afa48153d5f10862c684cdc08c7 Mon Sep 17 00:00:00 2001 From: Neil Hanlon Date: Sat, 12 Nov 2022 16:24:04 -0500 Subject: [PATCH 11/15] Revert "Rename these so they can build as variant with empanadas" This reverts commit de39e0426946c17c9c257b993dd937fa22b2cc08. --- Rocky-8-Azure-Base.ks => Rocky-8-Azure.ks | 0 Rocky-8-EC2-Base.ks => Rocky-8-EC2.ks | 0 Rocky-8-GenericCloud-Base.ks => Rocky-8-GenericCloud.ks | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename Rocky-8-Azure-Base.ks => Rocky-8-Azure.ks (100%) rename Rocky-8-EC2-Base.ks => Rocky-8-EC2.ks (100%) rename Rocky-8-GenericCloud-Base.ks => Rocky-8-GenericCloud.ks (100%) diff --git a/Rocky-8-Azure-Base.ks b/Rocky-8-Azure.ks similarity index 100% rename from Rocky-8-Azure-Base.ks rename to Rocky-8-Azure.ks diff --git a/Rocky-8-EC2-Base.ks b/Rocky-8-EC2.ks similarity index 100% rename from Rocky-8-EC2-Base.ks rename to Rocky-8-EC2.ks diff --git a/Rocky-8-GenericCloud-Base.ks b/Rocky-8-GenericCloud.ks similarity index 100% rename from Rocky-8-GenericCloud-Base.ks rename to Rocky-8-GenericCloud.ks -- 2.39.3 From a2672d7d98fdc35888cc15302820f271bcf6edd7 Mon Sep 17 00:00:00 2001 From: Neil Hanlon Date: Sat, 12 Nov 2022 16:31:34 -0500 Subject: [PATCH 12/15] try pointing to this hostname? --- Rocky-8-Azure-LVM.ks | 2 +- Rocky-8-Azure.ks | 2 +- Rocky-8-Container-Base.ks | 2 +- Rocky-8-Container-Minimal.ks | 2 +- Rocky-8-Container-UBI.ks | 2 +- Rocky-8-GenericCloud-LVM.ks | 2 +- Rocky-8-GenericCloud.ks | 2 +- Rocky-8-KDE.ks | 2 +- Rocky-8-MATE.ks | 2 +- Rocky-8-OCP.ks | 2 +- Rocky-8-Vagrant-Vbox.ks | 2 +- Rocky-8-Workstation-Lite.ks | 2 +- Rocky-8-Workstation-Mainline.ks | 2 +- Rocky-8-Workstation.ks | 2 +- Rocky-8-XFCE.ks | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Rocky-8-Azure-LVM.ks b/Rocky-8-Azure-LVM.ks index 97905f1..88b398e 100644 --- a/Rocky-8-Azure-LVM.ks +++ b/Rocky-8-Azure-LVM.ks @@ -1,5 +1,5 @@ text -url --url https://dl.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ +url --url https://download.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ auth --enableshadow --passalgo=sha512 shutdown diff --git a/Rocky-8-Azure.ks b/Rocky-8-Azure.ks index 8d56f77..d347c71 100644 --- a/Rocky-8-Azure.ks +++ b/Rocky-8-Azure.ks @@ -1,5 +1,5 @@ text -url --url https://dl.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ +url --url https://download.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ auth --enableshadow --passalgo=sha512 shutdown diff --git a/Rocky-8-Container-Base.ks b/Rocky-8-Container-Base.ks index 2d6deda..dd21130 100644 --- a/Rocky-8-Container-Base.ks +++ b/Rocky-8-Container-Base.ks @@ -3,7 +3,7 @@ # To use this kickstart, run make # Basic setup information -url --url https://dl.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ +url --url https://download.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ text bootloader --disable diff --git a/Rocky-8-Container-Minimal.ks b/Rocky-8-Container-Minimal.ks index a0b05d2..b36c23a 100644 --- a/Rocky-8-Container-Minimal.ks +++ b/Rocky-8-Container-Minimal.ks @@ -3,7 +3,7 @@ # To use this kickstart, run make # Basic setup information -url --url https://dl.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ +url --url https://download.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ text bootloader --disable diff --git a/Rocky-8-Container-UBI.ks b/Rocky-8-Container-UBI.ks index 0410b1a..108ccf8 100644 --- a/Rocky-8-Container-UBI.ks +++ b/Rocky-8-Container-UBI.ks @@ -3,7 +3,7 @@ # To use this kickstart, run make # Basic setup information -url --url https://dl.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ +url --url https://download.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ text bootloader --disable diff --git a/Rocky-8-GenericCloud-LVM.ks b/Rocky-8-GenericCloud-LVM.ks index 1499a81..5373938 100644 --- a/Rocky-8-GenericCloud-LVM.ks +++ b/Rocky-8-GenericCloud-LVM.ks @@ -24,7 +24,7 @@ volgroup rocky pv.01 logvol / --vgname=rocky --size=8000 --name=root --grow shutdown -url --url https://dl.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ +url --url https://download.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ %packages @core diff --git a/Rocky-8-GenericCloud.ks b/Rocky-8-GenericCloud.ks index 053aad6..8f0386d 100644 --- a/Rocky-8-GenericCloud.ks +++ b/Rocky-8-GenericCloud.ks @@ -22,7 +22,7 @@ reqpart part / --fstype="xfs" --ondisk=vda --size=8000 --grow shutdown -url --url https://dl.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ +url --url https://download.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ %packages @core diff --git a/Rocky-8-KDE.ks b/Rocky-8-KDE.ks index e452d90..7ae884c 100644 --- a/Rocky-8-KDE.ks +++ b/Rocky-8-KDE.ks @@ -15,7 +15,7 @@ network --bootproto=dhcp --device=link --activate # Firewall configuration firewall --enabled --service=mdns # Use network installation -url --url https://dl.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ +url --url https://download.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ repo --name="BaseOS" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/BaseOS/$basearch/os/ --cost=200 repo --name="AppStream" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/AppStream/$basearch/os/ --cost=200 repo --name="PowerTools" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/PowerTools/$basearch/os/ --cost=200 diff --git a/Rocky-8-MATE.ks b/Rocky-8-MATE.ks index d22552d..e3c72e5 100644 --- a/Rocky-8-MATE.ks +++ b/Rocky-8-MATE.ks @@ -15,7 +15,7 @@ network --bootproto=dhcp --device=link --activate # Firewall configuration firewall --enabled --service=mdns # Use network installation -url --url https://dl.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ +url --url https://download.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ repo --name="BaseOS" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/BaseOS/$basearch/os/ --cost=200 repo --name="AppStream" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/AppStream/$basearch/os/ --cost=200 repo --name="PowerTools" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/PowerTools/$basearch/os/ --cost=200 diff --git a/Rocky-8-OCP.ks b/Rocky-8-OCP.ks index 95962a1..5480920 100644 --- a/Rocky-8-OCP.ks +++ b/Rocky-8-OCP.ks @@ -3,7 +3,7 @@ repo --name="BaseOS" --baseurl=http://dl.rockylinux.org/pub/rocky/8/BaseOS/$base repo --name="AppStream" --baseurl=http://dl.rockylinux.org/pub/rocky/8/AppStream/$basearch/os/ repo --name="oraclelinux-addons" --baseurl=http://yum.oracle.com/repo/OracleLinux/OL8/addons/$basearch/ --install --includepkgs="oci-utils" -url --url https://dl.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ +url --url https://download.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ auth --enableshadow --passalgo=sha512 reboot diff --git a/Rocky-8-Vagrant-Vbox.ks b/Rocky-8-Vagrant-Vbox.ks index 0b45926..d498eee 100644 --- a/Rocky-8-Vagrant-Vbox.ks +++ b/Rocky-8-Vagrant-Vbox.ks @@ -1,4 +1,4 @@ -url --url https://dl.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ +url --url https://download.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ repo --name=AppStream --baseurl=http://dl.rockylinux.org/pub/rocky/8/AppStream/x86_64/os text keyboard --vckeymap us diff --git a/Rocky-8-Workstation-Lite.ks b/Rocky-8-Workstation-Lite.ks index 6dc087a..a37825e 100644 --- a/Rocky-8-Workstation-Lite.ks +++ b/Rocky-8-Workstation-Lite.ks @@ -15,7 +15,7 @@ network --bootproto=dhcp --device=link --activate # Firewall configuration firewall --enabled --service=mdns # Use network installation -url --url https://dl.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ +url --url https://download.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ repo --name="BaseOS" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/BaseOS/$basearch/os/ --cost=200 repo --name="AppStream" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/AppStream/$basearch/os/ --cost=200 repo --name="PowerTools" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/PowerTools/$basearch/os/ --cost=200 diff --git a/Rocky-8-Workstation-Mainline.ks b/Rocky-8-Workstation-Mainline.ks index ab04db0..5558131 100644 --- a/Rocky-8-Workstation-Mainline.ks +++ b/Rocky-8-Workstation-Mainline.ks @@ -27,7 +27,7 @@ repo --name="PowerTools" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/PowerT repo --name="extras" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/extras/$basearch/os --cost=200 repo --name="elrepo-kernel" --baseurl=https://elrepo.org/linux/kernel/el8/$basearch/ --cost=200 # Use network installation -url --url https://dl.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ +url --url https://download.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ # System bootloader configuration bootloader --location=none # Clear the Master Boot Record diff --git a/Rocky-8-Workstation.ks b/Rocky-8-Workstation.ks index 5f20245..e1cf41b 100644 --- a/Rocky-8-Workstation.ks +++ b/Rocky-8-Workstation.ks @@ -15,7 +15,7 @@ network --bootproto=dhcp --device=link --activate # Firewall configuration firewall --enabled --service=mdns # Use network installation -url --url https://dl.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ +url --url https://download.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ repo --name="BaseOS" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/BaseOS/$basearch/os/ --cost=200 repo --name="AppStream" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/AppStream/$basearch/os/ --cost=200 repo --name="PowerTools" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/PowerTools/$basearch/os/ --cost=200 diff --git a/Rocky-8-XFCE.ks b/Rocky-8-XFCE.ks index 79d1345..d54291e 100644 --- a/Rocky-8-XFCE.ks +++ b/Rocky-8-XFCE.ks @@ -15,7 +15,7 @@ network --bootproto=dhcp --device=link --activate # Firewall configuration firewall --enabled --service=mdns # Use network installation -url --url https://dl.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ +url --url https://download.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ repo --name="BaseOS" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/BaseOS/$basearch/os/ --cost=200 repo --name="AppStream" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/AppStream/$basearch/os/ --cost=200 repo --name="PowerTools" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/PowerTools/$basearch/os/ --cost=200 -- 2.39.3 From 3071659e9bb46ebfd6da565abc14aca36b6c2d54 Mon Sep 17 00:00:00 2001 From: Neil Hanlon Date: Sat, 12 Nov 2022 16:36:31 -0500 Subject: [PATCH 13/15] add missing URL back to EC2 images --- Rocky-8-EC2-LVM.ks | 2 ++ Rocky-8-EC2.ks | 2 ++ 2 files changed, 4 insertions(+) diff --git a/Rocky-8-EC2-LVM.ks b/Rocky-8-EC2-LVM.ks index 2f1582a..cf18833 100644 --- a/Rocky-8-EC2-LVM.ks +++ b/Rocky-8-EC2-LVM.ks @@ -23,6 +23,8 @@ part pv.01 --size=1 --ondisk=vda --asprimary --grow volgroup rocky pv.01 logvol / --vgname=rocky --size=8000 --name=root --grow +url --url https://download.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ + %pre --erroronfail /usr/sbin/parted -s /dev/vda mklabel gpt %end diff --git a/Rocky-8-EC2.ks b/Rocky-8-EC2.ks index 8d4b6fc..cfa48ce 100644 --- a/Rocky-8-EC2.ks +++ b/Rocky-8-EC2.ks @@ -21,6 +21,8 @@ clearpart --all --initlabel reqpart part / --fstype="xfs" --ondisk=vda --size=8000 --grow +url --url https://download.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ + %pre --erroronfail /usr/sbin/parted -s /dev/vda mklabel gpt %end -- 2.39.3 From 38c00378fa40c538120a25a2321fbeb649c0e09c Mon Sep 17 00:00:00 2001 From: Neil Hanlon Date: Sat, 12 Nov 2022 16:44:35 -0500 Subject: [PATCH 14/15] :see-no-evil --- Rocky-8-OCP.ks | 2 -- 1 file changed, 2 deletions(-) diff --git a/Rocky-8-OCP.ks b/Rocky-8-OCP.ks index 5480920..c82ce5f 100644 --- a/Rocky-8-OCP.ks +++ b/Rocky-8-OCP.ks @@ -1,6 +1,4 @@ text -repo --name="BaseOS" --baseurl=http://dl.rockylinux.org/pub/rocky/8/BaseOS/$basearch/os/ -repo --name="AppStream" --baseurl=http://dl.rockylinux.org/pub/rocky/8/AppStream/$basearch/os/ repo --name="oraclelinux-addons" --baseurl=http://yum.oracle.com/repo/OracleLinux/OL8/addons/$basearch/ --install --includepkgs="oci-utils" url --url https://download.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ -- 2.39.3 From bb8518757853585c7cf2eedb038a2eb12540c9b0 Mon Sep 17 00:00:00 2001 From: Neil Hanlon Date: Sat, 12 Nov 2022 17:27:31 -0500 Subject: [PATCH 15/15] add urls to Vagrant kickstarts --- Rocky-8-Vagrant-Libvirt.ks | 2 ++ Rocky-8-Vagrant-VMware.ks | 1 + Rocky-8-Vagrant-Vbox.ks | 1 + 3 files changed, 4 insertions(+) diff --git a/Rocky-8-Vagrant-Libvirt.ks b/Rocky-8-Vagrant-Libvirt.ks index 5e651b8..b0a1aed 100644 --- a/Rocky-8-Vagrant-Libvirt.ks +++ b/Rocky-8-Vagrant-Libvirt.ks @@ -19,6 +19,8 @@ user --name=vagrant --plaintext --password=vagrant shutdown +url --url https://download.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ + %packages --instLangs=en bash-completion man-pages diff --git a/Rocky-8-Vagrant-VMware.ks b/Rocky-8-Vagrant-VMware.ks index 34a3ceb..b1d0ace 100644 --- a/Rocky-8-Vagrant-VMware.ks +++ b/Rocky-8-Vagrant-VMware.ks @@ -18,6 +18,7 @@ part / --fstype=xfs --asprimary --size=1024 --grow user --name=vagrant --plaintext --password=vagrant shutdown +url --url https://download.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ %packages --instLangs=en bash-completion diff --git a/Rocky-8-Vagrant-Vbox.ks b/Rocky-8-Vagrant-Vbox.ks index d498eee..b93a847 100644 --- a/Rocky-8-Vagrant-Vbox.ks +++ b/Rocky-8-Vagrant-Vbox.ks @@ -20,6 +20,7 @@ part / --fstype=xfs --asprimary --size=1024 --grow user --name=vagrant --plaintext --password=vagrant reboot +url --url https://download.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ %packages --instLangs=en bash-completion -- 2.39.3