diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-06-13 19:09:24 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-06-13 19:09:24 +0000 |
| commit | 7cbc839eac40d61bf115994f2448af7fb48d0316 (patch) | |
| tree | e22fd76bdf4a531fc8aaf2173d4b0823bf63744e /user/consolekit2/poweroff.patch | |
| parent | 761f867c975b162f71cce3d006af27e7f85e52b3 (diff) | |
| parent | 7afd8578da770b2b9e33c0db67efd62dffa62369 (diff) | |
| download | packages-7cbc839eac40d61bf115994f2448af7fb48d0316.tar.gz packages-7cbc839eac40d61bf115994f2448af7fb48d0316.tar.bz2 packages-7cbc839eac40d61bf115994f2448af7fb48d0316.tar.xz packages-7cbc839eac40d61bf115994f2448af7fb48d0316.zip | |
Merge branch 'ck-shutdown' into 'master'
user/consolekit2: request power off when shutting down
See merge request !240
Diffstat (limited to 'user/consolekit2/poweroff.patch')
| -rw-r--r-- | user/consolekit2/poweroff.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/user/consolekit2/poweroff.patch b/user/consolekit2/poweroff.patch new file mode 100644 index 000000000..8ae9d21a5 --- /dev/null +++ b/user/consolekit2/poweroff.patch @@ -0,0 +1,22 @@ +Most users expect "shutdown" to also power off the machine when +requested from a graphical environment. "Actions after halting are +unspecified" when using -h (LSB 3.0) - sysvinit additionally tries to +power off when using -h, whereas s6-linux-init only halts. +Use the **non-standard** -P option (implemented by sysvinit and +s6-linux-init since 1.0.2.0) to request power off after halting. + +--- ConsoleKit2-1.2.1/tools/linux/ck-system-stop 2017-06-02 01:31:44.000000000 +0000 ++++ ConsoleKit2-1.2.1/tools/linux/ck-system-stop 2019-06-09 17:40:31.110006347 +0000 +@@ -2,10 +2,10 @@ + + #Try for common tools + if [ -x "/sbin/shutdown" ] ; then +- /sbin/shutdown -h now ++ /sbin/shutdown -hP now + exit $? + elif [ -x "/usr/sbin/shutdown" ] ; then +- /usr/sbin/shutdown -h now ++ /usr/sbin/shutdown -hP now + exit $? + else + exit 1 |