diff options
author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2002-10-13 18:46:57 +0000 |
---|---|---|
committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2002-10-13 18:46:57 +0000 |
commit | 163ebbcb8314ce1046224f454ef09d316b62c710 (patch) | |
tree | 1867406cd1a5ec106bb4760aca85a379214db3c6 /x11 | |
parent | Update to 4.1.0.dev5. (diff) |
When shutting down from gdm, try to power down the machine instead of just
halting it.
PR: 44018
Submitted by: Keith Jones <kmjones@blueyonder.co.uk>
Notes
Notes:
svn path=/head/; revision=67982
Diffstat (limited to 'x11')
-rw-r--r-- | x11/gdm2/Makefile | 2 | ||||
-rw-r--r-- | x11/gdm2/files/patch-ab | 13 |
2 files changed, 12 insertions, 3 deletions
diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile index 48fd33529af3..000960ba6112 100644 --- a/x11/gdm2/Makefile +++ b/x11/gdm2/Makefile @@ -7,7 +7,7 @@ PORTNAME= gdm2 PORTVERSION= 2.4.0.11 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.4 diff --git a/x11/gdm2/files/patch-ab b/x11/gdm2/files/patch-ab index e8c90a988127..10b04a198600 100644 --- a/x11/gdm2/files/patch-ab +++ b/x11/gdm2/files/patch-ab @@ -1,5 +1,5 @@ ---- config/gdm.conf.in.orig Fri Aug 23 13:53:53 2002 -+++ config/gdm.conf.in Sun Oct 13 11:53:36 2002 +--- config/gdm.conf.in.orig Fri Aug 23 18:53:53 2002 ++++ config/gdm.conf.in Sun Oct 13 17:57:14 2002 @@ -33,14 +33,14 @@ # The gdm configuration program that is run from the login screen, you should # probably leave this alone @@ -26,6 +26,15 @@ # You should probably never change this value unless you have a weird setup PidFile=/var/run/gdm.pid PostSessionScriptDir=@EXPANDED_SYSCONFDIR@/gdm/PostSession/ +@@ -72,7 +72,7 @@ + # Reboot, Halt and suspend commands, you can add different commands + # separated by a semicolon and gdm will use the first one it can find + RebootCommand=/sbin/shutdown -r now;/usr/sbin/shutdown -r now +-HaltCommand=/usr/bin/poweroff;/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now ++HaltCommand=/sbin/shutdown -p now;/usr/sbin/shutdown -p now + SuspendCommand= + # Probably should not touch the below this is the standard setup + ServAuthDir=@EXPANDED_AUTHDIR@ @@ -84,16 +84,16 @@ UserAuthFBDir=/tmp UserAuthFile=.Xauthority |