Changed init for using a variable @@@serverip@@@ instead of fixed

defined server ip, introduced a function checkip to translate 
@@@serverip@@@ into the serverip the client determined itself. That
helps in more dynamic environments with servers using more than one ip
address. 
Added a special slx specific configuration file read in stage3 -
/etc/sysconfig/slxconfig. For the (deprecated) mkdxsinitrd an
ugly hack for creating a general slx config file instead of "patching"
the stage3 init is implemented ...


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

1 files changed, 14 insertions, 1 deletions

diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions
index 558c7fbb..95de2ac7 100644
--- a/initramfs/initrd-stuff/etc/functions
+++ b/initramfs/initrd-stuff/etc/functions
@@ -274,6 +274,17 @@ case $ipcfg in
 esac
 }
 #######################################################################
+# replace @@@serverip@@@ with real serverip
+checkip ()
+{
+if [ "@@@serverip@@@" = "$1" -a -n "$serverip" ] ; then
+  echo $serverip
+else
+  echo $1
+fi
+}
+
+#######################################################################
 # nfs mounter for root filesystem and other sources
 nfsmnt ()
 {
@@ -557,10 +568,12 @@ waitfor /tmp/file-done 10000 || error "$error_errfcfg" nonfatal
 waitfor /tmp/ldap-done 10000 || error "$error_errlcfg" nonfatal
 # concat the different files now into the central config file, order
 # matters - ldap data has highest priority
-if ! [ -f /tmp/cfgcomplete ] ; then
+if ! test -f /tmp/cfgcomplete ; then
   for config in /tmp/confviadhcp /tmp/confviafile /tmp/confvialdap
     do test -f $config && cat $config >> /etc/machine-setup
   done
+# check if serverip is set as variable @@@serverip@@@
+sed "s,@@@serverip@@@,$serverip," -i /etc/machine-setup
 echo "config completed" > /tmp/cfgcomplete
 fi
 }