diff --git a/installer-rs/crates/phoebus-core/src/system.rs b/installer-rs/crates/phoebus-core/src/system.rs index 1dd5cdb..58fbca7 100644 --- a/installer-rs/crates/phoebus-core/src/system.rs +++ b/installer-rs/crates/phoebus-core/src/system.rs @@ -15,14 +15,18 @@ use crate::hardware::{CpuInfo, GpuVendor, HardwareReport}; /// `dev-util/ccache` is installed before `FEATURES=ccache` is enabled so a /// repeated source build can actually hit the cache (capped at 2 GiB). pub fn base_packages() -> Vec<&'static str> { - vec![ + let mut out = vec![ "app-admin/sudo", "net-misc/networkmanager", "sys-auth/polkit", "sys-fs/cryptsetup", "sys-fs/btrfs-progs", "dev-util/ccache", - ] + ]; + // The login shell must exist before `users_configure` runs (it validates + // `USER_LOGIN_SHELL`), and that stage precedes `desktop_install`. + out.extend(shell_packages()); + out } /// Extra packages implied by the detected CPU. @@ -89,7 +93,9 @@ pub fn mango_desktop_packages() -> Vec<&'static str> { "gui-libs/xdg-desktop-portal-wlr", ]; out.extend(workstation_packages()); - out.extend(shell_packages()); + // Shell lane lives in `base_packages` (needed before `users_configure`); + // cursor/printing/ssh/power/helpers have no early validation and stay + // in the desktop lane. out.extend(cursor_packages()); out.extend(printing_packages()); out.extend(ssh_packages()); @@ -2837,12 +2843,20 @@ mod tests { #[test] fn shell_cursor_printing_ssh_power_lanes_are_present() { - let pkgs = desktop_packages(DesktopProfile::Mango); + // The shell lane ships in base (it must exist before + // `users_configure` validates the login shell); the remaining lanes + // stay in the desktop set. + let base = base_packages(); for atom in [ "app-shells/zsh", "app-shells/zsh-completions", "app-shells/zsh-autosuggestions", "app-shells/zsh-syntax-highlighting", + ] { + assert!(base.contains(&atom), "missing base lane atom {atom}"); + } + let pkgs = desktop_packages(DesktopProfile::Mango); + for atom in [ "x11-themes/vanilla-dmz-xcursors", "net-print/cups", "net-misc/openssh",