New basegit status!

2026-03-12 06:20:21 -07:00
parent 135c13cada
commit d4ad00d796
24 changed files with 71 additions and 30 deletions
@@ -9,3 +9,8 @@ LIVEINSTALL=1
 # Set LIVEBOOT=1 to install live-boot packages and regenerate the initrd with
 # squashfs/overlay support — required for booting rootfs.squashfs from an ISO via live-boot.
 LIVEBOOT=1
+
+# Live session user credentials (written to /etc/live/config.conf)
+LIVE_USERNAME="vesper"
+LIVE_USER_FULLNAME="VesperOS Live User"
+LIVE_USER_PASSWORD="vesper"
@@ -1,2 +1,7 @@
 # This builds VesperOS for arm64
 ARCH=arm64
+
+# Live session user credentials (written to /etc/live/config.conf)
+LIVE_USERNAME="vesper"
+LIVE_USER_FULLNAME="VesperOS Live User"
+LIVE_USER_PASSWORD="vesper"
@@ -13,4 +13,15 @@ apt-get install -y \
 	live-boot-initramfs-tools \
 	live-config \
 	live-config-systemd
+
+apt-get install --no-install-recommends -y calamares calamares-settings-vesperos
 EOF
+
+# Write live-config user settings
+mkdir -p "${ROOTFS_DIR}/etc/live"
+cat > "${ROOTFS_DIR}/etc/live/config.conf" << EOF
+LIVE_USERNAME="${LIVE_USERNAME:-user}"
+LIVE_USER_FULLNAME="${LIVE_USER_FULLNAME:-Live User}"
+LIVE_USER_DEFAULT_GROUPS="audio cdrom dip floppy video plugdev netdev bluetooth"
+LIVE_USER_PASSWORD="${LIVE_USER_PASSWORD:-live}"
+EOF
@@ -15,6 +15,15 @@ apt-get install -y \
 	live-config-systemd
 EOF

+		# Write live-config user settings
+		mkdir -p "${ROOTFS_DIR}/etc/live"
+		cat > "${ROOTFS_DIR}/etc/live/config.conf" << EOF
+LIVE_USERNAME="${LIVE_USERNAME:-user}"
+LIVE_USER_FULLNAME="${LIVE_USER_FULLNAME:-Live User}"
+LIVE_USER_DEFAULT_GROUPS="audio cdrom dip floppy video plugdev netdev bluetooth"
+LIVE_USER_PASSWORD="${LIVE_USER_PASSWORD:-live}"
+EOF
+
 		# Rewrite fstab for the live environment.
 		# live-boot manages root via overlayfs — build-time disk entries cause fsck failures at boot.
 		cat > "${ROOTFS_DIR}/etc/fstab" << 'FSTABEOF'
@@ -64,9 +64,6 @@ none | *)
 	;;
 esac

-# Copy fixed-name artifacts for gen-installmedia compatibility
-# rootfs.squashfs is always uncompressed regardless of DEPLOY_COMPRESSION
-cp "${SQUASHFS_FILE}" "${DEPLOY_DIR}/rootfs.squashfs"
-[ -n "${VMLINUZ}" ] && cp "${VMLINUZ}" "${DEPLOY_DIR}/rootfs.vmlinuz"
-[ -n "${INITRD}" ] && cp "${INITRD}" "${DEPLOY_DIR}/rootfs.initrd.img"
-echo "gen-installmedia artifacts written to ${DEPLOY_DIR}/rootfs.{squashfs,vmlinuz,initrd.img}"
+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"
@@ -3,5 +3,5 @@
 [ "${LIVEINSTALL}" != "1" ] && exit 0

 on_chroot << EOF
-apt-get install -y calamares calamares-settings-debian
-EOF
+apt-get install --no-install-recommends -y calamares calamares-settings-vesperos
+EOF
@@ -16,8 +16,6 @@ mkdir -p "${DEPLOY_DIR}"
 VMLINUZ=$(find "${ROOTFS_DIR}/boot" -maxdepth 1 -name "vmlinuz-*" | sort | tail -1)
 INITRD=$(find "${ROOTFS_DIR}/boot" -maxdepth 1 -name "initrd.img-*" | sort | tail -1)

