remove unnecessary changes

.github/workflows/test_iso.yml

@@ -90,7 +90,7 @@ jobs:
             ${{ matrix.repos != '' && format('REPOS="{0}"', matrix.repos) || '' }} \
             SECURE_BOOT_KEY_URL=${{ needs.load_vars.outputs.SECURE_BOOT_KEY_URL }} \
             VARIANT=${{ needs.load_vars.outputs.VARIANT }} \
-            VERSION=${{ matrix.version == 'eln' && '39' || matrix.version }}
+            VERSION=${{ matrix.version }}
 
       - name: Set status
         if: inputs.pr && always()

.gitignore

@@ -6,7 +6,6 @@
 /lorax_templates/post_*
 /pkglists
 /repos/*.repo
-!/repos/centos.repo
 /results
 /xorriso/input.txt
 /original-pkgsizes.txt

Makefile

@@ -94,7 +94,7 @@ $(ISO_NAME)-CHECKSUM: $(ISO_NAME)
 	cd $(dir $(ISO_NAME)) && sha256sum $(notdir $(ISO_NAME)) > $(notdir $(ISO_NAME))-CHECKSUM
 
 # Build end ISO
-$(ISO_NAME): results/images/boot.iso container/container xorriso/input.txt
+$(ISO_NAME): results/images/boot.iso container/$(IMAGE_NAME)-$(IMAGE_TAG) xorriso/input.txt
 	$(if $(wildcard $(dir $(ISO_NAME))),,mkdir -p $(dir $(ISO_NAME)); chmod ugo=rwX $(dir $(ISO_NAME)))
 	xorriso -dialog on < xorriso/input.txt
 	implantisomd5 $(ISO_NAME)

container/Makefile

@@ -1,5 +1,5 @@
-container:
-	skopeo copy docker://$(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG) oci:container
+$(IMAGE_NAME)-$(IMAGE_TAG):
+	skopeo copy docker://$(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG) oci:$(IMAGE_NAME)-$(IMAGE_TAG)
 
 install-deps:
 	$(install_pkg) skopeo

lorax_templates/install_set_installer.tmpl

@@ -1,4 +1,4 @@
 <%page args="image_name, image_tag"/>
 
-append usr/share/anaconda/interactive-defaults.ks "ostreecontainer --url=/run/install/repo/container --transport=oci --no-signature-verification"
+append usr/share/anaconda/interactive-defaults.ks "ostreecontainer --url=/run/install/repo/${image_name}-${image_tag} --transport=oci --no-signature-verification"
 

lorax_templates/rhel_disable_resolver_copy.tmpl

@@ -1,6 +0,0 @@
-append etc/anaconda/conf.d/anaconda_modules.conf "[Anaconda]"
-append etc/anaconda/conf.d/anaconda_modules.conf "kickstart_modules="
-append etc/anaconda/conf.d/anaconda_modules.conf "    org.fedoraproject.Anaconda.Modules.Network"
-append etc/anaconda/conf.d/anaconda_modules.conf "    org.fedoraproject.Anaconda.Modules.Payloads"
-append etc/anaconda/conf.d/anaconda_modules.conf "    org.fedoraproject.Anaconda.Modules.Storage"
-append etc/anaconda/conf.d/anaconda_modules.conf "    org.fedoraproject.Anaconda.Modules.Users"

repos/centos.repo

@@ -1,19 +0,0 @@
-[baseos]
-name=CentOS Stream 9 - BaseOS
-metalink=https://mirrors.centos.org/metalink?repo=centos-baseos-9-stream&arch=x86_64&protocol=https,http
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
-gpgcheck=0
-repo_gpgcheck=0
-metadata_expire=6h
-countme=1
-enabled=1
-
-[appstream]
-name=CentOS Stream 9 - AppStream
-metalink=https://mirrors.centos.org/metalink?repo=centos-appstream-9-stream&arch=x86_64&protocol=https,http
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
-gpgcheck=0
-repo_gpgcheck=0
-metadata_expire=6h
-countme=1
-enabled=1

xorriso/gen_input.sh

@@ -44,12 +44,10 @@ then
 fi
 
 pushd "${PWD}/../container" > /dev/null
-for file in $(find container -type f)
+for file in $(find "${IMAGE_NAME}-${IMAGE_TAG}" -type f)
 do
     echo "-map ${PWD}/${file} ${file}"
     echo "-chmod 0444 ${file}"
 done
 popd > /dev/null
-echo "-map ${PWD}/temp.ks temp.ks"
-echo "-chmod 0444 temp.ks"
 echo "-end"

xorriso/temp.ks

@@ -1,16 +0,0 @@
-user --name alice --password $6$4ax95Fe8EwB0S5o7$zz23FfruNX4Tp0EoiDYwRN5D6GUnUqGZHm/d7QkUdXB19lvbh2sd8K19cKSfU0sCO05n8WtMcn5jpcmh9l5I20 --iscrypted --groups wheel
-rootpw --lock
-lang en_US.UTF-8
-keyboard us
-timezone UTC
-clearpart --all
-network --device=link --bootproto=dhcp --onboot=on --activate
-reqpart --add-boot
-
-part swap --fstype=swap --size=1024
-part / --fstype=ext4 --grow
-
-reboot --eject
-%post
-bootc switch --mutate-in-place --transport registry quay.io/centos-bootc/centos-bootc:stream9
-%end