Major cleanup in several scripts, bugfix for installation (make

install), messages, functions, ...



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

2 files changed, 28 insertions, 50 deletions

diff --git a/initrd/distro-specs/ubuntu/functions-5.10 b/initrd/distro-specs/ubuntu/functions-5.10
index f98da405..15692859 100644
--- a/initrd/distro-specs/ubuntu/functions-5.10
+++ b/initrd/distro-specs/ubuntu/functions-5.10
@@ -1,15 +1,14 @@
-# Description:  configuration script for Ubuntu V5.10 to configure
-#               linux diskless clients (executed within initial
-#               ramdisk after genconfig) - overwrites settings from the
-#               ubuntu default file (functions-default)
+# configuration script for Ubuntu V5.10 to configure OpenSLX linux diskless
+# clients (merged in stage2 with ubuntu/functions-default - and loaded within
+# initial ramfs - stage3) It may overwrite settings from the default config 
+# file (/etc/functions)
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 08-07-2006
-#               Nico Dietrich
-#               Felix Endres
+# Dirk von Suchodoletz <dvs@OpenSLX.com>, 31-08-2006
+# Nico Dietrich
+# Felix Endres
 #
-# Copyright:    (c) 2006 - RZ Universitaet Freiburg
-# 
-# Version:      0.3.0b
+# (c) 2006 - RZ Universitaet Freiburg
+# (c) 2006 - OpenSLX.ORG Project
 
 # distro specific stuff to initialize
 preinit () {
@@ -32,7 +31,6 @@ config_distro () {
   sed -e "s/.*initdefault/id:${D_INITDEFAULT}:initdefault/" -i /mnt/etc/inittab
 }
 
-# AUS SuSE-9.3
 # udev/hotplug - auto device discovery service
 udev_hotplug () {
   local result=0
@@ -43,21 +41,6 @@ udev_hotplug () {
   return $result
 }
 
-## udev service
-#udev_hotplug () {
-#local result=0
-#echo "Starting udev"
-#udevstart || result=1
-#if [ -x /bin/udevd ] ; then
-#  export UDEVD_EXPECTED_SEQNUM=$(cat /sys/kernel/hotplug_seqnum)
-#  export UDEVD_EVENT_TIMEOUT=1
-#  echo "" > /proc/sys/kernel/hotplug
-#  udevd --daemon || result=1
-#else error "df_errudev" nonfatal
-#fi
-#return $result
-#}
-
 # linking runlevel scripts
 rllinker () {
 local script="$1"
@@ -178,6 +161,7 @@ config_acpi () {
 }
 
 # configure hal, dbus, resmgr and services like that
+# fixme: complete or remove (dummy function is present in /etc/functions)
 config_dreshal () {
 if [ "x$start_dreshal" = "xyes" ]; then
   :
@@ -218,7 +202,7 @@ testmkd /mnt/var/X11R6/bin
 echo '#!/bin/sh'>> /mnt/etc/udev/rules.d/01-udev-vm.rules
 echo -e "# Script for blocking linux from handling usb \
 devices\n# during vmware sessions. If you like to remove certain modules \
-add them\n# to the list below - Dirk von Suchodoletz, <dirk@goe.net>\n\
+add them\n# to the list below - Dirk von Suchodoletz, <dvs@OpenSLX.com>\n\
 STATE=1\nps aux|grep -i vmware|grep -v \"grep\" &>/dev/null && { STATE=0; \
 /sbin/rmmod usb-storage &>/tmp/null; }\n\
 [ x\$ACTION = xremove ] && { [ \$STATE = 0 ] && /sbin/rmmod usb-storage \
@@ -226,7 +210,7 @@ STATE=1\nps aux|grep -i vmware|grep -v \"grep\" &>/dev/null && { STATE=0; \
 chmod u+x /mnt/var/X11R6/bin/vm-udev
 echo -e "# special entry to block linux from reacting to usb events during \
 running\n# vmware sessions, generated by $0 during initramfs\n# Dirk von \
-Suchodoletz, <dirk@goe.net>\nSUBSYSTEM==\"usb\", ACTION==\"add\", \
+Suchodoletz, <dvs@OpenSLX.com>\nSUBSYSTEM==\"usb\", ACTION==\"add\", \
 PROGRAM=\"/var/X11R6/bin/vm-udev\", OPTIONS=\"ignore_device\"\n\
 SUBSYSTEM==\"usb\", ACTION==\"remove\", PROGRAM=\"/var/X11R6/bin/vm-udev\"" \
   >> /mnt/etc/udev/rules.d/01-udev-vm.rules
diff --git a/initrd/distro-specs/ubuntu/functions-6.06 b/initrd/distro-specs/ubuntu/functions-6.06
index a2d00ed8..a4bcc66c 100644
--- a/initrd/distro-specs/ubuntu/functions-6.06
+++ b/initrd/distro-specs/ubuntu/functions-6.06
@@ -1,14 +1,14 @@
-# Description:  configuration script for Debian 3.1 to configure
-#		linux diskless clients (executed within initial
-#		ramdisk after genconfig) 
+# configuration script for Ubuntu V6.06 to configure OpenSLX linux diskless
+# clients (merged in stage2 with ubuntu/functions-default - and loaded within
+# initial ramfs - stage3) It may overwrite settings from the default config
+# file (/etc/functions)
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 18-05-2006
-#		Felix Endres, 30-04-2006
-#		Tobias Maier
+# Dirk von Suchodoletz <dirk@goe.net>, 31-08-2006
+# Nico Dietrich
+# Felix Endres, 29-08-2006
 #
-# Copyright:    (c) 2006 - RZ Universitaet Freiburg
-# 
-# Version:      0.2.1d
+# (c) 2006 - RZ Universitaet Freiburg
+# (c) 2006 - OpenSLX.ORG Project
 
 # distro specific stuff to initialize
 preinit () {
@@ -21,8 +21,9 @@ preinit () {
 
 # distro specific function called from servconfig script
 
-# AUS SuSE-9.3
 # udev/hotplug - auto device discovery service
+# fixme: why does nothing happens here!? If default should be used just
+# skip that function here!! 
 # Result: 1 is bad, 0 is good
 udev_hotplug () {
 #  local result=0
@@ -39,8 +40,6 @@ udev_hotplug () {
 :
 }
 
-
-
 # function for atd
 config_atd () {
 if [ "x$start_atd" = "xyes" ]; then
@@ -68,7 +67,6 @@ if [ "x$start_cron" = "xyes" ] ; then
 fi
 }
 
-
 # secure shell service
 config_sshd () {
 if [ "x$start_sshd" = "xyes" ] ; then
@@ -119,6 +117,7 @@ else
 fi
 
 # create links to desktop-session chooser
+# fixme: wmlist is SuSE stuff !?!?
 [ -f /mnt/usr/bin/X11/wmlist ] && wmlist=`cat /mnt/usr/bin/X11/wmlist`
 
 for i in `echo $windowmanagers|sed -e "s/,/ /g"` ; do
@@ -141,6 +140,8 @@ done
 }
 
 # set up keytable (function run in hwautocfg)
+# fixme: is anything needed here - otherwise remove (and check that a 
+# dummy function is present)
 keytable () {
 # fixme -- use keytable setup script here
 :
@@ -148,15 +149,8 @@ keytable () {
 
 # consolefont and language
 consolefont () {
-# better change that in /etc/functions to UTF8 default
-if [ "$LANG" == "de_DE@euro" ] ; then
-  LANG=de_DE.UTF8
-fi
-sed -e "s,LANGUAGE=.*,LANGUAGE=${LANG}," \
-    -e "s,LANG=.*,LANG=${LANG}," \
+[ "$LANG" == "de_DE@euro" ] && LANG=de_DE.UTF8
+sed -e "s,LANGUAGE=.*,LANGUAGE=${LANG},;s,LANG=.*,LANG=${LANG}," \
     -i /mnt/etc/environment
-
 rllinker "console-screen.sh" "31" "03"
 }
-
-