From faae7cc8eecda6c1477742ee63273f1bed784caf Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Thu, 7 Sep 2006 21:46:31 +0000
Subject: 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
---
 initrd/distro-specs/ubuntu/functions-default | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

(limited to 'initrd/distro-specs/ubuntu/functions-default')

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
-- 
cgit v1.2.3-55-g7522