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 /config-db | |
| 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 'config-db')
| -rwxr-xr-x | config-db/slxconfig-demuxer | 9 |
1 files changed, 6 insertions, 3 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'}; |