aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernhard Rosenkraenzer <bero@redhat.com>2000-06-04 20:04:09 +0000
committerBernhard Rosenkraenzer <bero@redhat.com>2000-06-04 20:04:09 +0000
commitee80366b5be86f730539618211d573560a1139de (patch)
tree5a1892e02d6043dfb0471be78ee52115436bc898
parent55a9292cd14dbf4bda059e20ca58f8dc6e448234 (diff)
downloadinitscripts-ee80366b5be86f730539618211d573560a1139de.tar
initscripts-ee80366b5be86f730539618211d573560a1139de.tar.gz
initscripts-ee80366b5be86f730539618211d573560a1139de.tar.bz2
initscripts-ee80366b5be86f730539618211d573560a1139de.tar.xz
initscripts-ee80366b5be86f730539618211d573560a1139de.zip
autologin support
-rw-r--r--initscripts.spec5
-rwxr-xr-xprefdm10
2 files changed, 14 insertions, 1 deletions
diff --git a/initscripts.spec b/initscripts.spec
index 8bde1b86..dcf128f7 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -1,6 +1,6 @@
Summary: The inittab file and the /etc/rc.d scripts.
Name: initscripts
-Version: 5.14
+Version: 5.15
Copyright: GPL
Group: System Environment/Base
Release: 1
@@ -216,6 +216,9 @@ rm -rf $RPM_BUILD_ROOT
%ghost %attr(0664,root,utmp) /var/run/utmp
%changelog
+* Sun Jun 4 2000 Bernhard Rosenkraenzer <bero@redhat.com>
+- add autologin support to prefdm
+
* Thu Jun 1 2000 Bill Nottingham <notting@redhat.com>
- random networking fixes (alias routes, others)
- conf.modules -> modules.conf
diff --git a/prefdm b/prefdm
index f5289356..253f3101 100755
--- a/prefdm
+++ b/prefdm
@@ -6,6 +6,16 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin
. /etc/profile.d/lang.sh
# Run preferred X display manager
+
+# Try autologin first, if wanted...
+if [ -f /etc/sysconfig/autologin -a -x /usr/sbin/autologin ]; then
+ if /usr/sbin/autologin; then
+ exit 0
+ fi
+ # If autologin fails (bad permissions, etc.), we get here -
+ # time to start a real display manager.
+fi
+
preferred=
if [ -f /etc/sysconfig/desktop ]; then
if grep -q GNOME /etc/sysconfig/desktop 2>/dev/null; then