From d60bf64fa92f3331bf94e5bcaa9736c94122992a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erkan=20I=C5=9EIK?= Date: Sat, 6 Jun 2026 15:23:39 +0300 Subject: [PATCH] feat: update display manager configuration and enhance cleanup process with repository management --- src/jobs/mod.rs | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/src/jobs/mod.rs b/src/jobs/mod.rs index 8b02c79..dc153c8 100644 --- a/src/jobs/mod.rs +++ b/src/jobs/mod.rs @@ -1185,14 +1185,14 @@ impl Job for ConfigureDisplayManagerJob { match dm.as_str() { "sddm" => { - let conf = format!("{}/etc/sddm.conf", self.mount); + let conf = format!("{}/usr/lib/sddm/sddm.conf.d/sddm.conf", self.mount); let content = if self.autologin { format!( - "[Autologin]\nUser={}\nSession={}.desktop\n\n[Theme]\nCurrent=breeze\n", - self.username, self.desktop_environment + "[Autologin]\nUser={}\nSession=plasmax11.desktop\n\n[Theme]\nCurrent=pisilinux24\n", + self.username ) } else { - "[Theme]\nCurrent=breeze\n".to_string() + "[Autologin]\nUser=\nSession=\n\n[Theme]\nCurrent=pisilinux24\n".to_string() }; tokio::fs::write(&conf, content) .await @@ -1368,11 +1368,24 @@ impl Job for CleanupLiveJob { // var/cache/pisi/packages let _ = tokio::fs::remove_dir_all(format!("{}/var/cache/pisi/packages", mt)).await; // YALI desktop dosyaları - let _ = tokio::fs::remove_file(format!("{}/usr/share/applications/yali.desktop", mt)).await; - let _ = tokio::fs::remove_file(format!("{}/usr/share/applications/yali-bin.desktop", mt)).await; + //let _ = tokio::fs::remove_file(format!("{}/usr/share/applications/yali.desktop", mt)).await; + //let _ = tokio::fs::remove_file(format!("{}/usr/share/applications/yali-bin.desktop", mt)).await; let _ = tokio::fs::remove_dir_all(format!("{}/bootmnt", mt)).await; + //pisi kullanıcısını sil (ev diziniyle birlikte), YALI paketlerini kaldır let _ = run_chroot(&self.mount, &["userdel", "-r", "pisi"]).await; - + let _ = run_chroot(&self.mount, &["pisi", "rm", "yali-rs"]).await; + // live paket deposunu kaldır + let _ = run_chroot(&self.mount, &["pisi", "rr", "live"]).await; + // depolarları yeniden ekle (stable2 + contrib) + ui.log("Depolar Ekleniyor…"); + let _ = run_chroot(&self.mount, &["pisi", "ar", "stable2", "https://stable2.pisilinux.org/pisi-index.xml.xz"]).await; + let _ = run_chroot(&self.mount, &["pisi", "ar", "contrib", "https://contrib.pisilinux.org/pisi-index.xml.xz"]).await; + // depoları aktif et + ui.log("Depolar aktif ediliyor..."); + let _ = run_chroot(&self.mount, &["pisi", "er", "contrib", "stable2"]).await; + // paket listelerini güncelle + ui.log("Depolar Güncelleniyor..."); + let _ = run_chroot(&self.mount, &["pisi", "ur"]).await; ui.log("✓ Live temizlik tamamlandı"); Ok(())