diff options
| author | Oliver Tappe | 2006-10-01 21:57:23 +0200 |
|---|---|---|
| committer | Oliver Tappe | 2006-10-01 21:57:23 +0200 |
| commit | 93ff8e054c6edfe0bf0e8d518c97046eb69c1cc2 (patch) | |
| tree | c6e8c7042be55411daa71d29ee7f7e5a1640dc87 /initramfs/mkdxsinitrd | |
| parent | * removed --use-absolute-tftp-path again, as this functionality is now implem... (diff) | |
| download | core-93ff8e054c6edfe0bf0e8d518c97046eb69c1cc2.tar.gz core-93ff8e054c6edfe0bf0e8d518c97046eb69c1cc2.tar.xz core-93ff8e054c6edfe0bf0e8d518c97046eb69c1cc2.zip | |
* slightly changed and actived Dirk's changes from revision 419:
it is now possible to switch between absolute/relative paths for tftp accesses
via the new environment variable SLX_USE_ABSOLUTE_TFTP_PATH (which defaults
to 1).
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@421 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs/mkdxsinitrd')
| -rwxr-xr-x | initramfs/mkdxsinitrd | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/initramfs/mkdxsinitrd b/initramfs/mkdxsinitrd index dc17f3d7..017c2289 100755 --- a/initramfs/mkdxsinitrd +++ b/initramfs/mkdxsinitrd @@ -55,11 +55,11 @@ D_XF86CONFFILE="<set in ~/distro-config/distro file>" D_XFONTPATH="<set in ~/distro-config/distro file>" D_DEFAULTCOUNTRY="<set in ~/distro-config/distro file>" # read in the global settings -#. /etc/opt/openslx/settings.default # temporarily -# [ -f @@@SLX_CONFIG_PATH@@@/settings.default ] && \ -# . @@@SLX_CONFIG_PATH@@@/settings.default -# [ -f @@@SLX_CONFIG_PATH@@@/settings.local ] && \ -# . @@@SLX_CONFIG_PATH@@@/settings.local +SLX_CONFIG_PATH=@@@SLX_CONFIG_PATH@@@ +[ -f $SLX_CONFIG_PATH/settings.default ] && \ + . $SLX_CONFIG_PATH/settings.default +[ -f $SLX_CONFIG_PATH/settings.local ] && \ + . $SLX_CONFIG_PATH/settings.local ######################################################################### # End of global variable declaration, nothing needed to be changed at @@ -185,7 +185,10 @@ copy_distro_stuff() { # fixme!! files should be taken from /usr/share/openslx/distro-specs cat distro-specs/$1/config-default >${INSTDIR}/etc/sysconfig/config cat distro-specs/$1/config-$2 >>${INSTDIR}/etc/sysconfig/config - echo "SLX_TFTPBOOT_PATH=${SLX_TFTPBOOT_PATH}" >>${INSTDIR}/etc/sysconfig/config + [ -f $SLX_CONFIG_PATH/settings.default ] && \ + cat $SLX_CONFIG_PATH/settings.default >>${INSTDIR}/etc/sysconfig/config + [ -f $SLX_CONFIG_PATH/settings.local ] && \ + cat $SLX_CONFIG_PATH/settings.local >>${INSTDIR}/etc/sysconfig/config cat distro-specs/$1/functions-default >${INSTDIR}/etc/distro-functions cat distro-specs/$1/functions-$2 >>${INSTDIR}/etc/distro-functions # would be cool not to copy .svn here ... |