* 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

6 files changed, 23 insertions, 22 deletions

diff --git a/config-db/slxconfig-demuxer b/config-db/slxconfig-demuxer
index 17c93407..7b854918 100755
--- a/config-db/slxconfig-demuxer
+++ b/config-db/slxconfig-demuxer
@@ -340,9 +340,12 @@ sub generateInitalRamFS
 	# ...set list of network modules...
 	$slxConf{'slxconf_listnwmod'}
 		= $setup->{'ramfs_nicmods'} || $settings->{'default_nicmods'};
-	# ...now create slxconfig file and pass it to slxmkramfs:
-	writeSlxConfigToFile(\%slxConf, "$tempPath/slxconfig");
-	$cmd .= qq[-s "$tempPath/slxconfig" ];
+	# ...add version info...
+	my $slxver = `slxversion`;
+	$slxConf{'slxconf_slxver'} = chomp $slxver;
+	# ...now create slxsystem.conf file and pass it to slxmkramfs:
+	writeSlxConfigToFile(\%slxConf, "$tempPath/slxsystem.conf");
+	$cmd .= qq[-s "$tempPath/slxsystem.conf" ];
 
 	$ENV{'SLX_PRIVATE_PATH'} = $openslxConfig{'private-path'};
 	$ENV{'SLX_PUBLIC_PATH'} = $openslxConfig{'public-path'};
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; }
     ;;
diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init
index d68d18a8..023682a5 100755
--- a/initramfs/initrd-stuff/init
+++ b/initramfs/initrd-stuff/init
@@ -17,15 +17,15 @@
 # functions common for all distros, messages contains all error and info
 # output (for some reason the error output is not produced properly - crash)
 
-# how do the localization here? There is not yet a country-Variable 
+# how do the localization here? There is not yet a country-Variable
 . /etc/messages
 . /etc/functions || ( echo -e $init_mff && sleep 100 )
 . /etc/distro-functions || ( echo -e $init_dff && sleep 100 )
 # distro specific configuration settings (several file and directory
 # variables)
 . /etc/sysconfig/config || ( echo -e $init_dscf && sleep 100 )
