gdm Konfiguration klappt nun. Kommentare angefuegt ...

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

9 files changed, 192 insertions, 28 deletions

diff --git a/initrd/distro-specs/debian/config b/initrd/distro-specs/debian/config
index 34d20372..fd6233f2 100644
--- a/initrd/distro-specs/debian/config
+++ b/initrd/distro-specs/debian/config
@@ -1,6 +1,7 @@
 # Description:  distro specific settings for Debian/Sarge
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 06-01-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 16-01-2006
+#               Blablub
 #
 # Copyright:    (c) 2003, 2005 - RZ Universitaet Freiburg
 
@@ -16,13 +17,16 @@
 # anyhow
 # DISBINDMNT - any code which is specific in bind mount environment
 # RCDIRS - runlevel directories relative to /etc
-
+# XF86CONFFILE - name and location of XFree/Xorg config file, e.g.
+# /etc/X11/xorg.conf or /etc/X11/XF86config, ...
+# XFONTPATH - path(es) where X11 fonts are installed (with trailing /*)
+# DEFAULTCOUNTRY - localization (see common functions)
 
 SYSCONFDIR=/default
 DISETCEXCL="etc/gconf/*\n*.old\n*-\n\
-*.YaST2save\netc/autoinstall\nlogrotate*\nbootloader\n*~\n\
-*.SuSEconfig.saved\npptp.d\nisdn\nyouservers\nhardware/hwcfg*\n\
-X11/xdm/pixmaps\n*.rpmsave\ndhclient.script\ninit.d/boot.d/*\n\
+etc/autoinstall\nlogrotate*\nbootloader\n*~\n\
+pptp.d\nisdn\nyouservers\nhardware/hwcfg*\n\
+X11/xdm/pixmaps\ndhclient.script\ninit.d/boot.d/*\n\
 rc2.d/*\nrc5.d/*"
 BINDMPTS="tmp root home"
 DIRINBINDMNT="/var/run /var/log /var/tmp"
@@ -38,3 +42,6 @@ INITDIR="/init.d"
 INITBOOTD="/rcS.d"
 RCDIRS="/rc0.d /rc1.d /rc2.d /rc3.d /rc4.d /rc5.d /rc6.d"
 INITSCRIPTS="boot.udev boot.proc boot.shm boot.klog boot.loadmodules boot.clock boot.localnet boot.sysctl boot.ipconfig"
+XF86CONFFILE="/etc/X11/xorg.conf"
+XFONTPATH="/usr/X11R6/lib/X11/fonts/*"
+DEFAULTCOUNTRY="de"
diff --git a/initrd/distro-specs/debian/functions-debian b/initrd/distro-specs/debian/functions-debian
index 349e6c25..12521f33 100644
--- a/initrd/distro-specs/debian/functions-debian
+++ b/initrd/distro-specs/debian/functions-debian
@@ -2,7 +2,7 @@
 #		linux diskless clients (executed within initial
 #		ramdisk after genconfig) 
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 08-01-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 16-01-2006
 #		Blabla
 #		Blub
 #
@@ -165,3 +165,18 @@ consolefont () {
 echo -e "setfont ${CONSOLE_FONT} >${LOGFILE} 2>&1" \
   >>/mnt/etc/${INITDIR}/boot.ld
 }
+
+# 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 () {
+  echo >/dev/null
+}
diff --git a/initrd/distro-specs/suse-10.0/config b/initrd/distro-specs/suse-10.0/config
index f0f99b4b..9e75ef0e 100644
--- a/initrd/distro-specs/suse-10.0/config
+++ b/initrd/distro-specs/suse-10.0/config
@@ -45,3 +45,4 @@ INITSCRIPTS="boot.udev boot.proc boot.shm boot.klog boot.loadmodules boot.clock
 XF86CONFFILE="/etc/X11/xorg.conf"
 XFONTPATH="/usr/X11R6/lib/X11/fonts/*"
 DEFAULTCOUNTRY="de"
+
diff --git a/initrd/distro-specs/suse-10.0/functions-suse-10.0 b/initrd/distro-specs/suse-10.0/functions-suse-10.0
index ef867be6..2f708141 100644
--- a/initrd/distro-specs/suse-10.0/functions-suse-10.0
+++ b/initrd/distro-specs/suse-10.0/functions-suse-10.0
@@ -12,6 +12,8 @@
 
 # distro specific stuff to initialize
 preinit () {
+  # do nothing yet
+  echo > /dev/null
 }
 
 # linking runlevel scripts
