From e95ca24cd9d5a035c71e57317179be2988843235 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Tue, 22 Aug 2000 13:04:56 +0000 Subject: * Add KDE2 support --- ChangeLog | 3 +++ initscripts.spec | 5 ++++- prefdm | 15 +++++++++------ 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 462b01d2..19453426 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2000-08-22 Than Ngo + * add KDE2 support + 2000-08-18 Bill Nottingham * initscripts.spec: bump rev to 5.46 diff --git a/initscripts.spec b/initscripts.spec index 3165fa28..bff8722d 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,6 +1,6 @@ Summary: The inittab file and the /etc/init.d scripts. Name: initscripts -Version: 5.46 +Version: 5.47 Copyright: GPL Group: System Environment/Base Release: 1 @@ -232,6 +232,9 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Tue Aug 22 2000 Than Ngo +- add KDE2 support to prefdm + * Fri Aug 18 2000 Bill Nottingham - don't load usb drivers if they're compiled statically - don't call ifdown-post twice for ppp (#15285) diff --git a/prefdm b/prefdm index 253f3101..9654ea0f 100755 --- a/prefdm +++ b/prefdm @@ -18,12 +18,15 @@ fi preferred= if [ -f /etc/sysconfig/desktop ]; then - if grep -q GNOME /etc/sysconfig/desktop 2>/dev/null; then + source /etc/sysconfig/desktop >/dev/null 2>&1 + if [ "$DESKTOP" = GNOME ]; then preferred=gdm - elif grep -q KDE /etc/sysconfig/desktop 2> /dev/null; then - preferred=kdm - elif grep -q AnotherLevel /etc/sysconfig/desktop 2> /dev/null; then - preferred=xdm + elif [ "$DESKTOP" = KDE -o "$DESKTOP" = KDE1 ]; then + preferred=/usr/bin/kdm + elif [ "$DESKTOP" = KDE2 ]; then + preferred=/usr/lib/kde2/bin/kdm + elif [ "$DESKTOP" = AnotherLevel ] ; then + preferred=/usr/X11R6/bin/xdm fi fi if [ -z "$preferred" ]; then @@ -38,4 +41,4 @@ fi if [ -n "$preferred" ] && which $preferred >/dev/null 2>&1; then exec `which $preferred` $* fi -exit 1 +exit 1 -- cgit v1.2.1