Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-08-06 13:38:28 -04:00
Code Packages Releases Activity

fix(void): updated dms-greeter stability support

Browse Source 
- Updates will land in DMS v1.5.1 and users are advised to hold off on v1.5.0

Related #2788

Port 1.5

(cherry picked from commit 71ab752e1b)
This commit is contained in:
purian23
2026-07-11 01:07:00 -04:00
committed by dms-ci[bot]
parent b1beecb083
commit ee84489b95
10 changed files with 276 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/cmd/dms/commands_greeter.go
+22 -5
View File
@@ -1081,8 +1081,11 @@ func ensureGreetdEnabled() error {
if !runitServiceInstalled("greetd") {
return fmt.Errorf("greetd service not found in %s. Please install greetd first", runitSvDir)
}
// Seat + runtime-dir setup that logind handles automatically on systemd.
ensureRunitSeat("_greeter")
if greeter.IsVoidLinux() {
ensureVoidLogindGreeter("_greeter")
} else {
ensureRunitSeat("_greeter")
}
ensureGreetdPamRundir()
if err := enableRunitService("greetd"); err != nil {
return fmt.Errorf("failed to enable greetd: %w", err)
@@ -1261,6 +1264,9 @@ func enableGreeter(nonInteractive bool) error {
if err := greeter.EnsureGreeterCacheDir(logFunc, ""); err != nil {
fmt.Printf("⚠ Could not ensure cache directory: %v\n Run: sudo mkdir -p %s && sudo chown root:%s %s && sudo chmod 2770 %s\n", err, greeter.GreeterCacheDir, greeterGroup, greeter.GreeterCacheDir, greeter.GreeterCacheDir)
}
if err := greeter.EnsureVoidLogindGreetdCommand(logFunc, ""); err != nil {
return err
}
if err := ensureGraphicalTarget(); err != nil {
return err
@@ -1475,12 +1481,23 @@ func extractGreeterWrapperFromCommand(command string) string {
if len(tokens) == 0 {
return ""
}
wrapper := strings.Trim(tokens[0], "\"")
wrapperIndex := 0
if filepath.Base(strings.Trim(tokens[0], "\"")) == "env" {
wrapperIndex = 1
for wrapperIndex < len(tokens) && strings.Contains(tokens[wrapperIndex], "=") {
wrapperIndex++
}
}
if wrapperIndex >= len(tokens) {
return ""
}
wrapper := strings.Trim(tokens[wrapperIndex], "\"")
if wrapper == "" {
return ""
}
if len(tokens) > 1 {
next := strings.Trim(tokens[1], "\"")
if wrapperIndex+1 < len(tokens) {
next := strings.Trim(tokens[wrapperIndex+1], "\"")
if next != "" && (filepath.Base(wrapper) == "bash" || filepath.Base(wrapper) == "sh") && strings.Contains(filepath.Base(next), "dms-greeter") {
return fmt.Sprintf("%s (script: %s)", wrapper, next)
}