@@ -144,18 +146,146 @@ 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
+# configure X display manager (/etc/sysconfig/displaymanager)
+config_dm_entry () {
+local dm="$1"  
+# should be stated that entries were made (fixmee how??)
+sed -e "s,DISPLAYMANAGER=.*,DISPLAYMANAGER=\"$start_xdmcp\"," \
+    -e "s,.*_XSERVER.*,DISPLAYMANAGER_STARTS_XSERVER=\"$dm\"," \
+  /mnt/etc/sysconfig/displaymanager > /etc/displaymanager
+cp /etc/displaymanager /mnt/etc/sysconfig/displaymanager
+}
 
+# configure X display manager (runlevel links and kind of manager)
+config_xdm () {
+config_dm_entry yes
 #  echo -e "#!/bin/sh\n# entry added by $0: $date\n\
 #(sleep 1; /etc/init.d/xdm start) &" >>/mnt/etc/${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
+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
+}
+
+# configure gdm as display manager
+config_gdm () {
+config_dm_entry yes
+testmkd /mnt/var/lib/gdm
+strinfile "gdm:" /mnt/etc/passwd || echo "gdm:x:50:15:Gnome Display Manager \
+Daemon:/var/lib/gdm:/bin/false" >>/mnt/etc/passwd
+# hack - gdm should be user 50 and shadow group 15
+chown 50:15 /mnt/var/lib/gdm
+chmod 0750 /mnt/var/lib/gdm
+xdmcp_hosts=`echo $x_display_manager|sed -e "s; ;,;"`
+if [ "${DEBUGLEVEL}" -gt 0 ] ; then
+  debug="true"
+else
+  debug="false"
+fi
+echo -e "# /etc/opt/gnome/gdm/gdm.conf - file generated by $0\n\
+[daemon]
+AutomaticLoginEnable=false
+TimedLoginEnable=false
+#AlwaysRestartServer=false
+Chooser=/opt/gnome/lib/gdm/gdmchooser
+Greeter=/opt/gnome/lib/gdm/gdmgreeter
+RemoteGreeter=/opt/gnome/lib/gdm/gdmgreeter
+DefaultPath=/usr/local/bin:/usr/bin:/usr/X11R6/bin:/bin:/usr/games:/opt/bin:\
+/opt/gnome/bin:/opt/kde3/bin:/opt/kde/bin:/usr/openwin/bin
+RootPath=/usr/local/bin:/usr/bin:/usr/X11R6/bin:/bin:/usr/local/bin:/usr/bin:\
+/usr/X11R6/bin:/bin:/usr/games:/opt/bin:/opt/gnome/bin:/opt/kde3/bin:\
+/opt/kde/bin:/usr/openwin/bin:/opt/cross/bin
+User=gdm
+Group=shadow
+#KillInitClients=true
+LogDir=/var/lib/gdm
+ServAuthDir=/var/lib/gdm
+PostLoginScriptDir=/etc/opt/gnome/gdm/PostLogin/
+PreSessionScriptDir=/etc/opt/gnome/gdm/PreSession/
+PostSessionScriptDir=/etc/opt/gnome/gdm/PostSession/
+DisplayInitDir=/etc/opt/gnome/gdm/Init
+XKeepsCrashing=/etc/opt/gnome/gdm/XKeepsCrashing
+RebootCommand=/sbin/shutdown -r now
+HaltCommand=/sbin/shutdown -h now
+SuspendCommand=/usr/bin/powersave --suspend-to-disk
+BaseXsession=/etc/opt/gnome/gdm/Xsession
+SessionDesktopDir=/usr/share/xsessions/:/etc/X11/sessions/:\
+/etc/opt/gnome/dm/Sessions/:/opt/gnome/share/gdm/BuiltInSessions/
+BaseXsession=/etc/opt/gnome/gdm/Xsession
+SessionDesktopDir=/usr/share/xsessions/:/etc/opt/gnome/dm/Sessions/:\
+/opt/gnome/share/gdm/BuiltInSessions/
+UserAuthFBDir=/tmp
+UserAuthFile=.Xauthority
+StandardXServer=/usr/X11R6/bin/X
+Xnest=/usr/X11R6/bin/Xnest -audit 0 -name Xnest
+
+[security]
+AllowRoot=true
+AllowRemoteRoot=true
+AllowRemoteAutoLogin=false
+CheckDirOwner=true
+#UserMaxFile=65536
+RetryDelay=1
+#SessionMaxFile=524388
+NeverPlaceCookiesOnNFS=true
+
+[xdmcp]
+Enable=$xdmcp
+HonorIndirect=true
+MaxPending=4
+MaxPendingIndirect=4
+MaxSessions=10
+MaxWait=15
+MaxWaitIndirect=15
+DisplaysPerHost=2
+Willing=/etc/X11/xdm/Xwilling
+
+[gui]
+#MaxIconWidth=128
+#MaxIconWidth=128
+
+[greeter]
+Browser=false
+#TitleBar=true
+MinimalUID=500
+Quiver=true
+Welcome=Welcome to %n
+LockPosition=true
+BackgroundImage=0
+BackgroundColor=#000000
+ShowGnomeFailsafeSession=false
+ShowXtermFailsafeSession=false
+ShowLastSession=false
+Use24Clock=true
+GraphicalTheme=GDM-SuSE
+GraphicalTheme=circles
+GraphicalThemeDir=/opt/gnome/share/gdm/themes/
+GraphicalThemeRand=false
+#SystemMenu=true
+InfoMsgFile=/opt/gnome/share/gdm/UserInfo
+InfoMsgFont=monospace 10
+SoundOnLogin=false
+[chooser]
+HostImageDir=/opt/gnome/share/hosts/
+Broadcast=false
+Multicast=false
+Hosts=$xdmcp_hosts
+
+[debug]
+Enable=$debug" >/mnt/etc/opt/gnome/gdm/gdm.conf
+if [ "x$start_x" = "xindirect" ] ; then
+  # when X server consumes to much mem set X -terminate
+  echo -e "\n[servers]\n0=Terminal -audit 0 -indirect \
+$host_name\n\n\
+[server-Terminal]\nname=Terminal server\ncommand=/usr/X11R6/bin/X \
+-audit 0\n\
+flexible=true\nhandled=true\nchooser=true" >>/mnt/etc/opt/gnome/gdm/gdm.conf
+else
+  echo -e "\n[servers]\n0=Standard\n\n\
+[server-Standard]\nname=Standard server\ncommand=/usr/X11R6/bin/X\n\
+flexible=true\nhandled=true" >>/mnt/etc/opt/gnome/gdm/gdm.conf
+fi
+ln -sf /etc/init.d/xdm /mnt/etc/init.d/boot.d/S01boot.xdm
+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
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
diff --git a/initrd/initrd-stuff/etc/functions b/initrd/initrd-stuff/etc/functions
index 30a142cf..23376161 100644
--- a/initrd/initrd-stuff/etc/functions
+++ b/initrd/initrd-stuff/etc/functions
@@ -179,7 +179,7 @@ case $dhcp in
   dhclient)
     mkdhclconf $vci
     ln -s /bin/dhcpmkconfig /sbin/dhclient-script