-cp "${LIVEFS_FILE}" "${DEPLOY_DIR}/livefs.squashfs"
-[ -n "${VMLINUZ}" ] && cp "${VMLINUZ}" "${DEPLOY_DIR}/livefs.vmlinuz"
-[ -n "${INITRD}" ] && cp "${INITRD}" "${DEPLOY_DIR}/livefs.initrd.img"
-
-echo "gen-installmedia livefs artifacts written to ${DEPLOY_DIR}/livefs.{squashfs,vmlinuz,initrd.img}"
+cp "${LIVEFS_FILE}" "${DEPLOY_DIR}/${ARCHIVE_FILENAME}${IMG_SUFFIX}.livefs.squashfs"
+[ -n "${VMLINUZ}" ] && cp "${VMLINUZ}" "${DEPLOY_DIR}/${ARCHIVE_FILENAME}${IMG_SUFFIX}.livefs.vmlinuz"
+[ -n "${INITRD}" ] && cp "${INITRD}" "${DEPLOY_DIR}/${ARCHIVE_FILENAME}${IMG_SUFFIX}.livefs.initrd.img"
@@ -1,4 +1,4 @@
-ssh less fbset sudo psmisc strace ed ncdu zsh zsh-common
+ssh fbset sudo psmisc strace ed ncdu zsh zsh-common
 console-setup keyboard-configuration debconf-utils parted
 build-essential manpages-dev bash-completion gdb pkg-config
 btrfs-progs
@@ -9,7 +9,7 @@ avahi-daemon
 bluez bluez-firmware
 lua5.1
 luajit
-ca-certificates curl
+curl
 usbutils
 dosfstools
 apt-listchanges
@@ -35,8 +35,11 @@ EOF

 on_chroot << EOF
 usermod --pass='*' root
+#usermod --shell /bin/zsh root
 EOF

+#sed -i 's|^SHELL=.*|SHELL=/bin/zsh|' "${ROOTFS_DIR}/etc/default/useradd"
+
 rm -f "${ROOTFS_DIR}/etc/ssh/"ssh_host_*_key*

 sed -i 's/^FONTFACE=.*/FONTFACE=""/;s/^FONTSIZE=.*/FONTSIZE=""/' "${ROOTFS_DIR}/etc/default/console-setup"
@@ -1,3 +1,3 @@
-wpasupplicant wireless-tools firmware-atheros firmware-brcm80211 firmware-libertas firmware-realtek firmware-mediatek firmware-marvell-prestera-
+wpasupplicant wireless-tools firmware-atheros firmware-brcm80211 firmware-libertas firmware-iwlwifi firmware-realtek firmware-mediatek firmware-marvell-prestera-
 network-manager
 net-tools
@@ -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
-desktop-base
+plymouth desktop-base
 git
 gvfs
 rfkill
@@ -10,4 +10,5 @@ obconf
 python3-pyqt5 python3-qtawesome
 python3-opengl
 vulkan-tools mesa-vulkan-drivers
-libopengl0
+libopengl0
+command-not-found
@@ -1 +1 @@
-firefox-esr
+firefox-esr
@@ -1,6 +1,5 @@
-#xserver-xorg xinit
 menu-xdg
 yad zenity xdg-utils
 gvfs-backends gvfs-fuse
 gdm3 gnome-themes-extra-data gnome-icon-theme
-gnome-keyring
+gnome-keyring
@@ -1,6 +1,5 @@
 firefox rpi-firefox-mods libwidevinecdm0
 gldriver-test
 rpd-wayland-core
-#rpd-x-core
 rpd-theme
 rpd-utilities rpd-preferences
@@ -2,4 +2,4 @@

 on_chroot <<- EOF
 	apt-mark auto python3-pyqt5 python3-qtawesome python3-opengl
-EOF
+EOF
@@ -2,7 +2,5 @@ python3-pip
 python3-numpy
 tree
 libgl1-mesa-dri libgles1
-#xcompmgr
 ffmpeg
 vlc
