Altered variable style for various client rootfilesystem types, use

rootfs=proto://server:port/path (or filesystem) instead of separate
(d)nbdroot=, nfsroot= variables. This allows to add further protocols
for rootfilesystem (AoE, iSCSI, ...) if needed easily. 
Honour user/admin provided kdmrc or
gdm.conf (via ConfTGZ - if a file is found, slx setup is skipped for
these files) ...



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

2 files changed, 27 insertions, 16 deletions

diff --git a/initrd/distro-specs/suse/functions-default b/initrd/distro-specs/suse/functions-default
index 34cf34c9..a2d5ba48 100644
--- a/initrd/distro-specs/suse/functions-default
+++ b/initrd/distro-specs/suse/functions-default
@@ -179,7 +179,9 @@ if [ "${DEBUGLEVEL}" -gt 0 ] ; then
 else
   local debug="false"
 fi
-echo -e "# /etc/opt/gnome/gdm/gdm.conf - file generated by $0\n\
+# check if a gdm.conf was provided via ConfTGZ
+if [ ! -f /etc/opt/gnome/gdm/gdm.conf ] ; then
+  echo -e "# /etc/opt/gnome/gdm/gdm.conf - file generated by $0\n\
 [daemon]
 AutomaticLoginEnable=false
 TimedLoginEnable=false
@@ -269,24 +271,27 @@ 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 \
+  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\
+  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
 fi
 }
 
 # configure kdm as display manager
 config_kdm () {
 config_dm_entry yes
-echo -e "# /etc/opt/kde3/share/config/kdm/kdmrc - \
+# check if a kdmrc was provided via ConfTGZ
+[ -f /rootfs/etc/opt/kde3/share/config/kdm/kdmrc ] || \
+  echo -e "# /etc/opt/kde3/share/config/kdm/kdmrc - \
 file generated by\n\
 #\t$0: $date\n\
 [General]\n\
diff --git a/initrd/distro-specs/ubuntu/functions-default b/initrd/distro-specs/ubuntu/functions-default
index ea9841ee..0310d1c7 100644
--- a/initrd/distro-specs/ubuntu/functions-default
+++ b/initrd/distro-specs/ubuntu/functions-default
@@ -1,14 +1,12 @@
-# Description:  configuration script for general Ubuntu to configure
-#               linux diskless clients (executed within initial ramdisk
-#               after genconfig) 
+# configuration script for general Ubuntu to configure OpenSLX linux
+# diskless clients (executed within initial ramdisk after genconfig) 
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 23-06-2006
-#               Nico Dietrich
-#               Felix Endres
+# Dirk von Suchodoletz <dirk@goe.net>, 23-06-2006
+# Nico Dietrich
+# Felix Endres
 #
-# Copyright:    (c) 2006 - RZ Universitaet Freiburg
-# 
-# Version:      0.3.0a
+# (c) 2006 - RZ Universitaet Freiburg
+# (c) 2006 - OpenSLX.ORG project
 
 # empty functions are defined at the beginning of /etc/functions
 
@@ -219,6 +217,8 @@ fi
 echo "gdm:x:113:">>/etc/group
 echo "gdm:x:106:113:Gnome Display Manager" >> /etc/shadow
 
+# fixme: check if a gdm.conf was provided via ConfTGZ
+# [ -f /rootfs/etc/gdm/gdm.conf ??? ] || \
 echo -e "# /etc/gdm/gdm.conf - file generated by $0\n\
 
 [daemon]
@@ -328,14 +328,20 @@ fi
 
 # configure kdm as display manager
 config_kdm () {
+# fixme: check if a kdmrc was provided via ConfTGZ
+#[ -f /rootfs/etc/opt/???? kdmrc ] || \
+# echo " ..." > kdmrc
+#if [ "x$late_dm" = "xyes" ] ; then
  rllinker "kdm" "25" "01"
  if [ "x$start_xdmcp" = "xkdm" ]; then 
    echo /usr/bin/kdm > /mnt/etc/X11/default-display-manager
  fi
+#else
 #  ln -sf ../${D_INITDIR}/kdm /mnt/etc/rc3.d/K20kdm
 #  echo -e "\t/etc/${D_INITDIR}/kdm start >${LOGFILE} 2>&1\n\
 #    \t( sleep 120; ln -sf /etc/${D_INITDIR}/kdm /etc/rc3.d/S01kdm \
 #    >${LOGFILE} 2>&1) &\n" >>/mnt/etc/${D_INITDIR}/boot.ld
+#fi
 }
 
 # configure hal, dbus, resmgr and services like that