diff options
| author | Dirk von Suchodoletz | 2006-10-01 19:48:45 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2006-10-01 19:48:45 +0200 |
| commit | 16a62704a825816726d3c8f38a2d57d230360d79 (patch) | |
| tree | dd9f7ff0835685893c13970912f2b8a65bb7ac5f /initramfs/mkdxsinitrd | |
| parent | * added support for new cmdline option '--use-absolute-tftp-path' which causes (diff) | |
| download | core-16a62704a825816726d3c8f38a2d57d230360d79.tar.gz core-16a62704a825816726d3c8f38a2d57d230360d79.tar.xz core-16a62704a825816726d3c8f38a2d57d230360d79.zip | |
Suggestion how to pass SLX_CONFIG_PATH info (via slxmkramfs,
mkdxsinitrd - "make install" setup has to replace a variable in both
files), minor fixes and additions ...
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@419 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs/mkdxsinitrd')
| -rwxr-xr-x | initramfs/mkdxsinitrd | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/initramfs/mkdxsinitrd b/initramfs/mkdxsinitrd index 01305cf7..dc17f3d7 100755 --- a/initramfs/mkdxsinitrd +++ b/initramfs/mkdxsinitrd @@ -54,6 +54,12 @@ D_INITSCRIPTS="<set in ~/distro-config/distro file>" 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 ######################################################################### # End of global variable declaration, nothing needed to be changed at @@ -179,6 +185,7 @@ 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 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 ... |