aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2004-12-19 02:08:36 +0800
committermarcus <marcus@FreeBSD.org>2004-12-19 02:08:36 +0800
commit546ea1467891dd2f098a47ebf4a23365852357d2 (patch)
tree97a8a889dd941df92691fbb0bc959adeba69d8b5
parenta2577533e9ed9e91159c66f1dad17ce7426f6a37 (diff)
downloadfreebsd-ports-graphics-546ea1467891dd2f098a47ebf4a23365852357d2.tar.gz
freebsd-ports-graphics-546ea1467891dd2f098a47ebf4a23365852357d2.tar.zst
freebsd-ports-graphics-546ea1467891dd2f098a47ebf4a23365852357d2.zip
Change the default reboot command to be more geom_mirror friendly. Using
shutdown -r will prevent geom_mirror from taking a long time to resync after reboot. Submitted by: olgeni
-rw-r--r--x11/gdm2/Makefile1
-rw-r--r--x11/gdm2/files/patch-ab11
2 files changed, 7 insertions, 5 deletions
diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile
index cd84c789a5f..3ffa2c57889 100644
--- a/x11/gdm2/Makefile
+++ b/x11/gdm2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gdm2
PORTVERSION= 2.6.0.6
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.6
diff --git a/x11/gdm2/files/patch-ab b/x11/gdm2/files/patch-ab
index 35cd08f89e1..6f1a1e6f562 100644
--- a/x11/gdm2/files/patch-ab
+++ b/x11/gdm2/files/patch-ab
@@ -1,5 +1,5 @@
---- config/gdm.conf.in.orig Tue Oct 26 23:18:21 2004
-+++ config/gdm.conf.in Tue Oct 26 23:20:49 2004
+--- config/gdm.conf.in.orig
++++ config/gdm.conf.in
@@ -76,7 +76,7 @@
# To try to kill all clients started at greeter time or in the Init script.
# doesn't always work, only if those clients have a window of their own
@@ -9,16 +9,17 @@
# You should probably never change this value unless you have a weird setup
PidFile=/var/run/gdm.pid
# Note that a post login script is run before a PreSession script.
-@@ -96,7 +96,7 @@
+@@ -96,7 +96,8 @@
# 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=/usr/bin/reboot;/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now
-#HaltCommand=/usr/bin/poweroff;/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now
++RebootCommand=/sbin/shutdown -r now;/usr/sbin/shutdown -r 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@
-@@ -131,11 +131,11 @@
+@@ -131,11 +132,11 @@
#FlexiReapDelayMinutes=5
# the X nest command
Xnest=@X_XNEST_PATH@/Xnest @X_XNEST_CONFIG_OPTIONS@
@@ -33,7 +34,7 @@
# Should double login be treated with a warning (and possibility to change
# vts on linux and freebsd systems for console logins)
#DoubleLoginWarning=true
-@@ -240,7 +240,7 @@
+@@ -240,7 +241,7 @@
# The specific gtkrc file we use. It should be the full path to the gtkrc
# that we need. Unless you need a specific gtkrc that doesn't correspond to
# a specific theme, then just use the GtkTheme key