rpms/gdm/devel gdm-allow-login.init,1.1,1.2 gdm.spec,1.66,1.67

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2154

Modified Files:
	gdm-allow-login.init gdm.spec 
Log Message:
Make early-login work with firstboot



Index: gdm-allow-login.init
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm-allow-login.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdm-allow-login.init	2 Apr 2005 17:53:53 -0000	1.1
+++ gdm-allow-login.init	14 Apr 2005 19:36:47 -0000	1.2
@@ -2,7 +2,7 @@
 #
 # gdm-allow-login     This shell script enables users to login to gdm
 #
-# chkconfig:	5 99 01
+# chkconfig:	5 99 1
 # description: This shell script enables users to login from the display manager
 
 # source function library
@@ -10,6 +10,9 @@
 
 [ -f /usr/bin/gdm-binary ] || exit 0
 strstr "$(cat /proc/cmdline)" "early-login" || exit 0
+if do_firstboot; then 
+  exit 0;
+fi
 
 RETVAL=0
 


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- gdm.spec	14 Apr 2005 17:13:57 -0000	1.66
+++ gdm.spec	14 Apr 2005 19:36:47 -0000	1.67
@@ -273,6 +273,9 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Thu Apr 14 2005 Matthias Clasen <mclasen at redhat.com> 1:2.6.0.8-4
+- Don't do early-login if firstboot is going to run
+
 * Wed Apr 13 2005 Ray Strode <rstrode at redhat.com> 1:2.6.0.8-3
 - Don't hard code dpi setting to 96.0, but instead look at
   Xft.dpi