From 52679d67ab4eff9102a3d1bacc84e3fd2ea159b3 Mon Sep 17 00:00:00 2001 From: "Jason N." <33561705+JasonN3@users.noreply.github.com> Date: Thu, 9 May 2024 13:13:57 -0400 Subject: [PATCH] remove unnecessary changes --- .github/workflows/test_iso.yml | 2 +- .gitignore | 1 - Makefile | 2 +- container/Makefile | 4 ++-- lorax_templates/install_set_installer.tmpl | 2 +- .../rhel_disable_resolver_copy.tmpl | 6 ------ repos/centos.repo | 19 ------------------- xorriso/gen_input.sh | 4 +--- xorriso/temp.ks | 16 ---------------- 9 files changed, 6 insertions(+), 50 deletions(-) delete mode 100644 lorax_templates/rhel_disable_resolver_copy.tmpl delete mode 100644 repos/centos.repo delete mode 100644 xorriso/temp.ks diff --git a/.github/workflows/test_iso.yml b/.github/workflows/test_iso.yml index fff2abd..3b072d7 100644 --- a/.github/workflows/test_iso.yml +++ b/.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() diff --git a/.gitignore b/.gitignore index 1bb3dd7..df805b5 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,6 @@ /lorax_templates/post_* /pkglists /repos/*.repo -!/repos/centos.repo /results /xorriso/input.txt /original-pkgsizes.txt diff --git a/Makefile b/Makefile index 362ee48..7886947 100644 --- a/Makefile +++ b/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) diff --git a/container/Makefile b/container/Makefile index 53920b0..88024a0 100644 --- a/container/Makefile +++ b/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 diff --git a/lorax_templates/install_set_installer.tmpl b/lorax_templates/install_set_installer.tmpl index 8fc8afc..fafd61e 100644 --- a/lorax_templates/install_set_installer.tmpl +++ b/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" diff --git a/lorax_templates/rhel_disable_resolver_copy.tmpl b/lorax_templates/rhel_disable_resolver_copy.tmpl deleted file mode 100644 index f25333f..0000000 --- a/lorax_templates/rhel_disable_resolver_copy.tmpl +++ /dev/null @@ -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" \ No newline at end of file diff --git a/repos/centos.repo b/repos/centos.repo deleted file mode 100644 index f9a5ee1..0000000 --- a/repos/centos.repo +++ /dev/null @@ -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 \ No newline at end of file diff --git a/xorriso/gen_input.sh b/xorriso/gen_input.sh index 42e5826..0329186 100644 --- a/xorriso/gen_input.sh +++ b/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" diff --git a/xorriso/temp.ks b/xorriso/temp.ks deleted file mode 100644 index 1ff723f..0000000 --- a/xorriso/temp.ks +++ /dev/null @@ -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