-plymouth
@@ -1 +1 @@
-gnome-session gnome-shell libpam-gnome-keyring gnome-control-center gnome-software network-manager-gnome pulseaudio gnome-terminal gnome-online-accounts gnome-initial-setup gnome-tweaks gnome-shell-extension-no-annoyance gnome-shell-extension-manager gnome-shell-extension-gsconnect gnome-shell-extension-dash-to-panel gnome-shell-extension-appindicator gnome-shell-extension-desktop-icons-ng gnome-shell-extensions-extra
+gnome-session gnome-shell libpam-gnome-keyring gnome-control-center gnome-software network-manager-gnome pulseaudio gnome-terminal gnome-online-accounts gnome-initial-setup gnome-tweaks gnome-shell-extension-manager gnome-shell-extension-user-theme gnome-shell-extension-zorin-taskbar gnome-shell-extension-no-annoyance gnome-shell-extension-gsconnect gnome-shell-extension-dash-to-panel gnome-shell-extension-appindicator gnome-shell-extension-desktop-icons-ng
@@ -0,0 +1 @@
+wallpapers-chillcraft
@@ -1 +1,2 @@
-command-not-found
+zorin-exec-guard-app-db
+zorin-exec-guard
@@ -36,7 +36,7 @@ install -m 644 files/loveimage.png "${ROOTFS_DIR}/usr/local/share/backgrounds/lo
 install -m 644 files/neon-forest.png "${ROOTFS_DIR}/usr/local/share/backgrounds/neon-forest.png"

 # Set default settings (gnome-initial-setup)
-install -m 644 files/gnome-initial-setup "${ROOTFS_DIR}/etc/dconf/db/gnome-initial-setup.d/00-default-settings"
+install -m 644 files/gnome-initial-setup-default-settings "${ROOTFS_DIR}/etc/dconf/db/gnome-initial-setup.d/00-default-settings"

 # Set default gnome settings
 install -m 644 files/gnome-default-settings "${ROOTFS_DIR}/etc/dconf/db/local.d/00-default-settings"
@@ -1,2 +1,16 @@
 [org/gnome/shell]
-enabled-extensions=['dash-to-panel@jderose9.github.com', 'ding@rastersoft.com', 'noannoyance@daase.net', 'ubuntu-appindicators@ubuntu.com', 'user-themes@gnome-shell-extensions.gcampax.github.com', 'no-overview@fthx']
+enabled-extensions=['zorin-taskbar@zorinos.com', 'ding@rastersoft.com', 'noannoyance@daase.net', 'ubuntu-appindicators@ubuntu.com', 'user-theme@gnome-shell-extensions.gcampax.github.com', 'no-overview@fthx']
+favorite-apps=['org.gnome.Settings.desktop', 'firefox-esr.desktop', 'org.gnome.Nautilus.desktop']
+
+[org/gnome/shell/extensions/zorin-taskbar]
+panel-sizes='{"0":48}'
+panel-positions='{"0":"BOTTOM"}'
+panel-lengths='{"0":100}'
+panel-anchors='{"0":"MIDDLE"}'
+panel-element-positions='{"0":[{"element":"showDesktopButton","visible":false,"position":"stackedTL"},{"element":"activitiesButton","visible":false,"position":"stackedTL"},{"element":"leftBox","visible":true,"position":"stackedTL"},{"element":"taskbar","visible":true,"position":"centerMonitor"},{"element":"centerBox","visible":true,"position":"stackedBR"},{"element":"rightBox","visible":true,"position":"stackedBR"},{"element":"dateMenu","visible":true,"position":"stackedBR"},{"element":"systemMenu","visible":true,"position":"stackedBR"},{"element":"desktopButton","visible":false,"position":"stackedBR"}]}'
+trans-use-custom-opacity=true
+trans-panel-opacity=0.85
+trans-use-dynamic-opacity=true
+trans-dynamic-behavior='MAXIMIZED_WINDOWS'
+trans-dynamic-anim-target=0.95
+global-border-radius=6
@@ -1,4 +1,4 @@
-# This file changes the wallpaper in the gnome-initial-setup session
+# This changes/sets the defaults for gnome-initial-setup's session

 [org/gnome/desktop/background]
 picture-uri='file:///usr/local/share/backgrounds/loveimage.png'