diff --git a/.github/workflows/iso.yml b/.github/workflows/iso.yml index 4290856..3b3295d 100644 --- a/.github/workflows/iso.yml +++ b/.github/workflows/iso.yml @@ -13,6 +13,7 @@ env: IMAGE_ARCH: x86_64 IMAGE_NAME: base-main IMAGE_REPO: ghcr.io/ublue-os + VARIANT: Server jobs: @@ -54,7 +55,8 @@ jobs: arch=${IMAGE_ARCH} \ version=${IMAGE_VERSION} \ image_repo=${IMAGE_REPO} \ - image_name=${IMAGE_NAME} + image_name=${IMAGE_NAME} \ + variant=${VARIANT} - name: Create boot.iso run: | @@ -62,7 +64,8 @@ jobs: arch=${IMAGE_ARCH} \ version=${IMAGE_VERSION} \ image_repo=${IMAGE_REPO} \ - image_name=${IMAGE_NAME} + image_name=${IMAGE_NAME} \ + variant=${VARIANT} - name: Create deploy.iso run: | @@ -70,7 +73,8 @@ jobs: arch=${IMAGE_ARCH} \ version=${IMAGE_VERSION} \ image_repo=${IMAGE_REPO} \ - image_name=${IMAGE_NAME} + image_name=${IMAGE_NAME} \ + variant=${VARIANT} - name: Upload ISO as artifact uses: actions/upload-artifact@v4 diff --git a/Makefile b/Makefile index 7ef438e..3f5cd1b 100644 --- a/Makefile +++ b/Makefile @@ -3,13 +3,14 @@ version = 39 base_dir = $(shell pwd) image_repo = ghcr.io/ublue-os image_name = base-main +variant = Server deploy.iso: boot.iso xorriso/input.txt $(image_name)-$(version) xorriso -dialog on < xorriso/input.txt boot.iso: lorax_templates/set_installer.tmpl rm -Rf results - lorax -p Fedora -v $(version) -r $(version) -t Server \ + lorax -p Fedora -v $(version) -r $(version) -t $(variant) \ --isfinal --buildarch=$(arch) --volid=Fedora-S-dvd-$(arch)-$(version) \ --macboot --noupgrade \ --repo /etc/yum.repos.d/fedora.repo \