end to end install works

Author: binarypie

Containerfile

@@ -51,8 +51,7 @@ RUN --mount=type=bind,from=ctx,source=/,target=/ctx \
     --mount=type=cache,dst=/var/cache/libdnf5 \
     --mount=type=cache,dst=/var/cache/rpm-ostree \
     --mount=type=tmpfs,dst=/tmp \
-    /ctx/build_files/shared/build.sh && \
-    ostree container commit
+    /ctx/build_files/shared/build.sh
 
 # Final validation
 RUN bootc container lint

Justfile

@@ -5,7 +5,7 @@
 export repo_organization := env("REPO_ORGANIZATION", "binarypie-dev")
 export image_name := env("IMAGE_NAME", "hypercube")
 export fedora_version := env("FEDORA_VERSION", "43")
-export akmods_flavor := env("AKMODS_FLAVOR", "coreos-stable")
+export akmods_flavor := env("AKMODS_FLAVOR", "main")
 
 # Runtime detection
 export SUDO := if `id -u` == "0" { "" } else { "sudo" }
@@ -137,6 +137,23 @@ run-iso-local iso_file:
         --boot uefi \
         --autoconsole graphical
 
+# Restart the test VM and connect to console
+[group('VM')]
+restart-vm:
+    #!/usr/bin/bash
+    set -euo pipefail
+    VM_NAME="hypercube-test"
+
+    echo "Stopping VM..."
+    virsh destroy "${VM_NAME}" 2>/dev/null || true
+    sleep 1
+
+    echo "Starting VM..."
+    virsh start "${VM_NAME}"
+
+    echo "Connecting to console..."
+    virt-viewer "${VM_NAME}"
+
 # Delete the test VM and its disk
 [group('VM')]
 delete-test-vm:

build_files/base/00-kernel-akmods.sh

@@ -8,14 +8,13 @@ set -eoux pipefail
 echo "Installing kernel, akmods, and NVIDIA drivers..."
 
 FEDORA_VERSION="$(rpm -E %fedora)"
-AKMODS_FLAVOR="${AKMODS_FLAVOR:-coreos-stable}"
+AKMODS_FLAVOR="${AKMODS_FLAVOR:-main}"
 
-# Remove existing kernel packages
-for pkg in kernel kernel-core kernel-modules kernel-modules-core kernel-modules-extra; do
-    rpm --erase "$pkg" --nodeps || true
-done
+# Get current kernel version from base image (don't replace it)
+KERNEL_VERSION=$(rpm -q kernel-core --queryformat "%{VERSION}-%{RELEASE}.%{ARCH}" | tail -n 1)
+echo "Using base image kernel: ${KERNEL_VERSION}"
 
-# Fetch akmods container (contains kernel RPMs and kmods)
+# Fetch akmods container (contains kmods for this kernel)
 skopeo copy --retry-times 3 \
     docker://ghcr.io/ublue-os/akmods:"${AKMODS_FLAVOR}"-"${FEDORA_VERSION}" \
     dir:/tmp/akmods
