Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-10-21 18:54:01 -04:00
Code Packages Releases Activity

session: run custom power commands outside the shell's cgroup

Browse Source 
fixes #3250
This commit is contained in:
bbedward
2026-09-01 09:43:08 -04:00
parent 9ea8d2015b
commit f273a64703
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickshell/Services/SessionService.qml
+15 -6
View File
@@ -18,6 +18,7 @@ Singleton {
property bool isElogind: false
property bool loginctlCommandAvailable: false
property bool systemctlCommandAvailable: false
property bool userManagerAvailable: false
property bool hibernateSupported: false
readonly property bool softRebootSupported: systemctlCommandAvailable
property bool inhibitorAvailable: true
@@ -108,10 +109,11 @@ Singleton {
Process {
id: detectSystemctlProcess
running: false
command: ["sh", "-c", "command -v systemctl"]
command: ["sh", "-c", "command -v systemctl > /dev/null || exit 1; systemctl --user show-environment > /dev/null 2>&1 || exit 2"]
onExited: function (exitCode) {
systemctlCommandAvailable = (exitCode === 0);
systemctlCommandAvailable = (exitCode === 0 || exitCode === 2);
userManagerAvailable = (exitCode === 0);
}
}
@@ -422,10 +424,17 @@ Singleton {
HyprlandService.exit();
} else {
Quickshell.execDetached(["sh", "-c", SettingsData.customPowerActionLogout]);
Quickshell.execDetached(customActionCommand(SettingsData.customPowerActionLogout));
}
}
// systemd-run escapes the shell's cgroup so session teardown can't kill the command mid-run (#3250)
function customActionCommand(cmd) {
if (!userManagerAvailable)
return ["sh", "-c", cmd];
return ["systemd-run", "--user", "--scope", "--collect", "--quiet", "sh", "-c", cmd];
}
function powerManagerCommand(action) {
if (isBSD)
return bsdPowerCommand(action);
@@ -483,7 +492,7 @@ Singleton {
if (SettingsData.customPowerActionReboot.length === 0) {
Quickshell.execDetached(powerManagerCommand("reboot"));
} else {
Quickshell.execDetached(["sh", "-c", SettingsData.customPowerActionReboot]);
Quickshell.execDetached(customActionCommand(SettingsData.customPowerActionReboot));
}
}
@@ -495,7 +504,7 @@ Singleton {
if (SettingsData.customPowerActionPowerOff.length === 0) {
Quickshell.execDetached(powerManagerCommand("poweroff"));
} else {
Quickshell.execDetached(["sh", "-c", SettingsData.customPowerActionPowerOff]);
Quickshell.execDetached(customActionCommand(SettingsData.customPowerActionPowerOff));
}
}
@@ -515,7 +524,7 @@ Singleton {
const button = (SettingsData.customPowerButtons || [])[parseInt(action.slice(7), 10)];
if (!button?.command)
return false;
Quickshell.execDetached(["sh", "-c", button.command]);
Quickshell.execDetached(customActionCommand(button.command));
return true;
}
switch (action) {