From e4bbf85cbefc6df11a7388cc32d89f874b452e3f Mon Sep 17 00:00:00 2001 From: Bryan Date: Mon, 8 May 2023 18:25:45 -0400 Subject: [PATCH] removed r8 from r9 branch --- includes/basecommon8.ksi | 10 -------- includes/gen-packages8.ksi | 16 ------------- includes/gen-partitions8.ksi | 6 ----- includes/gen-postcommon8.ksi | 45 ----------------------------------- includes/gen-reposcommon8.ksi | 1 - includes/gen-rockycommon8.ksi | 9 ------- includes/packages8.ksi | 17 ------------- includes/postcommon8.ksi | 10 -------- includes/precommon8.ksi | 4 ---- includes/rockyreadme8.ksi | 11 --------- includes/rockyrepos8.ksi | 6 ----- 11 files changed, 135 deletions(-) delete mode 100644 includes/basecommon8.ksi delete mode 100644 includes/gen-packages8.ksi delete mode 100644 includes/gen-partitions8.ksi delete mode 100644 includes/gen-postcommon8.ksi delete mode 100644 includes/gen-reposcommon8.ksi delete mode 100644 includes/gen-rockycommon8.ksi delete mode 100644 includes/packages8.ksi delete mode 100644 includes/postcommon8.ksi delete mode 100644 includes/precommon8.ksi delete mode 100644 includes/rockyreadme8.ksi delete mode 100644 includes/rockyrepos8.ksi diff --git a/includes/basecommon8.ksi b/includes/basecommon8.ksi deleted file mode 100644 index 2788eb5..0000000 --- a/includes/basecommon8.ksi +++ /dev/null @@ -1,10 +0,0 @@ -install -keyboard us --xlayouts=us --vckeymap=us -timezone --isUtc --nontp UTC -selinux --enforcing -firewall --enabled --port=22:tcp -network --bootproto=dhcp --device=link --activate --onboot=on -services --enabled=sshd,NetworkManager,chronyd -shutdown -bootloader --location=mbr --driveorder=sda -lang en_US.UTF-8 diff --git a/includes/gen-packages8.ksi b/includes/gen-packages8.ksi deleted file mode 100644 index 544ee80..0000000 --- a/includes/gen-packages8.ksi +++ /dev/null @@ -1,16 +0,0 @@ -# Package setup -%packages -dracut-config-generic -kernel -kernel-core -grub2-common -grub2-efi-aa64 -grub2-efi-aa64-modules -grubby -efibootmgr -shim-aa64 -systemd-udev -uboot-tools --dracut-config-rescue - -%end diff --git a/includes/gen-partitions8.ksi b/includes/gen-partitions8.ksi deleted file mode 100644 index e7507fc..0000000 --- a/includes/gen-partitions8.ksi +++ /dev/null @@ -1,6 +0,0 @@ -# Disk setup -clearpart --initlabel --all -part /boot/efi --asprimary --fstype=efi --size=512 -part /boot --asprimary --fstype=ext4 --size=1024 --label=boot -part swap --asprimary --fstype=swap --size=512 --label=swap -part / --asprimary --fstype=ext4 --size=3072 --label=rootfs diff --git a/includes/gen-postcommon8.ksi b/includes/gen-postcommon8.ksi deleted file mode 100644 index e22fafd..0000000 --- a/includes/gen-postcommon8.ksi +++ /dev/null @@ -1,45 +0,0 @@ -%post -# Setting correct yum variable to use raspberrypi kernel repo -#echo "generic" > /etc/dnf/vars/kvariant -# -# Generic efi filename for VMs -mkdir -p /boot/efi/EFI/BOOT -if [ -f /boot/efi/EFI/rocky/grubaa64.efi ];then - cp -f /boot/efi/EFI/rocky/grubaa64.efi /boot/efi/EFI/BOOT/BOOTAA64.EFI -fi - -cp -f /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin -cp -f /usr/share/uboot/rpi_4/u-boot.bin /boot/efi/rpi4-u-boot.bin - -rpm -e dracut-config-generic - -#setup dtb link by running "creating 10-devicetree.install" -if [ -x /lib/kernel/install.d/10-devicetree.install ];then - /lib/kernel/install.d/10-devicetree.install remove -fi - -### Write /etc/sysconfig/kernel -cat << EOF > /etc/sysconfig/kernel -# Written by image installer -# UPDATEDEFAULT specifies if new-kernel-pkg should make new kernels the default -UPDATEDEFAULT=yes - -# DEFAULTKERNEL specifies the default kernel package type -DEFAULTKERNEL=kernel-core -EOF -chmod 644 /etc/sysconfig/kernel - -### Write grub defaults, turn off OS probing as it is always wrong for image creation -cat << EOF > /etc/default/grub -GRUB_TIMEOUT=5 -GRUB_DISTRIBUTOR="$(sed 's, release .*$,,g' /etc/system-release)" -GRUB_DEFAULT=saved -GRUB_DISABLE_SUBMENU=true -GRUB_TERMINAL_OUTPUT="console" -GRUB_CMDLINE_LINUX="" -GRUB_DISABLE_RECOVERY="true" -GRUB_DISABLE_OS_PROBER="true" -GRUB_ENABLE_BLSCFG="false" -EOF -chmod 644 /etc/default/grub -%end diff --git a/includes/gen-reposcommon8.ksi b/includes/gen-reposcommon8.ksi deleted file mode 100644 index 0bab7f1..0000000 --- a/includes/gen-reposcommon8.ksi +++ /dev/null @@ -1 +0,0 @@ -repo --name="instKern" --baseurl=https://rockyrepos.gnulab.org/gen_aarch64_el8/ --cost=100 --install diff --git a/includes/gen-rockycommon8.ksi b/includes/gen-rockycommon8.ksi deleted file mode 100644 index d791100..0000000 --- a/includes/gen-rockycommon8.ksi +++ /dev/null @@ -1,9 +0,0 @@ -rootpw --plaintext rocky -%include includes/basecommon8.ksi -%include includes/gen-partitions8.ksi -%include includes/packages8.ksi -%include includes/gen-packages8.ksi -%include includes/precommon8.ksi -%include includes/rockyreadme8.ksi -%include includes/gen-postcommon8.ksi -%include includes/postcommon8.ksi diff --git a/includes/packages8.ksi b/includes/packages8.ksi deleted file mode 100644 index 699a20d..0000000 --- a/includes/packages8.ksi +++ /dev/null @@ -1,17 +0,0 @@ -# Package setup -%packages -@core -chrony -cloud-utils-growpart -net-tools -NetworkManager-wifi -nano -bash-completion -uboot-images-armv8 -bcm2711-firmware -bcm2835-firmware -bcm283x-firmware -bcm283x-overlays --java-11-* - -%end diff --git a/includes/postcommon8.ksi b/includes/postcommon8.ksi deleted file mode 100644 index a700e20..0000000 --- a/includes/postcommon8.ksi +++ /dev/null @@ -1,10 +0,0 @@ -%post -# Remove ifcfg-link on pre generated images -rm -f /etc/sysconfig/network-scripts/ifcfg-link - -# Remove machine-id on pre generated images -rm -f /etc/machine-id -touch /etc/machine-id - -%end -%include includes/rootfs-expand.ksi diff --git a/includes/precommon8.ksi b/includes/precommon8.ksi deleted file mode 100644 index 1dc6221..0000000 --- a/includes/precommon8.ksi +++ /dev/null @@ -1,4 +0,0 @@ -%pre - -#End of Pre script for partitions -%end diff --git a/includes/rockyreadme8.ksi b/includes/rockyreadme8.ksi deleted file mode 100644 index 10869a8..0000000 --- a/includes/rockyreadme8.ksi +++ /dev/null @@ -1,11 +0,0 @@ -%post -# Mandatory README file -cat >/root/README << EOF -== Rocky Linux 8 == - -If you want to automatically resize your / partition, just type the following (as root user): -rootfs-expand - -EOF - -%end diff --git a/includes/rockyrepos8.ksi b/includes/rockyrepos8.ksi deleted file mode 100644 index c7fd33e..0000000 --- a/includes/rockyrepos8.ksi +++ /dev/null @@ -1,6 +0,0 @@ -# Basic setup information -url --url="https://download.rockylinux.org/pub/rocky/8/BaseOS/aarch64/os/" -# Repositories to use -repo --name="rocky8-baseos" --baseurl=https://download.rockylinux.org/pub/rocky/8/BaseOS/aarch64/os/ -repo --name="rocky8-appstream" --baseurl=https://download.rockylinux.org/pub/rocky/8/AppStream/aarch64/os/ -repo --name="rocky8-powertools" --baseurl=https://download.rockylinux.org/pub/rocky/8/PowerTools/aarch64/os/