From e623db2e4b8ad4a6c3c3b852abbcac6a62de2b6b Mon Sep 17 00:00:00 2001 From: oxmc7769 Date: Fri, 3 Apr 2026 02:26:38 -0700 Subject: [PATCH] Fixes --- build.sh | 1 - configs/amd64 | 5 ++--- configs/arm64 | 2 +- configs/rpi4 | 2 +- docs/config.md | 4 ---- exports/squashfs/03-finalise/01-run.sh | 5 +++++ exports/squashfs/04-export/01-run.sh | 25 ++++++++++++++----------- stage3/00-install-packages/00-packages | 2 +- 8 files changed, 24 insertions(+), 22 deletions(-) diff --git a/build.sh b/build.sh index fceb080..ae29dfa 100755 --- a/build.sh +++ b/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:-}" diff --git a/configs/amd64 b/configs/amd64 index 5503091..4bf87e6 100644 --- a/configs/amd64 +++ b/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" diff --git a/configs/arm64 b/configs/arm64 index 5f0531f..5820aa5 100644 --- a/configs/arm64 +++ b/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" diff --git a/configs/rpi4 b/configs/rpi4 index 938c35f..22bf303 100644 --- a/configs/rpi4 +++ b/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" diff --git a/docs/config.md b/docs/config.md index 53905c5..b3f2737 100644 --- a/docs/config.md +++ b/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`) diff --git a/exports/squashfs/03-finalise/01-run.sh b/exports/squashfs/03-finalise/01-run.sh index 15f2ecc..c62d6ac 100755 --- a/exports/squashfs/03-finalise/01-run.sh +++ b/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 diff --git a/exports/squashfs/04-export/01-run.sh b/exports/squashfs/04-export/01-run.sh index bbf60fa..600dc2b 100755 --- a/exports/squashfs/04-export/01-run.sh +++ b/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 diff --git a/stage3/00-install-packages/00-packages b/stage3/00-install-packages/00-packages index 3e7d9c7..33464f0 100644 --- a/stage3/00-install-packages/00-packages +++ b/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