fix gdm, kdm in debian, ubuntu

git-svn-id: http://svn.openslx.org/svn/openslx/ld4@152 95ad53e4-c205-0410-b2fa-d234c58c8868

1 files changed, 20 insertions, 22 deletions

diff --git a/initrd/distro-specs/debian/functions-3.1 b/initrd/distro-specs/debian/functions-3.1
index 714e089b..71914973 100644
--- a/initrd/distro-specs/debian/functions-3.1
+++ b/initrd/distro-specs/debian/functions-3.1
@@ -1,4 +1,4 @@
-# Description:  configuration script for SuSE 10.0 to configure
+# Description:  configuration script for Debian 3.1 to configure
 #		linux diskless clients (executed within initial
 #		ramdisk after genconfig) 
 #
@@ -23,7 +23,10 @@ postinit () {
 config_distro () {
 # add the halt link to the 0 and 6 runlevel directories
   ln -sf ../halt /mnt/etc/rc0.d/S90halt
-  ln -sf ../halt /mnt/etc/rc6.d/S90reboot
+  ln -sf ../reboot /mnt/etc/rc6.d/S90reboot
+
+  # set default runlevel
+  sed -e "s/.*initdefault/id:${D_INITDEFAULT}:initdefault/" -i /mnt/etc/inittab
 }
 
 
@@ -34,8 +37,8 @@ local start="$2"
 local stop="$3"
 # empty runlevel links - decision on running certain services is
 # passed via configuration
-for i in rc3.d/K$stop$script rc5.d/K$stop$script \
-         rc3.d/S$start$script rc5.d/S$start$script ; do
+for i in rc2.d/K$stop$script rc3.d/K$stop$script \
+         rc2.d/S$start$script rc3.d/S$start$script ; do
   ln -sf ../$script /mnt/etc/init.d/$i
   echo "Linked $script"
 done
@@ -172,19 +175,6 @@ PATH=\"\$PATH:/var/X11R6/bin\"" >>/mnt/etc/SuSEconfig/profile
 
 }
 
-# configure display manager (runlevel links and kind of manager)
-config_dm () {
-  # should be stated that entries were made (fixmee how??)
-  sed -e "s,DISPLAYMANAGER=.*,DISPLAYMANAGER=\"$start_xdmcp\"," \
-      -e "s,.*_XSERVER.*,DISPLAYMANAGER_STARTS_XSERVER=\"$dsx\"," \
-    /mnt/etc/sysconfig/displaymanager > /etc/displaymanager
-  cp /etc/displaymanager /mnt/etc/sysconfig/displaymanager
-
-#  echo -e "#!/bin/sh\n# entry added by $0: $date\n\
-#(sleep 1; /etc/init.d/xdm start) &" >>/mnt/etc/${D_INITDIR}/boot.ld
-  ln -sf /etc/init.d/xdm /mnt/etc/init.d/rc5.d/S01xdm
-  ln -sf /etc/init.d/xdm /mnt/etc/init.d/rc5.d/K20xdm
-}
 
 # consolefont
 consolefont () {
@@ -194,23 +184,31 @@ echo -e "setfont ${CONSOLE_FONT} >${LOGFILE} 2>&1" \
 
 # acpi and powersave
 config_acpi () {
-  echo >/dev/null
+  :
 }
 
 # configure xdm as display manager
 config_xdm () {
-  echo >/dev/null
+  :
 } 
 
 # configure gdm as display manager
 config_gdm () {
-  # gdm user >> passwd
-  echo >/dev/null
+  ln -sf ../gdm /mnt/etc/${D_INITDIR}/rc3.d/K20gdm
+  echo -e "\t/etc/${D_INITDIR}/gdm start >${LOGFILE} 2>&1\n\
+    \t( sleep 120; ln -sf ../gdm /etc/${D_INITDIR}/rc3.d/S01gdm \
+    >${LOGFILE} 2>&1) &\n" >>/mnt/etc/${D_INITDIR}/boot.ld
+  # append gdm user
+  echo "gdm:x:113:">>/etc/group
+  echo "gdm:x:106:113:Gnome Display Manager:/var/lib/gdm:/bin/false" >>/etc/passwd
 }
 
 # configure kdm as display manager
 config_kdm () {
-  echo >/dev/null
+  ln -sf ../kdm /mnt/etc/${D_INITDIR}/rc3.d/K20kdm
+  echo -e "\t/etc/${D_INITDIR}/kdm start >${LOGFILE} 2>&1\n\
+    \t( sleep 120; ln -sf ../gdm /etc/${D_INITDIR}/rc3.d/S01kdm \
+    >${LOGFILE} 2>&1) &\n" >>/mnt/etc/${D_INITDIR}/boot.ld
 }
 
 # configure hal, dbus, resmgr and services like that