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

7 files changed, 111 insertions, 152 deletions

diff --git a/Makefile b/Makefile
index 070730de..bf695b7d 100644
--- a/Makefile
+++ b/Makefile
@@ -60,11 +60,12 @@ stage4 rootfs has the\n# prefix '/mnt'." \
 	@echo -e "#!/bin/sh\n#\n# This script allows the local admin to \
 extend the\n# capabilities at the end of the initramfs (stage3). The \
 toolset is rather\n# restricted and you have to keep in mind that stage4 \
-rootfs has the\n# prefix '/mnt'." \
+rootfs has the\n# prefix '/mnt'. But you might use some special slx \
+functions via\# inclusion: '. /etc/functions' ..." \
 	  > /var/lib/openslx/config/default/initramfs/postinit.local
 	@chmod u+x /var/lib/openslx/config/default/initramfs/*init.local
 	@find /usr/share/openslx -depth -regex ".*/\..*" \
-	  -exec rm -rf {} 2>/dev/null \;
+	  -print0 | xargs -0 rm -rf {}
 
 #uninstall:
 #	@echo -e "Uninstalling openslx.org project files but keeping configs \
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"
 }
-
-
diff --git a/initrd/initrd-stuff/bin/hwautocfg b/initrd/initrd-stuff/bin/hwautocfg
index 64ed8970..d3417514 100755
--- a/initrd/initrd-stuff/bin/hwautocfg
+++ b/initrd/initrd-stuff/bin/hwautocfg
@@ -1,26 +1,23 @@
 #!/bin/sh
 #
-# Description:  universal (distro independent) hardware autoconfiguration 
-#		script for linux diskless clients, using hwconfig from 
-#		knoppix as base tool 
+# universal (distro independent) hardware autoconfiguration script for 
+# OpenSLX linux diskless clients, using hwconfig from knoppix as base tool 
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 18-07-2006
-#		Felix Endres
+# Dirk von Suchodoletz <dvs@OpenSLX.com>, 30-08-2006
 #
