From e61ac97252e213bb17f501345d385bce75ffe83f Mon Sep 17 00:00:00 2001 From: Mikhail Efremov Date: Thu, 17 Jan 2013 18:34:43 +0400 Subject: [PATCH] Use gdm-termok-command for poweroff and reboot commands. In case of systemd it kills systemctl by SIGTERM before it can return success. --- gdm/configure | 4 ++-- gdm/configure.ac | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gdm/configure b/gdm/configure index d0e8f18..e3f4a17 100755 --- a/gdm/configure +++ b/gdm/configure @@ -33670,8 +33670,8 @@ case "$host" in ;; *) HOST_GDM_USER_PATH="/bin:/usr/bin" - HOST_HALT_COMMAND="/usr/bin/poweroff;/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now" - HOST_REBOOT_COMMAND="/usr/bin/reboot;/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now" + HOST_HALT_COMMAND="/usr/sbin/gdm-termok-command /sbin/poweroff;/usr/sbin/gdm-termok-command /sbin/shutdown -h now;/sbin/poweroff;/sbin/shutdown -h now" + HOST_REBOOT_COMMAND="/usr/sbin/gdm-termok-command /sbin/reboot;/usr/sbin/gdm-termok-command /sbin/shutdown -r now;/sbin/reboot;/sbin/shutdown -r now" HOST_SUSPEND_COMMAND="" HOST_XSESSION_SHELL=/bin/sh HOST_SOUND_PROGRAM=/usr/bin/play diff --git a/gdm/configure.ac b/gdm/configure.ac index 93e15ab..95b94c5 100644 --- a/gdm/configure.ac +++ b/gdm/configure.ac @@ -1087,8 +1087,8 @@ case "$host" in ;; *) HOST_GDM_USER_PATH="/bin:/usr/bin" - HOST_HALT_COMMAND="/usr/bin/poweroff;/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now" - HOST_REBOOT_COMMAND="/usr/bin/reboot;/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now" + HOST_HALT_COMMAND="/usr/sbin/gdm-termok-command /sbin/poweroff;/usr/sbin/gdm-termok-command /sbin/shutdown -h now;/sbin/poweroff;/sbin/shutdown -h now" + HOST_REBOOT_COMMAND="/usr/sbin/gdm-termok-command /sbin/reboot;/usr/sbin/gdm-termok-command /sbin/shutdown -r now;/sbin/reboot;/sbin/shutdown -r now" HOST_SUSPEND_COMMAND="" HOST_XSESSION_SHELL=/bin/sh HOST_SOUND_PROGRAM=/usr/bin/play -- 1.8.1.1