summaryrefslogtreecommitdiffstats
path: root/config-db
diff options
context:
space:
mode:
authorOliver Tappe2006-10-29 20:56:25 +0100
committerOliver Tappe2006-10-29 20:56:25 +0100
commitcbf1057fb625110e644eee74a80c5a9d241ac3b5 (patch)
treee4ff4e6ec612bede58e672d6615b05f368c8113e /config-db
parent* now always use 'vmlinuz' as default kernel name (diff)
downloadcore-cbf1057fb625110e644eee74a80c5a9d241ac3b5.tar.gz
core-cbf1057fb625110e644eee74a80c5a9d241ac3b5.tar.xz
core-cbf1057fb625110e644eee74a80c5a9d241ac3b5.zip
* as we now use 'vmlinuz' for the defaultd kernel name we have
to follow links in order to be able to determine the kernel version from the filename. git-svn-id: http://svn.openslx.org/svn/openslx/trunk@494 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'config-db')
-rwxr-xr-xconfig-db/slxconfig-demuxer5
1 files changed, 3 insertions, 2 deletions
diff --git a/config-db/slxconfig-demuxer b/config-db/slxconfig-demuxer
index 3f591802..752c1761 100755
--- a/config-db/slxconfig-demuxer
+++ b/config-db/slxconfig-demuxer
@@ -322,7 +322,8 @@ sub generateInitalRamFS
? "$ENV{SLX_TFTPBOOT_PATH}/"
: "";
# ...set kernel version...
- $setup->{'kernel'} =~ m[-(.+)$];
+ my $kernelFile = readlink($setup->{'kernel-file'});
+ $kernelFile =~ m[-(.+)$];
$slxConf{'slxconf_kernver'} = $1;
# ...set distro version...
$slxConf{'slxconf_distro'} = $vendorOS->{'name'};
@@ -408,7 +409,7 @@ sub writeSystemConfigurations
foreach my $system (@systems) {
next unless $system->{id} > 0;
- vlog 2, _tr('exporting system %d:%s', $system->{id}, $system->{name});
+ vlog 0, _tr('exporting system %d:%s', $system->{id}, $system->{name});
$systemConfCount++;
my $buildPath = "$tempPath/build";