-# Copyright:    (c) 2003 - 2006 - RZ Universitaet Freiburg
-#               (c) 2006 - odlx.org project
-#
-# Version:      0.3.2c
+# (c) 2003 - 2006 - RZ Universitaet Freiburg
+# (c) 2006 - OpenSLX.org
 
 # local functions used within hwautocfg
 displaysetup () {
+# (temporary) configuration file
 local xfc=$1
 # define some defaults
 local HSYNCRANGE="31.5-63.5"
 local VSYNCRANGE="60-90"
 local DEFAULTMODES='"1024x768" "800x600" "640x480"'
 local DEFAULTCOLORDPT=24
-# set variables representing the xorg.conf sections (version 6.8.x)
+# set variables representing the xorg.conf sections (version 6.9.x)
 local Module='\tLoad\t\t"dbe"\n
 \tLoad\t\t"extmod"\n
 \tLoad\t\t"type1"\n
@@ -89,16 +86,11 @@ displayvars
 if [ -n "$hw_graphic" ] ; then
   DRV=${hw_graphic% *}
   CDP=${hw_graphic##* }
-  msg="Please check your graphic adaptor settings ($hw_graphic)."
-  if [ -z "$DRV" ] ; then error "  Manual configuration of your graphic \
-hardware module setting failed.\n  $msg" nonfatal
-    XMODULE=DRV
-  else
-    [ -z "${XMODULE}" ] && XMODULE=vesa
+  if [ -z "$DRV" ] ; then error "$hcfg_gfxdrv" nonfatal
+    XMODULE=vesa
   fi
 fi
-if [ -z "$CDP" ] ; then error "  Manual configuration of your graphic \
-systems color depth failed.\n  $msg" nonfatal
+if [ -z "$CDP" ] ; then error "$hcfg_gfxcdp" nonfatal
   CDP=${DEFAULTCOLORDPT}
 fi
 
@@ -112,28 +104,24 @@ if [ -n "$hw_monitor" ] ; then
 else
   # gather information about the monitor capabilities 
   screenres > /tmp/screenres
-  VERTSR=`cat /tmp/screenres | sed -n '/Vertical Frequency Range/s/[^0-9]* \([0-9-]*\)/\1/p'`
-  HORISR=`cat /tmp/screenres | sed -n '/Horizontal Frequency Range/s/[^0-9]* \([0-9-]*\)/\1/p'`
+  VERTSR=`cat /tmp/screenres | sed -n \
+    '/Vertical Frequency Range/s/[^0-9]* \([0-9-]*\)/\1/p'`
+  HORISR=`cat /tmp/screenres | sed -n \
+    '/Horizontal Frequency Range/s/[^0-9]* \([0-9-]*\)/\1/p'`
   HS=$HORISR
   VS=$VERTSR
   # compute max resolution
-  SCR_MODES=`cat /tmp/screenres | sed -n '/Recommended Screen Modes:/s/[^"]*\(.*\)/\1/p'`
+  SCR_MODES=`cat /tmp/screenres | sed -n \
+    '/Recommended Screen Modes:/s/[^"]*\(.*\)/\1/p'`
 fi
 
-#hwmsg="Please check your predefined monitor settings ($hw_monitor): Automatic\n\
-#configuration of display"
-if [ -z "$HS" ] ; then #error "  $hwmsg timings was attempted, but the \
-#horizontal frequency could not be detected. Using default frequency \
-#range (${HSYNCRANGE})" nonfatal
+if [ -z "$HS" ] ; then #error "$hcfg_hfrq" nonfatal
   HS=${HSYNCRANGE}
 fi
-if [ -z "$VS" ] ; then #error "  $hwmsg timings was attempted, but the \
-#vertical frequency could not be detected. Using default frequency \
-#range (${VSYNCRANGE})" nonfatal
+if [ -z "$VS" ] ; then #error "$hcfg_vfrq" nonfatal
   VS=${VSYNCRANGE}
 fi
-if [ -z "$SCR_MODES" ] ; then #error "  $hwmsg resolution was attempted but not \
-#established. Using default resolutions (${DEFAULTMODES})" nonfatal
+if [ -z "$SCR_MODES" ] ; then #error "$hcfg_res" nonfatal
   SCR_MODES=${DEFAULTMODES}
 fi
 monmanual=yes 
@@ -164,31 +152,13 @@ for section in Files ServerFlags Module InputDevice Monitor \
     Device)
       echo -e ${Device} | \
         sed -e "s,XMODULE,${XMODULE}," -e "s%XDESC%${XDESC}%" >>$xfc
-            # special options may be needed for some drivers
-            [ $DEBUGLEVEL -gt 1 ] && msg "X setup" \
-"adding for some Xfree86 modules (radeon, s3virge, nvidia) special\noptions \
-to the 'Device' section. Consult hwsetup if you like to add more or\nremove some."
-	    # write TV config - no problem, if no TV is connected
-	    [ -n "$TVOUT" ] && echo -e $TVOUT >>$xfc
-            [ x$DRV = "xs3virge" ] && {
-            echo -e "\tOption\t\t\"XVideo\" \"Off\"\n" >>$xfc
-            [ $DEBUGLEVEL -gt 1 ] && msg  "X setup" \
-"added special option for \
-the s3virge module -> 'XVideo Off'. remove the\nappropriate line in hwsetup \
-if you like not to use it." ; }
-            [ x$DRV = "xnvidia" ] && {
-            echo -e "\tOption\t\t\"NvAGP\" \"3\"" >>$xfc
-            echo -e "\tOption\t\t\"NoLogo\" \"1\"" >>$xfc
-            [ $DEBUGLEVEL -gt 1 ] && msg  "X setup" \
-"added special option for \
-the nvidia module -> 'NvAGP '. it sets the use\nof internal or external \
-agpgart support." ; }
-            [ "$busid" ] && {
-            echo -e "\tOption\t\t\"BusID\" \"$busid\"" >>$xfc
-            [ $DEBUGLEVEL -gt 1 ] && msg  "X setup" \
-"added special option for \
-the 'BusID' information - it\ndefines the npostion of graphics adaptor in \
-pci/agp bus needed for acceleration." ; }
+        # write TV config - no problem, if no TV is connected
+	[ -n "$TVOUT" ] && echo -e $TVOUT >>$xfc
+        [ x$DRV = "xs3virge" ] && \
+	  echo -e "\tOption\t\t\"XVideo\" \"Off\"\n" >>$xfc
+	[ x$DRV = "xnvidia" ] && {
+	  echo -e "\tOption\t\t\"NvAGP\" \"3\"" >>$xfc
+	  echo -e "\tOption\t\t\"NoLogo\" \"1\"" >>$xfc ; }
     ;;
     Module)
       echo -e ${Module} >>$xfc
