Rebase stable on dev

Author: imbev

.github/workflows/build-and-push.yaml

@@ -33,13 +33,24 @@ jobs:
           REGISTRY_IMAGE: ${{ vars.registry_image }}
           VERSION: ${{ matrix.version }}
         run: |
-          make image rechunk VERSION=${VERSION} IS_CANARY=${IS_CANARY} IS_EDGE=${IS_EDGE}
+          make image VERSION=${VERSION} IS_CANARY=${IS_CANARY} IS_EDGE=${IS_EDGE}
           export TAG=$(make echo-tag VERSION=${VERSION} IS_CANARY=${IS_CANARY} IS_EDGE=${IS_EDGE})
-
+          
           export IMAGE=$(make echo-image)
 
           echo "TAG=${TAG}" >> $GITHUB_OUTPUT
           echo "IMAGE=${IMAGE}" >> $GITHUB_OUTPUT
+      
+      - name: Run Rechunker
+        id: rechunk
+        uses: hhd-dev/rechunk@ca77507401f8700bb0b25ebecbbf980a078cd180 # v1.2.2
+        with:
+          rechunk: "ghcr.io/hhd-dev/rechunk:v1.2.2"
+          ref: ${{ steps.build.outputs.IMAGE }}:${{ steps.build.outputs.TAG }}
+          skip_compression: true
+          version: ${{ steps.build.outputs.TAG }}
+          pretty: ${{ steps.build.outputs.TAG }}
+          revision: ${{ github.sha }}
 
       - name: Login to registry
         env:
@@ -55,8 +66,9 @@ jobs:
           IS_EDGE: ${{ matrix.is_edge }}
           VERSION: ${{ matrix.version }}
         run: |
-          # RECHUNKED_IMAGE=$(sudo podman pull ${{ steps.rechunk.outputs.ref }})
+          RECHUNKED_IMAGE=$(sudo podman pull ${{ steps.rechunk.outputs.ref }})
 
-          # sudo podman image tag ${RECHUNKED_IMAGE} ${{ steps.build.outputs.IMAGE }}:${{ steps.build.outputs.TAG }}
+          sudo podman image tag ${RECHUNKED_IMAGE} ${{ steps.build.outputs.IMAGE }}:${{ steps.build.outputs.TAG }}
 
           make push VERSION=${VERSION} IS_CANARY=${IS_CANARY} IS_EDGE=${IS_EDGE}
+

.github/workflows/build-iso.yaml

@@ -4,15 +4,15 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: "HeliumOS version to build"
+        description: 'HeliumOS version to build'
         required: true
         type: string
-        default: "10"
+        default: '10'
       arch:
-        description: "CPU Architecture"
+        description: 'CPU Architecture'
         required: true
         type: string
-        default: "x86_64"
+        default: 'x86_64'
 
 jobs:
   build_iso:
@@ -21,14 +21,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Remove environment bloat
-        run: |
-          sudo rm -rf \
-            /usr/share/dotnet \
-            /usr/local/lib/android \
-            /opt/ghc \
-            /opt/hostedtoolcache/CodeQL
-
       - name: Install dependencies
         run: |
           sudo apt-get update
@@ -47,4 +39,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           path: out/HeliumOS*.iso
-          retention-days: 7
+          retention-days: 7

Makefile

@@ -29,22 +29,15 @@ echo-tag:
 
 image:
 	$(PODMAN) build \
-		--build-arg BASE=quay.io/almalinuxorg/almalinux-bootc:$(VERSION) \
+		--build-arg BASE=quay.io/almalinuxorg/almalinux-bootc:$(VERSION)-kitten \
 		--build-arg PLAYBOOK=$(PLAYBOOK).yaml \
 		--network host \
 		-f Containerfile \
 		-t $(IMAGE):$(TAG) \
 		.
 
 rechunk:
-	$(PODMAN) run \
-	    --rm \
-		--privileged \
-		-v /var/lib/containers:/var/lib/containers \
-        quay.io/almalinuxorg/almalinux-bootc:$(VERSION) \
-        /usr/libexec/bootc-base-imagectl rechunk \
-            $(IMAGE):$(TAG) \
-            $(IMAGE):$(TAG)
+	$(SUDO) IMAGE=$(IMAGE):$(TAG) ./rechunk.sh
 
 push:
 	$(PODMAN) push \
