Fixes

build.sh

@@ -275,7 +275,6 @@ export QUILT_NO_DIFF_TIMESTAMPS=1
 export QUILT_REFRESH_ARGS="-p ab"
 
 export ENABLE_CLOUD_INIT=${ENABLE_CLOUD_INIT:-1}
-export LIVEINSTALL=${LIVEINSTALL:-0}
 export LIVEBOOT=${LIVEBOOT:-0}
 export EXPORTS="${EXPORTS:-}"
 

configs/amd64

@@ -1,9 +1,8 @@
 # This builds VesperOS for amd64
 ARCH=amd64
 
-# Suffix to append to the image name.
-# For example, if set to "amd64", the produced image will be named "vesperos-amd64.img".
-IMG_SUFFIX="amd64"
+# Suffix to append to the image name
+#IMG_SUFFIX="-rainier"
 
 # Exports to produce
 EXPORTS="stage3:squashfs"

configs/arm64

@@ -2,7 +2,7 @@
 ARCH=arm64
 
 # Suffix to append to the image name
-IMG_SUFFIX="arm64"
+#IMG_SUFFIX="-rainier"
 
 # Exports to produce
 EXPORTS="stage3:squashfs"

configs/rpi4

@@ -8,7 +8,7 @@ ARCH=arm64
 PLATFORM=rpi
 
 # Suffix to append to the image name
-IMG_SUFFIX="arm64-rpi"
+IMG_SUFFIX="-rainier-rpi"
 
 # Exports to produce
 EXPORTS="stage3:squashfs"

docs/config.md

@@ -99,10 +99,6 @@ sudo ./build.sh -c build_amd64
 
   Set to `1` to produce a second `-live` squashfs alongside the raw one. Installs `live-boot`, configures GDM autologin, and rebuilds the initramfs. Only applies to `amd64`.
 
-* `LIVEINSTALL` (Default: `0`)
-
-  Set to `1` (requires `LIVEBOOT=1`) to also install Calamares into the live squashfs.
-
 * `LIVE_USERNAME` (Default: `vesperos`)
 * `LIVE_USER_FULLNAME` (Default: `Live User`)
 * `LIVE_USER_PASSWORD` (Default: `vesperos`)

exports/squashfs/03-finalise/01-run.sh

@@ -7,6 +7,11 @@ if [ -f "${ROOTFS_DIR}/etc/initramfs-tools/update-initramfs.conf" ]; then
 fi
 
 on_chroot <<- EOF
+	# Ensure Plymouth plymouthd.conf has the correct theme before packing initramfs.
+	# update-alternatives only sets the symlink; the initramfs hook reads plymouthd.conf.
+	if which plymouth-set-default-theme > /dev/null 2>&1; then
+		plymouth-set-default-theme vesperos
+	fi
 	update-initramfs -k all -c
 	if hash hardlink 2>/dev/null; then
 		hardlink -t /usr/share/doc

exports/squashfs/04-export/01-run.sh

@@ -65,10 +65,6 @@ none | *)
 	;;
 esac
 
-cp "${SQUASHFS_FILE}" "${DEPLOY_DIR}/${ARCHIVE_FILENAME}${IMG_SUFFIX}.rootfs.squashfs"
-[ -n "${VMLINUZ}" ] && cp "${VMLINUZ}" "${DEPLOY_DIR}/${ARCHIVE_FILENAME}${IMG_SUFFIX}.rootfs.vmlinuz"
-[ -n "${INITRD}" ] && cp "${INITRD}" "${DEPLOY_DIR}/${ARCHIVE_FILENAME}${IMG_SUFFIX}.rootfs.initrd.img"
-
 # ── 2. Liveboot squashfs (only when LIVEBOOT=1 and amd64) ──────────────────────
 if [ "${LIVEBOOT}" == "1" ]; then
 	if [ "${ARCH}" != "amd64" ]; then
@@ -149,9 +145,8 @@ EOF
 dconf update
 EOF
 
-		# If live install, add calamares installer
-		if [ "${LIVEINSTALL}" == "1" ]; then
-			on_chroot << EOF
+		# Add calamares installer and related packages to the live image
+		on_chroot << EOF
 apt-get install --no-install-recommends -y \
 	calamares calamares-settings-vesperos \
 	libcrack2 cracklib-runtime \
@@ -159,7 +154,16 @@ apt-get install --no-install-recommends -y \
 	grub-efi-amd64 grub-pc-bin efibootmgr \
 	parted gdisk dosfstools e2fsprogs
 EOF
-		fi
+
+		# Set quiet splash after grub installs its default /etc/default/grub
+		sed -i 's/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT="quiet splash"/' \
+			"${ROOTFS_DIR}/etc/default/grub"
+
+		# Keep the graphical framebuffer so Plymouth can render its splash.
+		# Without this, GRUB switches to text mode before handing off to the kernel
+		# and Plymouth falls back to a hidden/text renderer, showing nothing.
+		grep -q 'GRUB_GFXPAYLOAD_LINUX' "${ROOTFS_DIR}/etc/default/grub" || \
+			echo 'GRUB_GFXPAYLOAD_LINUX=keep' >> "${ROOTFS_DIR}/etc/default/grub"
 
 		# Rebuild initramfs with live-boot modules
 		on_chroot << EOF
@@ -206,9 +210,8 @@ EOF
 			;;
 		esac
 
-		cp "${LIVE_SQUASHFS_FILE}" "${DEPLOY_DIR}/${ARCHIVE_FILENAME}${IMG_SUFFIX}-live.rootfs.squashfs"
-		[ -n "${LIVE_VMLINUZ}" ] && cp "${LIVE_VMLINUZ}" "${DEPLOY_DIR}/${ARCHIVE_FILENAME}${IMG_SUFFIX}-live.rootfs.vmlinuz"
-		[ -n "${LIVE_INITRD}" ] && cp "${LIVE_INITRD}" "${DEPLOY_DIR}/${ARCHIVE_FILENAME}${IMG_SUFFIX}-live.rootfs.initrd.img"
+		[ -n "${LIVE_VMLINUZ}" ] && cp "${LIVE_VMLINUZ}" "${DEPLOY_DIR}/${ARCHIVE_FILENAME}${IMG_SUFFIX}-live.vmlinuz"
+		[ -n "${LIVE_INITRD}" ] && cp "${LIVE_INITRD}" "${DEPLOY_DIR}/${ARCHIVE_FILENAME}${IMG_SUFFIX}-live.initrd"
 	fi
 fi
 

stage3/00-install-packages/00-packages

@@ -1,6 +1,6 @@
 gstreamer1.0-x gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-alsa gstreamer1.0-libav
 gtk2-engines alsa-utils
-plymouth desktop-base
+plymouth plymouth-themes desktop-base
 git
 gvfs
 rfkill