From ca73187f042e904f764d715707f2a3e19afedf58 Mon Sep 17 00:00:00 2001
From: Oliver Tappe
Date: Thu, 5 Apr 2007 12:28:51 +0000
Subject: * renamed '/etc/sysconfig/slxconfig' to
 '/etc/sysconfig/slxsystem.conf' in order to   avoid confusions between this
 file and the 'slxconfig'-script. * changed slxconfig-demuxer to automatically
 add the current OpenSLX-version into   slxsystem.conf (via slxversion).

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

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

diff --git a/initramfs/initrd-stuff/bin/servconfig b/initramfs/initrd-stuff/bin/servconfig
index ed1a209f..70ab7c48 100755
--- a/initramfs/initrd-stuff/bin/servconfig
+++ b/initramfs/initrd-stuff/bin/servconfig
@@ -24,7 +24,7 @@
 # specific functions may overwrite functions defined in /etc/functions
 . /etc/sysconfig/config
 . /etc/distro-functions
-. /etc/sysconfig/slxconfig
+. /etc/sysconfig/slxsystem.conf
 # get location of logfile definition
 . /mnt/etc/${D_SYSCONFDIR}/logfile
 
@@ -92,7 +92,7 @@ if [ -z "$country" ] ; then
 fi
 localization "${country}"
 if [ -z "${KEYTABLE}" ] ; then
-  error "$hcfg_keyb" nonfatal 
+  error "$hcfg_keyb" nonfatal
   KEYTABLE=${DEFKEYTABLE}
 fi
 echo -e "\t# entries added by $0: $date" >> /mnt/etc/${D_INITDIR}/boot.slx
@@ -122,7 +122,7 @@ if [ "x$vmware" != "x" ] && [ "x$vmware" != "xno" ] ; then
     *nbd)
     ;;
     *)
-    # we expect nfs mounts here ... 
+    # we expect nfs mounts here ...
     nfsmnt ${vmimgserv}:${vmimgpath} /mnt/var/lib/vmware || {
       error "${scfg_nfs}" nonfatal; noimg=yes; }
     ;;
-- 
cgit v1.2.3-55-g7522