@@ -57,17 +50,16 @@ iso:
 	cp \
 		./iso/config.toml \
 		./out/config.toml
-
 	sed -i \
     "s,<URL>,$(IMAGE):$(TAG),g" \
     ./out/config.toml
 
-	$(PODMAN) pull $(IMAGE):$(TAG)
+	$(PODMAN) pull \
+		$(IMAGE):$(TAG)
 
 	$(PODMAN) run \
 		--rm \
 		-it \
-		--net host \
 		--privileged \
 		--pull=newer \
 		--security-opt label=type:unconfined_t \
@@ -79,18 +71,14 @@ iso:
 		--use-librepo=False \
 		$(IMAGE):$(TAG)
 
-	sudo mv \
-	    ./out/bootiso/install.iso \
-		./out/upstream.iso
-
 	$(PODMAN) run \
 		--rm \
 		-it \
 		--pull=newer \
 		--privileged \
 		-v ./out:/output \
 		-v ./iso:/iso \
-		quay.io/almalinuxorg/almalinux:10.1 \
+		quay.io/almalinuxorg/almalinux:10-kitten \
 		bash -c '\
 			dnf install -y lorax \
 		&& rm -rf /images && mkdir /images \
@@ -100,5 +88,5 @@ iso:
 			--add /images \
 			--volid heliumos-${VERSION}-boot \
 			--replace "vmlinuz" "vmlinuz inst.resolution=1280x800" \
-			/output/upstream.iso \
+			/output/bootiso/install.iso \
 			/output/HeliumOS-${VERSION}-${ARCH}-boot.iso'

files/branding.sh

@@ -16,9 +16,7 @@ rm -rf \
 
 sed -i 's,AlmaLinux,HeliumOS,g' \
     /usr/lib/os-release
-sed -i 's,10.1,10,g' \
-    /usr/lib/os-release
-sed -i 's, (Heliotrope Lion),,g' \
+sed -i 's, (Purple Lion),,g' \
     /usr/lib/os-release
 sed -i 's,ID="almalinux",ID="heliumos",g' \
     /usr/lib/os-release
@@ -36,6 +34,8 @@ sed -i 's,AlmaLinux,HeliumOS,g' \
     /usr/lib/os-release
 sed -i 's,https://bugs.almalinux.org/,https://bugs.heliumos.org/,g' \
     /usr/lib/os-release
+sed -i 's, Kitten,,g' \
+    /usr/lib/os-release
 sed -i 's, (Lion Cub),,g' \
     /usr/lib/os-release
 

files/etc/plymouth/plymouthd.conf

@@ -0,0 +1,2 @@
+[Daemon]
+Theme=spinner

files/usr/lib/dracut/dracut.conf.d/10-heliumos.conf

@@ -1,2 +1 @@
-force_drivers+=" nvidia nvidia_modeset nvidia_uvm nvidia_drm "
-dracutmodules+=" plymouth "
+dracutmodules+=" plymouth "

files/usr/lib/firewalld/zones/HeliumOS.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<zone>
+  <short>HeliumOS</short>
+  <description>Unsolicited incoming network packets are rejected from port 1 to 1024, except for select network services. Incoming packets that are related to outgoing network connections are accepted. Outgoing network connections are allowed.</description>
+  <service name="dhcpv6-client"/>
+  <service name="ssh"/>
+  <service name="samba-client"/>
+  <port protocol="udp" port="1025-65535"/>
+  <port protocol="tcp" port="1025-65535"/>
+  <forward/>
+</zone>

iso/config.ks

@@ -5,22 +5,17 @@ autopart --type=btrfs --nohome
 zerombr
 clearpart --none --initlabel
 
-network --hostname heliumos --bootproto=dhcp --device=link --activate
+network --bootproto=dhcp --device=link --activate
 
 rootpw --lock
 timezone America/Chicago
 
-%addon com_redhat_kdump --disable
-%end
-
 %post
 
 bootc switch --mutate-in-place --transport registry <URL>
-
 rm -f /var/lib/systemd/random-seed
 
 %end
-
 """
 
 [customizations.installer.modules]