pisilinux-rs/yali-rs
3
0
Fork 1
mirror of https://gitlab.com/erkanisik/yali-rs.git synced 2026-07-31 03:09:00 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge branch 'main' into 'main'

Browse Source 
sddm ayarı yapıldı ve live kalıntıları temizlendi

See merge request ayhanyalcinsoy/yali-rs!4
This commit is contained in:
Ayhan YALÇINSOY
2026-06-06 12:39:29 +00:00
parent ea6262a153 30ea5275ba
commit b9f6df272e
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/jobs/mod.rs
+20 -7
View File
@@ -1185,14 +1185,14 @@ impl Job for ConfigureDisplayManagerJob {
match dm.as_str() { match dm.as_str() {
"sddm" => { "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 { let content = if self.autologin {
format!( format!(
"[Autologin]\nUser={}\nSession={}.desktop\n\n[Theme]\nCurrent=breeze\n", "[Autologin]\nUser={}\nSession=plasmax11.desktop\n\n[Theme]\nCurrent=pisilinux24\n",
self.username, self.desktop_environment self.username
) )
} else { } else {
"[Theme]\nCurrent=breeze\n".to_string() "[Autologin]\nUser=\nSession=\n\n[Theme]\nCurrent=pisilinux24\n".to_string()
}; };
tokio::fs::write(&conf, content) tokio::fs::write(&conf, content)
.await .await
@@ -1368,11 +1368,24 @@ impl Job for CleanupLiveJob {
// var/cache/pisi/packages // var/cache/pisi/packages
let _ = tokio::fs::remove_dir_all(format!("{}/var/cache/pisi/packages", mt)).await; let _ = tokio::fs::remove_dir_all(format!("{}/var/cache/pisi/packages", mt)).await;
// YALI desktop dosyaları // 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.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-bin.desktop", mt)).await;
let _ = tokio::fs::remove_dir_all(format!("{}/bootmnt", 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, &["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ı"); ui.log("✓ Live temizlik tamamlandı");
Ok(()) Ok(())