From 9c083d8bce0748957872857ee809b40b8578da6a Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Tue, 17 Jan 2006 13:53:55 +0000
Subject: gdm Konfiguration klappt nun. Kommentare angefuegt ...

git-svn-id: http://svn.openslx.org/svn/openslx/dxs/ld4@17 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initrd/initrd-stuff/bin/hwautocfg  |  7 ++++++-
 initrd/initrd-stuff/bin/servconfig | 21 +++++++++++++--------
 2 files changed, 19 insertions(+), 9 deletions(-)

(limited to 'initrd/initrd-stuff/bin')

diff --git a/initrd/initrd-stuff/bin/hwautocfg b/initrd/initrd-stuff/bin/hwautocfg
index 1f8ac180..52bf3d0c 100755
--- a/initrd/initrd-stuff/bin/hwautocfg
+++ b/initrd/initrd-stuff/bin/hwautocfg
@@ -132,7 +132,7 @@ complete\n  or non existant. The $0 script tried for a fully automatic\n\
   configuration of display"
 fi
 if [ -z "$HS" ] ; then error "  $msg timings requested but could not \
-establish horizontal\n  frequency in kHz." nonfatal
+establish\n  horizontal frequency in kHz." nonfatal
   HS=${HSYNCRANGE}
 fi
 if [ -z "$VS" ] ; then error "  $msg timings but could not establish \
@@ -294,9 +294,14 @@ DRIVERLIST=" "${DRIVERLIST}
 for DRIVER in ohci-hcd uhci-hcd ehci-hcd \
               ohci1394; do
   strinfile ${DRIVER} /tmp/hwsetup.info && {
+    USB="yes"
     modprobe ${MODPRV} ${DRIVER}
     DRIVERLIST="${DRIVERLIST} ${DRIVER}"; }
 done
+## modules for already plugged devices might not be loaded in ramdisk
+#if [ -n "$USB" ] ; then
+#  
+#fi 
 for DRIVER in yenta_socket i82365 pd6729 tcic; do
   strinfile ${DRIVER} /tmp/hwsetup.info && {
     modprobe ${MODPRV} ${DRIVER}
diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig
index 952c7521..a984805e 100755
--- a/initrd/initrd-stuff/bin/servconfig
+++ b/initrd/initrd-stuff/bin/servconfig
@@ -178,7 +178,7 @@ if [ "x$start_x" != "xno" ] ; then
   [ -n "$x_display_manager" ] && \
   echo -e "# /etc/X11/xdm/Xaccess - file generated by $0: \
 $date\n*\n%hostlist\t$x_display_manager\n*\t\tCHOOSER %hostlist"\
-    >/etc/X11/xdm/Xaccess
+    >/mnt/etc/X11/xdm/Xaccess
   
   # define type of X session
   dsx="no"
@@ -238,12 +238,15 @@ if [ "x$start_xdmcp" != "xno" ] ; then
     start_xdmcp=kdm
   fi
   case "$start_xdmcp" in
-    wdm|WDM)
+    wdm)
       # anywhere in use!?
     ;;
-  esac
-  # setup xdm (as fallback) in any case
-  echo -e "# /etc/X11/xdm/xdm-config - file generated by\n\
+    gdm)
+      config_gdm
+    ;;
+    *)
+      # setup xdm
+      echo -e "# /etc/X11/xdm/xdm-config - file generated by\n\
 #\t$0: $date\n\nDisplayManager.errorLogFile:\t/var/log/xdm.errors\n\
 DisplayManager.pidFile:\t\t/var/run/xdm.pid\n\
 DisplayManager.authDir:\t\t/var/lib/xdm\n\
@@ -258,7 +261,9 @@ DisplayManager.*.chooser:\t/etc/X11/xdm/RunChooser\n\
 DisplayManager.*.startup:\t/etc/X11/xdm/Xstartup\n\
 DisplayManager.*.session:\t/etc/X11/xdm/Xsession\n\
 DisplayManager.*.reset:\t\t/etc/X11/xdm/Xreset" >/mnt/etc/X11/xdm/xdm-config
-  [ "$xdmcp" = "false" ] && echo -e \
-    "DisplayManager.requestPort:\t0\n" >>/mnt/etc/X11/xdm/xdm-config
-  config_dm
+      [ "$xdmcp" = "false" ] && echo -e \
+      "DisplayManager.requestPort:\t0\n" >>/mnt/etc/X11/xdm/xdm-config
+      config_xdm
+    ;;
+  esac
 fi
-- 
cgit v1.2.3-55-g7522