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, 40 insertions, 26 deletions

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."