-    dhclient -lf /var/lib/dhcp/dhclient.leases eth0 2>&1 >/dev/null || \
+    dhclient -q -lf /var/lib/dhcp/dhclient.leases eth0 2>&1 >/dev/null || \
       error "  Fatal error occured while trying to run dhclient.\n$commonerr" 
   ;;
   dhcpcd)
diff --git a/initrd/initrd-stuff/init b/initrd/initrd-stuff/init
index 86cc3384..4d1e9138 100755
--- a/initrd/initrd-stuff/init
+++ b/initrd/initrd-stuff/init
@@ -338,7 +338,7 @@ of this client did not finish in\n  time. You might check the process list \
 and list the modules loaded until\n  now."
 
 date
-ash
+#ash
 # IP configuration is made and should not be updated automatically
 killall -9 dhcpcd dhclient pump 2>/dev/null
 # unmount the bind mounted modules directory
diff --git a/initrd/mkdxsinitrd b/initrd/mkdxsinitrd
index ce214728..65f941da 100755
--- a/initrd/mkdxsinitrd
+++ b/initrd/mkdxsinitrd
@@ -275,6 +275,8 @@ DISTRO=suse
 case "${DISTRO}.${DISVER}" in
   SuSE*|suse*|Suse*|SuSe*)
 	DISTRO=suse-10.0
+        # hotplug/udev style and stuff
+	cp -a /etc/udev /etc/hotplug ${INSTDIR}/etc
 	;;
   Debian*|debian*|Sarge*|sarge*)
 	DISTRO=debian
@@ -334,8 +336,7 @@ for bbins in \
   cobi ${bbins} bin || echo "Program ${bbins} not found"
 done
 
-# style of hotplug/udev/dev
-cp -a /etc/udev ${INSTDIR}/etc
+# style of hotplug/udev/dev (for etc directories see above!!)
 for bbins in udev udevstart
   do
   cobi ${bbins} bin || echo "Program ${bbins} not found"