-# configuration settings for slx environment
-. /etc/sysconfig/slxconfig 2>/dev/null || ( echo -e ${init_sscf} && \
+# configuration settings for this slx system's environment
+. /etc/sysconfig/slxsystem.conf 2>/dev/null || ( echo -e ${init_sscf} && \
   sleep 100 )
 # machine-setup configuration (common settings for all clients using a
 # certain InitRamFS generated by slxmkramfs/mkdxsinitrd)
@@ -408,7 +408,7 @@ if [ -n "${nbdmod}" ] ; then
   [ $DEBUGLEVEL -eq 20 ] && echo "** finished nw blockdev stuff at $(sysup)"
 elif [ -n ${iscsiserver} ] ; then
   [ $DEBUGLEVEL -eq 20 ] && echo "** started setting up iSCSI initiator at \
-$(sysup)" 
+$(sysup)"
   #if [ -n ${iscsitarget} ] ; then
   #  echo "InitiatorName=${iscsitarget}"|sed "s,@@@serverip@@@,$serverip," \
   #    >/etc/initiatorname.iscsi
@@ -441,7 +441,7 @@ fi
 # get the complete collection of kernel modules available
 mount -n --bind /mnt/lib/modules/${KERNEL} /lib/modules/${KERNEL} || \
   error "$init_moddir"
-# start hardware configuration as background process if not a special 
+# start hardware configuration as background process if not a special
 # debuglevel (21) is used for the option of manual hwautocfg start
 if [ ${DEBUGLEVEL} = 21 ] ; then
   echo "You can run 'hwautocfg main &' manually now ..."
@@ -500,7 +500,7 @@ elif [ -z "${cowloop}" ] ; then
   # see above ...
   ldcfg
   # save the RO directories mentioned in the distro-specific
-  # config to a temporary directory. They will lateron be restored 
+  # config to a temporary directory. They will lateron be restored
   for path in ${D_RODIRSINRW}; do
     if [ -d /mnt/${path} ] ; then
       list=${path}" "${list}
@@ -555,7 +555,7 @@ if [ ${DEBUGLEVEL} = 22 ] ; then
 else
   servconfig &
 fi
-  
+
 for path in @@@COMDIRINDXS@@@ ${D_DIRINDXS} ${D_DIRINBINDMNT} ; do
   testmkd /mnt/${path}
 done
diff --git a/initramfs/mkdxsinitrd b/initramfs/mkdxsinitrd
index 1d86c90c..bfc6b141 100755
--- a/initramfs/mkdxsinitrd
+++ b/initramfs/mkdxsinitrd
@@ -59,7 +59,7 @@ SLX_CONFIG_PATH=@@@SLX_CONFIG_PATH@@@
    . $SLX_CONFIG_PATH/settings.default
 [ -f $SLX_CONFIG_PATH/settings.local ] && \
    . $SLX_CONFIG_PATH/settings.local
-# read the common functions file 
+# read the common functions file
 [ -e ${SLX_SHARE_PATH}/initramfs/etc/functions ] && \
   . ${SLX_SHARE_PATH}/initramfs/etc/functions
 
@@ -195,7 +195,7 @@ else
      # the stage3 init - fixme: version string should be added in a more clever way
      echo -e "slxconf_date=${DATE}\nslxconf_kernver=${KERNVER}\n\
 slxconf_listnwmod=\"${NWMODULES}\"\nslxconf_distro=${DISTRO}-${DISTRO_VER}\n\
-slxconf_slxver=\"4.0.8b\"" > ${INSTDIR}/etc/sysconfig/slxconfig
+slxconf_slxver=\"4.0.8b\"" > ${INSTDIR}/etc/sysconfig/slxsystem.conf
      [ "$use_busybox" = 1 ] && sed -e "s,^#!/bin/sh,#!/bin/ash," \
        -i ${INSTDIR}/${FILENAME}
   fi
@@ -373,7 +373,7 @@ shift $(expr $OPTIND - 1)
 #########################################################################
 # End of parameter, argument interpretation
 
-# Check for superuser id 
+# Check for superuser id
 precheck
 #Change to the directory this script is located in
 goto_script_dir
@@ -729,7 +729,7 @@ for module in af_packet unix ${NWMODULES} ${FSMODULES} ${MISCMODULES} \
         # iscsi modules
         # cobi cobi iscsiadm iscsid bin &>/dev/null
         #mkdir -p ${ddirprefix}/drivers/scsi
-        #for i in scsi_mod scsi_transport_iscsi libiscsi iscsi_tcp; do 
+        #for i in scsi_mod scsi_transport_iscsi libiscsi iscsi_tcp; do
         #  cp ${rdirprefix}/drivers/scsi/$i.ko
         #    ${ddirprefix}/drivers/scsi
         #done
diff --git a/initramfs/mkdxsinitrd.64bit b/initramfs/mkdxsinitrd.64bit
index f15bda03..f4d77d17 100755
--- a/initramfs/mkdxsinitrd.64bit
+++ b/initramfs/mkdxsinitrd.64bit
@@ -173,7 +173,7 @@ else
           initrd-stuff/${FILENAME} >> ${INSTDIR}/${FILENAME}
 # ugly hack for creating a general slx config file instead of "patching"
      # the stage3 init
-     echo -e "slxconf_date=${DATE}\nslxconf_kernver=${KERNVER}\nslxconf_listnwmod=\"${NWMODULES}\"\nslxconf_distro=${DISTRO}-${DISTRO_VER}" > ${INSTDIR}/etc/sysconfig/slxconfig
+     echo -e "slxconf_date=${DATE}\nslxconf_kernver=${KERNVER}\nslxconf_listnwmod=\"${NWMODULES}\"\nslxconf_distro=${DISTRO}-${DISTRO_VER}" > ${INSTDIR}/etc/sysconfig/slxsystem.conf
     [ -x busybox -a "$use_busybox" = 1 ] && sed -e "s,^#!/bin/sh,#!/bin/ash," \
       -i ${INSTDIR}/${FILENAME}
   fi
diff --git a/initramfs/slxmkramfs b/initramfs/slxmkramfs
index a0fe3914..194a82d3 100755
--- a/initramfs/slxmkramfs
+++ b/initramfs/slxmkramfs
@@ -314,10 +314,8 @@ mkdir -p ${INSTDIR}/usr/share
 mkdir -p ${INSTDIR}/etc/sysconfig
 
 if [ -n "${settings_file}" ] ; then
-	# copy settings file (slxconfig) into the right place:
-	cp $settings_file ${INSTDIR}/etc/sysconfig/slxconfig
-	# fixme: echo version number
-	echo 'slxconf_slxver="4.0.8b"' >> ${INSTDIR}/etc/sysconfig/slxconfig 
+	# copy settings file (slxsystem.conf) into the right place:
+	cp $settings_file ${INSTDIR}/etc/sysconfig/slxsystem.conf
 fi
 
 # if still no distro name set, try to find it using significant files