@@ -241,7 +211,7 @@ done
 # functions common for all distros
 . /etc/functions
 # functions common for all distros, messages contains all error and
-# info output (fixme!! put messages output into that file)
+# info output
 . /etc/messages
 # load distro specific configuration variables and functions. distro
 # specific functions may overwrite functions defined in /etc/functions
@@ -296,9 +266,7 @@ modprobe ${MODPRV} agpgart || \
 
 # wait for /tmp/hwsetup.info to appear
 waitfor /tmp/hwrun1 50000 || \
-  error "  Expected information from hwsetup to appear in \
-/tmp/hwsetup.info.\n  Unable to configure parts of the systems hardware. \
-Please check that\n  hwsetup is properly installed and executable."
+  error "$hcfg_hwsetup"
 # load ide drivers first, takes a while to initialize
 for DRIVER in cmd64x hpt366 piix slc90e66 cs5520 it821x rz1000 \
     triflex aec62xx cs5530 ns87415 sc1200 trm290 alim15x3 \
@@ -343,8 +311,9 @@ for DRIVER in yenta_socket i82365 pd6729 tcic; do
     DRIVERLIST="${DRIVERLIST} ${DRIVER}"
     PCMCIA="yes"; }
 done
+# should we check for card reader modules too?
+
 if [ -n "${PCMCIA}" ] ; then
-  #echo "pcmcia=\"yes\"" > config
   modprobe ${MODPRV} ds
 fi
 # sound card setup (alsa and oss compatibility drivers)
@@ -352,7 +321,8 @@ if [ -f /etc/sysconfig/sound ] ; then
   . /etc/sysconfig/sound
 else DRIVER="snd-dummy"
 fi
-# problem with a specific module not disabled when busybox
+# problem with a specific module not disabled (via above trick) when 
+# busybox is used
 #  rmmod snd_atiixp_modem snd_atiixp
 modprobe ${MODPRV} ${DRIVER}
 DRIVERLIST="${DRIVERLIST} ${DRIVER} "
@@ -407,8 +377,7 @@ cfgcomplete
 DEFKEYTABLE="de-latin1-nodeadkeys"
 localization $country
 if [ -z "${KEYTABLE}" ] ; then
-  msg "Keyboard setup" "No settings found for keyboard, using default of \
-'${DEFKEYTABLE}' defined\nin $0."
+  error "$hcfg_keyb" nonfatal 
   KEYTABLE=${DEFKEYTABLE}
 fi
 
@@ -425,7 +394,9 @@ for hd in $(cat /tmp/hwsetup.info|sed -n -e '/HD$/,/device:/p'| \
       sed -n -e "/ 82 /p"|sed -e "s/[[:space:]].*//") ; do
     echo -e "$hdpartnr\tswap\t\tswap\t\tdefaults\t 0 0" >> /tmp/fstab
   done
-  # we use special non assigned partition type for harddisk scratch space
+  # we use special non assigned partition type (id44) for harddisk scratch 
+  # space, thus no normal filesystem will be incidentally deleted or
+  # corrupted
   for hdpartnr in $(cat /tmp/hd_part | \
         sed -n -e "/ 44 /p"|sed -e "s/[[:space:]].*//") ; do
     # ext2fs_check_if_mount message supressed
diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig
index 28ae881f..e9eb572c 100755
--- a/initrd/initrd-stuff/bin/servconfig
+++ b/initrd/initrd-stuff/bin/servconfig
@@ -82,7 +82,7 @@ if [ "x$vmware" != "x" ] && [ "x$vmware" != "xno" ] ; then
   if [ -d /mnt/usr/share/vmware ] ; then
     ln -sf /usr/share/vmware /mnt/var/lib/vmware
   elif [ -n "${imgsrv}" ] ; then
