diff options
| author | Oliver Tappe | 2007-04-05 14:28:51 +0200 |
|---|---|---|
| committer | Oliver Tappe | 2007-04-05 14:28:51 +0200 |
| commit | ca73187f042e904f764d715707f2a3e19afedf58 (patch) | |
| tree | 0cf1ab40fdf6ec102261596a5f146e09680cbfc2 /initramfs/initrd-stuff/init | |
| parent | Fix for preparation of /etc/hosts file (if more than one domain name (diff) | |
| download | core-ca73187f042e904f764d715707f2a3e19afedf58.tar.gz core-ca73187f042e904f764d715707f2a3e19afedf58.tar.xz core-ca73187f042e904f764d715707f2a3e19afedf58.zip | |
* 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
Diffstat (limited to 'initramfs/initrd-stuff/init')
| -rwxr-xr-x | initramfs/initrd-stuff/init | 14 |
1 files changed, 7 insertions, 7 deletions
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 |