From 01fc142f21e29e51952d5ec50f15047810650c6d Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Wed, 4 Apr 2007 22:14:42 +0000
Subject: Writing halt script for SuSE systems from functions-*, see #111 Pass
 SLXVERSION string (via slxconfig, slxconf_slxver -> SLXVERSION) for better
 version marking ...

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@863 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initramfs/initrd-stuff/bin/servconfig | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'initramfs/initrd-stuff/bin/servconfig')

diff --git a/initramfs/initrd-stuff/bin/servconfig b/initramfs/initrd-stuff/bin/servconfig
index f65ccb70..0fa0d395 100755
--- a/initramfs/initrd-stuff/bin/servconfig
+++ b/initramfs/initrd-stuff/bin/servconfig
@@ -11,7 +11,7 @@
 #
 # universal (distro independent) configuration script for OpenSLX linux
 # diskless clients (executed in stage3 within initial ramfs). The file-
-# system is setup when servconfig starts
+# system setup is completed when servconfig starts
 
 #############################################################################
 # check for configuration files to source
@@ -24,6 +24,7 @@
 # specific functions may overwrite functions defined in /etc/functions
 . /etc/sysconfig/config
 . /etc/distro-functions
+. /etc/sysconfig/slxconfig
 # get location of logfile definition
 . /mnt/etc/${D_SYSCONFDIR}/logfile
 
@@ -58,10 +59,10 @@ cfgcomplete
 cp -a /rootfs/* /mnt 2>/dev/null
 
 # set greeting and add information on booted system (distro)
-len=$(expr length $DISTRO)
-dstr="$DISTRO)"
-while [ $len -le 16 ] ; do
-  dstr="$dstr "
+len=$(expr length ${SLXVERSION}${DISTRO})
+vdstr="v${SLXVERSION}/${DISTRO})"
+while [ $len -le 20 ] ; do
+  vdstr="$vdstr "
   len=$(expr $len + 1)
 done
 len=$(expr length $host_name)
@@ -78,7 +79,7 @@ echo "
          |  |_|  |  |    |  |___|  |  |  |   ____|  |  |___ /  /
            _____/|__|    |______|__|  |__|  |_______|______|__|  |__|
 
-   Diskless Workstation (v4.0.8/$dstr (c) <OpenSLX.ORG project>
+   Stateless Workstation ($vdstr (c) <OpenSLX.ORG project>
 ">/mnt/etc/issue
 
 #############################################################################
-- 
cgit v1.2.3-55-g7522