From owner-freebsd-gnome@FreeBSD.ORG Fri Dec 17 13:19:06 2004 Return-Path: Delivered-To: freebsd-gnome@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E8E1116A4CE for ; Fri, 17 Dec 2004 13:19:06 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B965043D54 for ; Fri, 17 Dec 2004 13:19:06 +0000 (GMT) (envelope-from olgeni@FreeBSD.org) Received: from freefall.freebsd.org (olgeni@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.1/8.13.1) with ESMTP id iBHDJ6lH038541 for ; Fri, 17 Dec 2004 13:19:06 GMT (envelope-from olgeni@freefall.freebsd.org) Received: (from olgeni@localhost) by freefall.freebsd.org (8.13.1/8.13.1/Submit) id iBHDJ6oY038540 for gnome@FreeBSD.org; Fri, 17 Dec 2004 13:19:06 GMT (envelope-from olgeni) Date: Fri, 17 Dec 2004 13:19:06 GMT From: Jimmy Olgeni Message-Id: <200412171319.iBHDJ6oY038540@freefall.freebsd.org> To: gnome@FreeBSD.org Subject: gdm2 reboot and geom_mirror X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Dec 2004 13:19:07 -0000 Hi, I made a patch for gdm2 to use /sbin/shutdown -r as RebootCommand. The default reboot command ignores any swap_off setting in rc.conf, so geom_mirror will start a (very long) resync after every reboot. bye, jimmy Index: files/patch-ab =================================================================== RCS file: /home/pcvs/ports/x11/gdm2/files/patch-ab,v retrieving revision 1.19 diff -u -r1.19 patch-ab --- files/patch-ab 7 Nov 2004 22:24:24 -0000 1.19 +++ files/patch-ab 17 Dec 2004 13:15:49 -0000 @@ -1,5 +1,8 @@ ---- config/gdm.conf.in.orig Tue Oct 26 23:18:21 2004 -+++ config/gdm.conf.in Tue Oct 26 23:20:49 2004 + +$FreeBSD$ + +--- 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 +12,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 +37,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