@@ -24,24 +23,6 @@ AKMODS_TARGZ=$(jq -r '.layers[].digest' </tmp/akmods/manifest.json | cut -d : -f
 tar -xvzf /tmp/akmods/"$AKMODS_TARGZ" -C /tmp/
 mv /tmp/rpms/* /tmp/akmods/
 
-# Install kernel from akmods cache
-# Use rpm directly to skip scriptlets that try to run dracut (fails in container builds)
-rpm -ivh --nodeps --noscripts \
-    /tmp/kernel-rpms/kernel-[0-9]*.rpm \
-    /tmp/kernel-rpms/kernel-core-*.rpm \
-    /tmp/kernel-rpms/kernel-modules-*.rpm \
-    /tmp/kernel-rpms/kernel-modules-core-*.rpm \
-    /tmp/kernel-rpms/kernel-modules-extra-*.rpm
-
-rpm -ivh --nodeps --noscripts /tmp/kernel-rpms/kernel-devel-*.rpm
-
-# Lock kernel version to prevent mismatches
-dnf5 versionlock add kernel kernel-devel kernel-devel-matched kernel-core kernel-modules kernel-modules-core kernel-modules-extra
-
-# Get installed kernel version for nvidia akmods
-KERNEL_VERSION=$(rpm -q kernel-core --queryformat "%{VERSION}-%{RELEASE}.%{ARCH}" | tail -n 1)
-echo "Installed kernel: ${KERNEL_VERSION}"
-
 # Enable ublue-os akmods COPR
 sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo
 
@@ -94,6 +75,6 @@ kargs = ["rd.driver.blacklist=nouveau", "modprobe.blacklist=nouveau", "nvidia-dr
 EOF
 
 # Cleanup
-rm -rf /tmp/akmods /tmp/akmods-nvidia /tmp/akmods-rpms /tmp/kernel-rpms /tmp/rpms /tmp/nvidia-install.sh
+rm -rf /tmp/akmods /tmp/akmods-nvidia /tmp/akmods-rpms /tmp/rpms /tmp/nvidia-install.sh
 
-echo "Kernel and NVIDIA drivers installed successfully"
+echo "NVIDIA drivers installed successfully for kernel ${KERNEL_VERSION}"

build_files/base/01-base-system.sh

@@ -9,9 +9,12 @@ echo "Installing Hypercube base system..."
 # Clean DNF cache first
 dnf5 -y clean all
 
+### Enable Hypercube COPR for custom packages
+dnf5 -y copr enable binarypie/hypercube
+
 ### Display Manager: greetd + regreet
-# greetd is in official Fedora repos, regreet from binarypie/hypercube COPR
-# cage is a minimal Wayland compositor to host regreet
+# regreet from binarypie/hypercube COPR
+# cage is a minimal Wayland compositor to host regreet and the first-boot wizard
 dnf5 -y install \
     greetd \
     greetd-selinux \
@@ -91,7 +94,8 @@ systemctl enable greetd.service
 systemctl enable NetworkManager.service
 systemctl enable bluetooth.service
 systemctl enable power-profiles-daemon.service
-systemctl enable hypercube-first-boot.service
+# TODO: Re-enable once first-boot wizard is properly tested
+# systemctl enable hypercube-first-boot.service
 
 ### Disable services we don't need
 systemctl disable gdm.service 2>/dev/null || true

build_files/hypercube/98-initramfs.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+# Regenerate initramfs after all kernel modules are installed
+# This is critical for bootc containers that change the kernel
+
+set -ouex pipefail
+
+echo "Regenerating initramfs..."
+
+QUALIFIED_KERNEL="$(rpm -qa | grep -P 'kernel-(\d+\.\d+\.\d+)' | sed -E 's/kernel-//')"
+echo "Kernel version: ${QUALIFIED_KERNEL}"
+
+export DRACUT_NO_XATTR=1
+/usr/bin/dracut \
+    --no-hostonly \
+    --kver "${QUALIFIED_KERNEL}" \
+    --reproducible \
+    --add ostree \
+    -f "/lib/modules/${QUALIFIED_KERNEL}/initramfs.img"
+
+chmod 0600 "/lib/modules/${QUALIFIED_KERNEL}/initramfs.img"
+
+echo "Initramfs regenerated successfully"

build_files/hypercube/99-tests.sh

@@ -10,7 +10,8 @@ echo "Running Hypercube validation tests..."
 REQUIRED_PACKAGES=(
   # Display manager
   "greetd"
-  "tuigreet"
+  "regreet"
+  "cage"
   # Hyprland stack
   "hyprland"
   "hyprlock"

build_files/hyprland/01-hyprland-desktop.sh

@@ -6,10 +6,7 @@ set -ouex pipefail
 
 echo "Installing Hyprland desktop stack..."
 
-### Enable Hypercube COPR (our self-maintained packages)
-dnf5 -y copr enable binarypie/hypercube
-
-### Compositor / Hyprland Stack (from Hypercube COPR)
+### Compositor / Hyprland Stack 
 dnf5 -y install \
   hyprland \
   hyprland-guiutils \

dot_files/quickshell/welcome-mode.qml

@@ -4,52 +4,24 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.Controls
+import QtQuick.Window
 import Quickshell
-import Quickshell.Wayland
 import Quickshell.Io
 
 ShellRoot {
     id: root
 
-    // Welcome wizard runs on all screens, full screen
-    Variants {
-        model: Quickshell.screens
-
-        delegate: Component {
-            PanelWindow {
-                id: welcomeWindow
-                required property var modelData
-                property var screen: modelData
-
-                anchors.fill: true
-                color: "#1a1b26"  // Tokyonight background
-
-                // Only show wizard on primary screen
-                property bool isPrimary: screen === Quickshell.screens[0]
-
-                // Background for non-primary screens
-                Rectangle {
-                    anchors.fill: parent
-                    visible: !isPrimary
-                    color: "#1a1b26"
-
-                    Text {
-                        anchors.centerIn: parent
-                        text: "Hypercube"
-                        font.pixelSize: 48
-                        font.weight: Font.Medium
-                        color: "#7aa2f7"
-                        opacity: 0.3
-                    }
-                }
-
-                // Wizard on primary screen
-                Loader {
-                    anchors.fill: parent
-                    active: isPrimary
-                    sourceComponent: WelcomeWizard {}
-                }
-            }
+    // Simple fullscreen window for cage compositor
+    Window {
+        id: welcomeWindow
+        visible: true
+        visibility: Window.FullScreen
+        color: "#1a1b26"  // Tokyonight background
+        title: "Hypercube Setup"
+
+        // Wizard content
+        WelcomeWizard {
+            anchors.fill: parent
         }
     }
 
@@ -662,29 +634,51 @@ ShellRoot {
             }
         }
 
+        property bool isCreating: false
+
         function createUser() {
+            if (isCreating) return
+            isCreating = true
             errorMessage = ""
             userCreateProcess.running = true
         }
 
+        // Escape single quotes in strings for shell safety
+        function shellEscape(str: string): string {
+            return str.replace(/'/g, "'\\''")
+        }
+
         Process {
             id: userCreateProcess
+            // Runs as root via greetd initial_session
             command: ["sh", "-c",
-                "useradd -m -G wheel -c '" + (fullName || username) + "' '" + username + "' && " +
-                "echo '" + username + ":" + password + "' | chpasswd && " +
+                "useradd -m -G wheel -c '" + shellEscape(fullName || username) + "' '" + shellEscape(username) + "' && " +
+                "echo '" + shellEscape(username) + ":" + shellEscape(password) + "' | chpasswd && " +
                 // Save theme config for the new user
-                "mkdir -p /home/" + username + "/.config/hypercube && " +
-                "echo '{\"appearance\":{\"darkMode\":" + (selectedDarkMode ? "true" : "false") + ",\"accentColor\":\"" + selectedAccent + "\"}}' > /home/" + username + "/.config/hypercube/shell.json && " +
-                "chown -R " + username + ":" + username + " /home/" + username + "/.config"
+                "mkdir -p '/home/" + shellEscape(username) + "/.config/hypercube' && " +
+                "echo '{\"appearance\":{\"darkMode\":" + (selectedDarkMode ? "true" : "false") + ",\"accentColor\":\"" + selectedAccent + "\"}}' > '/home/" + shellEscape(username) + "/.config/hypercube/shell.json' && " +
+                "chown -R '" + shellEscape(username) + "':'" + shellEscape(username) + "' '/home/" + shellEscape(username) + "/.config'"
             ]
 
             running: false
-            onExited: {
-                if (exitCode === 0) {
-                    // Exit quickshell, which will cause Hyprland to exit
+            onExited: (code, status) => {
+                isCreating = false
+                if (code === 0) {
+                    // Success - exit quickshell to return to greetd
                     Qt.quit()
                 } else {
-                    errorMessage = "Failed to create user. Exit code: " + exitCode
+                    errorMessage = "Failed to create user (error " + code + "). Please try again."
+                }
+            }
+        }
+
+        // Allow exiting with Escape key
+        Shortcut {
+            sequence: "Escape"
+            onActivated: {
+                if (!isCreating) {
+                    // Exit without creating user - greetd will show regreet
+                    Qt.quit()
                 }
             }
         }

system_files/shared/etc/greetd/config.toml

@@ -4,5 +4,11 @@ vt = 1
 
 [default_session]
 # Run regreet in cage (minimal Wayland compositor)
-command = "cage -s -- regreet"
+command = "/usr/sbin/cage -s -- /usr/sbin/regreet"
 user = "greeter"
+
+[initial_session]
+# First boot wizard - runs once as root, then exits to show regreet
+# Set XDG_RUNTIME_DIR for quickshell/Qt to work properly as root
+command = "sh -c 'mkdir -p /run/user/0 && export XDG_RUNTIME_DIR=/run/user/0; /usr/sbin/cage -s -- /usr/sbin/quickshell -p /usr/share/hypercube/config/quickshell/welcome-mode.qml'"
+user = "root"

system_files/shared/usr/lib/bootc/kargs.d/hypercube-kargs.json

@@ -4,7 +4,6 @@
     "quiet",
     "splash",
     "rd.plymouth=1",
-    "plymouth.use-simpledrm=1",
     "bgrt_disable"
   ]
 }