removed greetd due to edge case with installed setup and fixed niri bugs

Author: sinisterMage

eclipse-installer/src/config.rs

@@ -27,28 +27,12 @@ pub const TIMEZONE_REGIONS: &[&str] = &[
     "US",
 ];
 
-/// Content of the greetd service file written to the target.
-pub const GREETD_SERVICE: &str = r#"[service]
-name = "greetd"
-supervisor = "root"
-exec = ["/usr/bin/greetd"]
-type = "simple"
-
-[restart]
-policy = "permanent"
-delay = "2s"
-max-restarts = 5
-max-restart-window = "60s"
-
-[dependencies]
-after = ["dbus", "seatd", "udev-coldplug"]
-
-[readiness]
-type = "none"
-
-[shutdown]
-stop-signal = "SIGTERM"
-stop-timeout = "10s"
+/// Profile script that auto-starts the niri Wayland session on tty1.
+/// Replaces greetd which has session-worker hangs in seatd/dynamod environments.
+pub const NIRI_AUTOSTART_PROFILE: &str = r#"# Auto-start Eclipse niri session on tty1 after login
+if [ "$(tty)" = "/dev/tty1" ] && [ -z "$WAYLAND_DISPLAY" ]; then
+    exec /usr/bin/eclipse-niri-session
+fi
 "#;
 
 /// Busybox symlinks created inside the initramfs staging directory.

eclipse-installer/src/install.rs

@@ -8,8 +8,9 @@ use std::thread;
 use std::time::Duration;
 
 use crate::config::{
-    FsType, InstallConfig, BUSYBOX_SYMLINKS, EFI_LABEL, GREETD_SERVICE, GRUB_BIOS_MODULES,
-    INITRAMFS_LIB_PATTERNS, ROOT_LABEL, RSYNC_EXCLUDES, TARGET_MNT, USER_GROUPS, USER_SHELL,
+    FsType, InstallConfig, BUSYBOX_SYMLINKS, EFI_LABEL, GRUB_BIOS_MODULES,
+    INITRAMFS_LIB_PATTERNS, NIRI_AUTOSTART_PROFILE, ROOT_LABEL, RSYNC_EXCLUDES, TARGET_MNT,
+    USER_GROUPS, USER_SHELL,
 };
 use crate::log;
 
@@ -428,16 +429,11 @@ fn configure_system(config: &InstallConfig) -> Result<(), String> {
             .map_err(|e| format!("Failed to write passwd: {}", e))?;
     }
 
-    // Replace agetty with greetd service
-    let agetty_path = format!("{}/etc/dynamod/services/agetty-tty1.toml", TARGET_MNT);
-    let _ = fs::remove_file(&agetty_path);
-
-    let greetd_dir = format!("{}/etc/dynamod/services", TARGET_MNT);
-    fs::create_dir_all(&greetd_dir)
-        .map_err(|e| format!("mkdir {}: {}", greetd_dir, e))?;
-    let greetd_path = format!("{}/greetd.toml", greetd_dir);
-    fs::write(&greetd_path, GREETD_SERVICE)
-        .map_err(|e| format!("Failed to write greetd service: {}", e))?;
+    // Auto-start niri session on tty1 after login (replaces greetd which has
+    // session-worker hangs in seatd/dynamod environments).
+    let autostart_path = format!("{}/etc/profile.d/eclipse-niri-autostart.sh", TARGET_MNT);
+    fs::write(&autostart_path, NIRI_AUTOSTART_PROFILE)
+        .map_err(|e| format!("Failed to write niri autostart profile: {}", e))?;
 
     // Remove live-environment artifacts
     let live_profile = format!("{}/etc/profile.d/eclipse-live.sh", TARGET_MNT);

scripts/build-rootfs.sh

@@ -393,7 +393,7 @@ cat > "$ROOTFS/etc/dynamod/services/seatd.toml" <<'SEATD'
 [service]
 name = "seatd"
 supervisor = "root"
-exec = ["/bin/sh", "-c", "exec env SEATD_VTBOUND=0 /usr/bin/seatd"]
+exec = ["/bin/sh", "-c", "exec env SEATD_VTBOUND=0 /usr/bin/seatd -g _seatd"]
 type = "simple"
 
 [restart]

scripts/eclipse-install

@@ -445,31 +445,15 @@ fi
 # restore the 'x' marker so login checks /etc/shadow for the real hash.
 sed -i 's|^root:[^:]*:|root:x:|' "$TARGET_MNT/etc/passwd"
 
-# Replace agetty console login with greetd for graphical login
-rm -f "$TARGET_MNT/etc/dynamod/services/agetty-tty1.toml"
-cat > "$TARGET_MNT/etc/dynamod/services/greetd.toml" <<'GREETD_SVC'
-[service]
-name = "greetd"
-supervisor = "root"
-exec = ["/usr/bin/greetd"]
-type = "simple"
-
-[restart]
-policy = "permanent"
-delay = "2s"
-max-restarts = 5
-max-restart-window = "60s"
-
-[dependencies]
-after = ["dbus", "seatd", "udev-coldplug"]
-
-[readiness]
-type = "none"
-
-[shutdown]
-stop-signal = "SIGTERM"
-stop-timeout = "10s"
-GREETD_SVC
+# Auto-start niri session on tty1 after login (replaces greetd which has
+# session-worker hangs in seatd/dynamod environments).
+cat > "$TARGET_MNT/etc/profile.d/eclipse-niri-autostart.sh" <<'NIRI_AUTOSTART'
+# Auto-start Eclipse niri session on tty1 after login
+if [ "$(tty)" = "/dev/tty1" ] && [ -z "$WAYLAND_DISPLAY" ]; then
+    exec /usr/bin/eclipse-niri-session
+fi
+NIRI_AUTOSTART
+chmod 644 "$TARGET_MNT/etc/profile.d/eclipse-niri-autostart.sh"
 
 # Remove live-environment artifacts
 rm -f "$TARGET_MNT/etc/profile.d/eclipse-live.sh"

scripts/eclipse-niri-session

@@ -3,8 +3,11 @@
 # Prefer this over raw `niri --session`: session D-Bus, udev settle, short delay for libinput.
 
 export LIBSEAT_BACKEND=seatd
-: "${XDG_RUNTIME_DIR:=/run/user/$(id -u)}"
-mkdir -m 0700 -p "$XDG_RUNTIME_DIR" 2>/dev/null || true
+export XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}"
+if ! mkdir -m 0700 -p "$XDG_RUNTIME_DIR" 2>/dev/null; then
+	export XDG_RUNTIME_DIR="/tmp/eclipse-runtime-$(id -u)"
+	mkdir -m 0700 -p "$XDG_RUNTIME_DIR"
+fi
 
 # Mesa: ensure DRI drivers resolve (musl/live); avoid llvmpipe being picked for virtio
 # (niri skips "software" EGL devices — then the first DRM device has no allocator yet).