From ad9ec4011ee0d07d97107e992e8a884864af6e8d Mon Sep 17 00:00:00 2001 From: Noel Miller Date: Mon, 29 Apr 2024 15:25:02 -0500 Subject: [PATCH 1/5] feat: remove root password option from installer --- .github/workflows/build_iso.yml | 1 + installer/lorax_templates/remove_root_password_prompt.tmpl | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 installer/lorax_templates/remove_root_password_prompt.tmpl diff --git a/.github/workflows/build_iso.yml b/.github/workflows/build_iso.yml index 35059faa..62c23d33 100644 --- a/.github/workflows/build_iso.yml +++ b/.github/workflows/build_iso.yml @@ -128,6 +128,7 @@ jobs: flatpak_remote_refs_dir: ${{ steps.generate-flatpak-dir-shortname.outputs.flatpak-dir-shortname }} enable_flatpak_dependencies: "false" extra_boot_params: ${{ steps.generate-extra-params.outputs.extra-boot-params }} + additional_templates: 'installer/lorax_templates/remote_root_password_prompt.tmpl' - name: Move ISOs to Upload Directory id: upload-directory diff --git a/installer/lorax_templates/remove_root_password_prompt.tmpl b/installer/lorax_templates/remove_root_password_prompt.tmpl new file mode 100644 index 00000000..9981e98d --- /dev/null +++ b/installer/lorax_templates/remove_root_password_prompt.tmpl @@ -0,0 +1,4 @@ +<%page args="variant"/> +%if variant == "Kinoite": +append etc/anaconda/profile.d/fedora-kinoite.conf "[User Interface]\\nhidden_spokes =\\n PasswordSpoke" +%endif From e1cbc25b8ff4d07b614ac85f08cf714b82e1025f Mon Sep 17 00:00:00 2001 From: Noel Miller Date: Mon, 29 Apr 2024 15:49:07 -0500 Subject: [PATCH 2/5] fix: fully qualify path --- .github/workflows/build_iso.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_iso.yml b/.github/workflows/build_iso.yml index 62c23d33..13fa714e 100644 --- a/.github/workflows/build_iso.yml +++ b/.github/workflows/build_iso.yml @@ -128,7 +128,7 @@ jobs: flatpak_remote_refs_dir: ${{ steps.generate-flatpak-dir-shortname.outputs.flatpak-dir-shortname }} enable_flatpak_dependencies: "false" extra_boot_params: ${{ steps.generate-extra-params.outputs.extra-boot-params }} - additional_templates: 'installer/lorax_templates/remote_root_password_prompt.tmpl' + additional_templates: '/github/workspace/installer/lorax_templates/remote_root_password_prompt.tmpl' - name: Move ISOs to Upload Directory id: upload-directory From f49e0c0f2512ba83b525291a34dffdc186c7ee60 Mon Sep 17 00:00:00 2001 From: Noel Miller Date: Mon, 29 Apr 2024 16:15:25 -0500 Subject: [PATCH 3/5] fix: fix typo --- .github/workflows/build_iso.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_iso.yml b/.github/workflows/build_iso.yml index 13fa714e..3f967d53 100644 --- a/.github/workflows/build_iso.yml +++ b/.github/workflows/build_iso.yml @@ -128,7 +128,7 @@ jobs: flatpak_remote_refs_dir: ${{ steps.generate-flatpak-dir-shortname.outputs.flatpak-dir-shortname }} enable_flatpak_dependencies: "false" extra_boot_params: ${{ steps.generate-extra-params.outputs.extra-boot-params }} - additional_templates: '/github/workspace/installer/lorax_templates/remote_root_password_prompt.tmpl' + additional_templates: '/github/workspace/installer/lorax_templates/remove_root_password_prompt.tmpl' - name: Move ISOs to Upload Directory id: upload-directory From 224e8838454267fd3e195c35da4c6124fdb1cb36 Mon Sep 17 00:00:00 2001 From: Noel Miller Date: Mon, 29 Apr 2024 16:46:45 -0500 Subject: [PATCH 4/5] fix: disable requirement for testing branch --- .github/workflows/build_iso.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_iso.yml b/.github/workflows/build_iso.yml index 3f967d53..34cdae56 100644 --- a/.github/workflows/build_iso.yml +++ b/.github/workflows/build_iso.yml @@ -141,7 +141,7 @@ jobs: echo "iso-upload-dir=${ISO_UPLOAD_DIR}" >> $GITHUB_OUTPUT - name: Upload ISOs and Checksum to Job Artifacts - if: github.ref_name == 'testing' + #if: github.ref_name == 'testing' #if: github.event_name == 'pull_request' uses: actions/upload-artifact@v4 with: From ca4434389e3762f1af878c10d25494d1a3e502a2 Mon Sep 17 00:00:00 2001 From: Noel Miller Date: Mon, 29 Apr 2024 17:36:06 -0500 Subject: [PATCH 5/5] fix: simplify code and add if back for testing --- .github/workflows/build_iso.yml | 2 +- installer/lorax_templates/remove_root_password_prompt.tmpl | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_iso.yml b/.github/workflows/build_iso.yml index 34cdae56..3f967d53 100644 --- a/.github/workflows/build_iso.yml +++ b/.github/workflows/build_iso.yml @@ -141,7 +141,7 @@ jobs: echo "iso-upload-dir=${ISO_UPLOAD_DIR}" >> $GITHUB_OUTPUT - name: Upload ISOs and Checksum to Job Artifacts - #if: github.ref_name == 'testing' + if: github.ref_name == 'testing' #if: github.event_name == 'pull_request' uses: actions/upload-artifact@v4 with: diff --git a/installer/lorax_templates/remove_root_password_prompt.tmpl b/installer/lorax_templates/remove_root_password_prompt.tmpl index 9981e98d..3bd0342a 100644 --- a/installer/lorax_templates/remove_root_password_prompt.tmpl +++ b/installer/lorax_templates/remove_root_password_prompt.tmpl @@ -1,4 +1 @@ -<%page args="variant"/> -%if variant == "Kinoite": -append etc/anaconda/profile.d/fedora-kinoite.conf "[User Interface]\\nhidden_spokes =\\n PasswordSpoke" -%endif +append etc/anaconda/profile.d/fedora-kinoite.conf "\\n[User Interface]\\nhidden_spokes =\\n PasswordSpoke"