-  # get type, server, path of VMware image export
+  # get type, server and path of VMware image export
   vmimgsprot=$(uri_token $imgsrv prot)
   vmimgsserv=$(uri_token $imgsrv server)
   vmimgspath="/$(uri_token $imgsrv path)"
@@ -90,7 +90,7 @@ if [ "x$vmware" != "x" ] && [ "x$vmware" != "xno" ] ; then
     *nbd)
     ;;
     *)
-    #  # more general mount script should be used here!?
+    # we expect nfs mounts here ... 
     nfsmnt ${imgsrv} /mnt/var/lib/vmware || {
       error "$scfg_nfs" nonfatal; noimg=yes; }
     ;;
@@ -101,8 +101,7 @@ fi
 #######################################################################
 # set localization
 if [ -z "$country" ] ; then
-  msg "servconfig" "No configuration for localization found in config file. \
-Using default\ncountry setting '${D_DEFAULTCOUNTRY}' defined in $0."
+  error "$scfg_country" nonfatal
   country=${D_DEFAULTCOUNTRY}
 fi
 localization $country
@@ -424,8 +423,7 @@ $date\nwhile ps aux|grep -i kiosk|grep -v \"grep\" &>/dev/null;\
 do\n  test -f /var/run/kiosk || break; sleep 3;\ndone\ntouch \
  /var/run/kiosk\nresmgr login nobody tty7\nresmgr grant nobody desktop\n\
 chown nobody /dev/dsp* /dev/audio* /dev/mixer* /dev/snd/control*\n\
-#tar -zxvf /var/lib/vmware/templ/nobodyconf.tar.gz -C /var/lib/nobody\n\
-chown -R nobody.nobody /var/lib/nobody\nsu -c 'xinit /var/X11R6/bin/startgui \
+chown -R nobody:nobody /var/lib/nobody\nsu -c 'xinit /var/X11R6/bin/startgui \
 $start_x -- vt7 -quiet' -l nobody &>/dev/null\nrm /var/run/kiosk\n\
 resmgr revoke nobody\nresmgr logout tty7\nkillall X" \
         >/mnt/var/X11R6/bin/kiosk
@@ -439,9 +437,6 @@ resmgr revoke nobody\nresmgr logout tty7\nkillall X" \
       rm /mnt/var/run/kiosk 2>/dev/null
     ;;
   esac
-  # enable runlevel 5 (X11 gui under SuSE linux)
-  #      grep -v -e "7:[35]" /etc/inittab > /etc/inittab.new
-  #      [ -z "$init" ] || {
   echo -e "# entry made by $0 $date\n$init" >> /mnt/etc/inittab
 fi
 
diff --git a/initrd/initrd-stuff/etc/functions b/initrd/initrd-stuff/etc/functions
index 22827b01..81308e4c 100644
--- a/initrd/initrd-stuff/etc/functions
+++ b/initrd/initrd-stuff/etc/functions
@@ -1,15 +1,13 @@
-# Description:  common function script for the configuration of
-#               linux diskless clients (included by init, hwautocfg,
-#               servconfig, ... within initial ramdisk) 
+# common function script for the configuration of linux diskless clients
+# (included by init, hwautocfg, servconfig, ... within OpenSLX initial 
+# ramfs) 
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 18-08-2006
-#               Felix Endres, 30-04-2006
-#               Tobias Maier
+# Dirk von Suchodoletz <dvs@OpenSLX.com>, 31-08-2006
+# Felix Endres, 30-04-2006
+# Tobias Maier
 #
-# Copyright:    (c) 2006 - RZ Universitaet Freiburg
-#               (c) 2006 - OpenSLX.ORG Project
-# 
-# Version:      0.5.1b
+# (c) 2006 - RZ Universitaet Freiburg
+# (c) 2006 - OpenSLX.ORG Project
 
 #######################################################################
 # set of empty dummy functions (loaded before real functions in the 
@@ -93,9 +91,7 @@ else
 #  }
 fi
 }
-msg () {
-echo -e "$1 info: $2"
-}
+
 #######################################################################
 # micro sleep - either busybox command or simply loop and delete 1 from 
 # the first argument gotten until zero
