[Initng-svn] r2351 - in initng: . contrib

[svn at initng.thinktux.net]

Author: danne
Date: Tue Dec  6 10:20:00 2005
New Revision: 2351

Removed:
   initng/contrib/
Modified:
   initng/gen_system_runlevel
Log:
Don't run check_and_add under Fedora, it just messes things up...


Modified: initng/gen_system_runlevel
==============================================================================
--- initng/gen_system_runlevel	(original)
+++ initng/gen_system_runlevel	Tue Dec  6 10:20:00 2005
@@ -39,8 +39,11 @@
   fi
 }
 
-#On what distro's does this function do anything good?
+#On what distro's does this function do anything good? On Fedora it's just crap...
 check_and_add() {
+  if [ -f /etc/fedora-release ]; then
+    return 0
+  fi
   TARGET=""
   ls /etc/rc2.d/S*$1* >/dev/null 2>&1
   if [ "$?" = "0" ] ; then
@@ -127,22 +130,22 @@
   #Below is because dm isn't started as SysVinit service in fedora :-/
   get_default_sysvinit_runlevel
   if [ $? == "5" ]; then
+    preferred=
     if [ -f /etc/sysconfig/desktop ]; then
       . /etc/sysconfig/desktop
       if [ "$DISPLAYMANAGER" = GNOME ] && [ -x /usr/sbin/gdm ] ; then
-        echo "Adding daemon/gdm to default.runlevel"
-        echo "daemon/gdm" >> ${DESTDIR}/etc/initng/default.runlevel
+        preferred=gdm
       elif [ "$DISPLAYMANAGER" = KDE ] && [ -x /usr/sbin/kdm ] ; then
-        echo "Adding daemon/kdm to default.runlevel"
-        echo "daemon/kdm" >> ${DESTDIR}/etc/initng/default.runlevel
-      elif [ "$DISPLAYMANAGER" = XDM ] && [ -x /usr/sbin/xdm ] ; then
-        echo "Adding daemon/xdm to default.runlevel"
-        echo "daemon/xdm" >> ${DESTDIR}/etc/initng/default.runlevel
+        preferred=kdm
+      elif [ -n "$DISPLAYMANAGER" ] ; then
+        preferred=$DISPLAYMANAGER
       fi
-    elif [ -x /usr/sbin/gdm ] ; then
-      echo "Adding daemon/gdm to default.runlevel"
-      echo "daemon/gdm" >> ${DESTDIR}/etc/initng/default.runlevel
     fi
+    if [ ! -n "$preferred" ] ; then
+      preferred=gdm
+    fi
+    echo "Adding daemon/${preferred} to default.runlevel"
+    echo "daemon/${preferred}" >> ${DESTDIR}/etc/initng/default.runlevel
   fi
 fi