summaryrefslogtreecommitdiff
path: root/x11/gdm/patches/patch-ab
diff options
context:
space:
mode:
Diffstat (limited to 'x11/gdm/patches/patch-ab')
-rw-r--r--x11/gdm/patches/patch-ab56
1 files changed, 29 insertions, 27 deletions
diff --git a/x11/gdm/patches/patch-ab b/x11/gdm/patches/patch-ab
index de11b12044a..0fc6f81ceef 100644
--- a/x11/gdm/patches/patch-ab
+++ b/x11/gdm/patches/patch-ab
@@ -1,49 +1,51 @@
-$NetBSD: patch-ab,v 1.2 1999/11/15 00:07:02 tron Exp $
+$NetBSD: patch-ab,v 1.3 2001/03/20 02:42:14 mjl Exp $
---- config/gdm.conf.in.orig Tue Sep 7 06:37:16 1999
-+++ config/gdm.conf.in Mon Nov 15 00:57:03 1999
-@@ -1,20 +1,20 @@
+--- config/gdm.conf.in.orig Tue Mar 20 02:18:54 2001
++++ config/gdm.conf.in Tue Mar 20 02:22:19 2001
+@@ -1,21 +1,21 @@
[daemon]
- Chooser=@bindir@/gdmchooser --disable-sound --disable-crash-dialog
--DefaultPath=/bin:/usr/bin:/usr/bin/X11:/usr/local/bin:@bindir@
+ AutomaticLogin=
+ Chooser=@EXPANDED_BINDIR@/gdmchooser --disable-sound --disable-crash-dialog
+-DefaultPath=/bin:/usr/bin:/usr/bin/X11:/usr/local/bin:@EXPANDED_BINDIR@
+DefaultPath=/bin:/usr/bin:/usr/local/bin:@X11BASE@/bin:@LOCALBASE@/bin
- DisplayInitDir=@sysconfdir@/gdm/Init
- Greeter=@bindir@/gdmlogin --disable-sound --disable-crash-dialog
+ DisplayInitDir=@EXPANDED_SYSCONFDIR@/gdm/Init
+ Greeter=@EXPANDED_BINDIR@/gdmlogin --disable-sound --disable-crash-dialog
-Group=gdm
+Group=@GDMGRP@
HaltCommand=/sbin/shutdown -h now
- KillInitClients=1
- LogDir=@authdir@
+ KillInitClients=true
+ LogDir=@EXPANDED_AUTHDIR@
-PidFile=/var/run/gdm.pid
+PidFile=/var/run/xdm.pid
- PostSessionScriptDir=@sysconfdir@/gdm/PostSession/
- PreSessionScriptDir=@sysconfdir@/gdm/PreSession/
+ PostSessionScriptDir=@EXPANDED_SYSCONFDIR@/gdm/PostSession/
+ PreSessionScriptDir=@EXPANDED_SYSCONFDIR@/gdm/PreSession/
RebootCommand=/sbin/shutdown -r now
--RootPath=/sbin:/usr/sbin:/bin:/usr/bin:/usr/bin/X11:/usr/local/bin:@bindir@
+-RootPath=/sbin:/usr/sbin:/bin:/usr/bin:/usr/bin/X11:/usr/local/bin:@EXPANDED_BINDIR@
+RootPath=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin:@X11BASE@/bin:@LOCALBASE@/bin
- ServAuthDir=@authdir@
- SessionDir=@sysconfdir@/gdm/Sessions/
+ ServAuthDir=@EXPANDED_AUTHDIR@
+ SessionDir=@EXPANDED_SYSCONFDIR@/gdm/Sessions/
-User=gdm
+User=@GDMOWN@
UserAuthDir=
UserAuthFBDir=/tmp
UserAuthFile=.Xauthority
-@@ -50,7 +50,7 @@
- GlobalFaceDir=@datadir@/faces/
- Icon=@pixmapdir@/gdm.xpm
- LocaleFile=@localedir@/locale.alias
--Logo=@pixmapdir@/gnome-logo-large.png
-+Logo=@pixmapdir@/Daemon.png
- Quiver=1
- SystemMenu=0
+@@ -51,7 +51,7 @@
+ GlobalFaceDir=@EXPANDED_DATADIR@/faces/
+ Icon=@EXPANDED_PIXMAPDIR@/gdm.xpm
+ LocaleFile=@EXPANDED_LOCALEDIR@/locale.alias
+-Logo=@EXPANDED_PIXMAPDIR@/gnome-logo-large.png
++Logo=@EXPANDED_PIXMAPDIR@/Daemon.png
+ Quiver=true
+ SystemMenu=true
Welcome=Welcome to %n
-@@ -64,7 +64,7 @@
- Enable=0
+@@ -75,8 +75,8 @@
+ Enable=false
[servers]
-0=/usr/bin/X11/X
-#1=/usr/bin/X11/X
+0=@X11BASE@/bin/X
+#1=@X11BASE@/bin/X
-
-
+ #Note: If you want to make sure X runs on a specific virtual console on linux,
+ # you can use the following (for console 7):
+ #0=/usr/bin/X11/X vt7