@@ -365,9 +361,9 @@ case "$tftp" in
     */tftp)
       # distinguish between busybox tftp and standalone (in.tftp) client
       if [ -x /bin/busybox ] ; then
-        tftp -g -r $1 -l $dst $2 2> /dev/null
+        tftp -g -r $1 -l $dst $2 1>&2 >/dev/null
       else
-        echo "get $1 $dst" | tftp $2 2> /dev/null 
+        echo "get $1 $dst" | tftp $2 1>&2 >/dev/null 
       fi
     ;;
 esac
@@ -402,7 +398,6 @@ and as last\n# distro/default" >> /tmp/confviafile
     tftpgetunpack $cfgfile $tftpserver && break
   done
 fi
-#echo "# -> $cfgfile" >> /tmp/confviafile
 test -f /initramfs/machine-setup && \
   cat /initramfs/machine-setup >> /tmp/confviafile
 echo "fileget via $srvproto finished" > /tmp/file-done
diff --git a/initrd/initrd-stuff/etc/messages b/initrd/initrd-stuff/etc/messages
index b9c4e155..da6c25ba 100644
--- a/initrd/initrd-stuff/etc/messages
+++ b/initrd/initrd-stuff/etc/messages
@@ -1,16 +1,15 @@
-# Description:  messages file for all error and info messages generated 
-#               during client bootup (within initialramfs) for linux 
-#               diskless clients of	version 4
-#               this file could be used for localization of error messages 
+# messages file for all error and info messages generated during client
+# bootup (within initialramfs) for OpenSLX linux diskless clients version 4
+# this file could be used for localization of error messages 
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 26-06-2006
+# Dirk von Suchodoletz <dvs@openslx.com>, 30-08-2006
 #
-# Copyright:    (c) 2006 - RZ Universitaet Freiburg
-#               (c) 2006 - odlx.org project
-# 
-# Version:      0.0.3f
+# (c) 2006 - RZ Universitaet Freiburg
+# (c) 2006 - OpenSLX.org
+#
+# Version:      0.0.3g
 
-# messages from init
+# messages from (slx) init
 init_errmsg="functions file contains a lot of script \
 functionality. Without this\ninit script will not run."
 init_mff="The main $init_errmsg"
@@ -149,9 +148,29 @@ creatable\n  (e.g. because of UnionFS writeable root directory)."
 scfg_erratpld="  Only toplevel directories \
 are allowed as mount points for user home\n  directories. Please set the \
 variable \${automnt_dir} appropriately in\n  machine-setup file."
+scfg_country="  No configuration for localization found in config file. \
+Using default\n  country setting '${D_DEFAULTCOUNTRY}' defined in $0."
 
 # messages from hwautocfg
 hcfg_xcfg="  You should define the variable D_XF86CONFFILE in yours distro \
 configuration\n  file"
 hcfg_hwsetup="  The xserver configuration file generated by hwsetup could \
 not\n  be found."
+hcfg_keyb="  No settings found for keyboard, using default of \
+'${DEFKEYTABLE}' defined\n  in $0."
+gfx_msg="Please check your graphic adaptor settings ($hw_graphic)."
+hcfg_gfxdrv="  Manual configuration of your graphic hardware module setting \
+failed.\n  $gfx_msg"
+hcfg_gfxcdp="  Manual configuration of your graphic systems color depth \
+failed.\n  $gfx_msg"
+hw_msg="  Please check your predefined monitor settings ($hw_monitor): \
+Automatic\n  configuration of display"
+hcfg_hfrq="  $hwmsg timings was attempted, but the horizontal frequency \
+could not be detected. Using default frequency range (${HSYNCRANGE})"
+hcfg_vfrq="  $hwmsg timings was attempted, but the vertical frequency \
+could not be detected. Using default frequency range (${VSYNCRANGE})"
+hcfg_res="  $hwmsg resolution was attempted but not established. Using \
+default resolutions (${DEFAULTMODES})"
+hcfg_hwsetup="  Expected information from hwsetup to appear in \
+/tmp/hwsetup.info.\n  Unable to configure parts of the systems hardware. \
+Please check that\n  hwsetup is properly installed and executable."