diff options
| author | Oliver Tappe | 2008-09-01 23:51:20 +0200 |
|---|---|---|
| committer | Oliver Tappe | 2008-09-01 23:51:20 +0200 |
| commit | 7043bffef52e7f7404a09d4de3919de915e5de70 (patch) | |
| tree | 342dd11f074aa6657869913bf27a7d56d3bb08af /boot-env/OpenSLX/BootEnvironment/Base.pm | |
| parent | * somewhere we got a line break in copyprocess before svn commit (diff) | |
| download | core-7043bffef52e7f7404a09d4de3919de915e5de70.tar.gz core-7043bffef52e7f7404a09d4de3919de915e5de70.tar.xz core-7043bffef52e7f7404a09d4de3919de915e5de70.zip | |
* implemented PREBOOT_CD boot environment that creates an appropriate ISO image
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2181 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'boot-env/OpenSLX/BootEnvironment/Base.pm')
| -rw-r--r-- | boot-env/OpenSLX/BootEnvironment/Base.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/boot-env/OpenSLX/BootEnvironment/Base.pm b/boot-env/OpenSLX/BootEnvironment/Base.pm index 50969f26..5e966374 100644 --- a/boot-env/OpenSLX/BootEnvironment/Base.pm +++ b/boot-env/OpenSLX/BootEnvironment/Base.pm @@ -83,7 +83,6 @@ sub writeFilesRequiredForBooting my $self = shift; my $info = shift; my $buildPath = shift; - my $slxVersion = shift; my $kernelFile = $info->{'kernel-file'}; my $kernelName = basename($kernelFile); @@ -112,7 +111,7 @@ sub writeFilesRequiredForBooting } else { vlog(1, _tr('generating initialramfs %s', $initramfsName)); - $self->_makeInitRamFS($info, $initramfsName, $slxVersion); + $self->_makeInitRamFS($info, $initramfsName); $initramfsMap{$initramfsID} = { file => $initramfsName, kernel_params => $info->{kernel_params}, @@ -126,13 +125,14 @@ sub _makeInitRamFS my $self = shift; my $info = shift; my $initramfs = shift; - my $slxVersion = shift; my $vendorOS = $info->{'vendor-os'}; my $kernelFile = basename(followLink($info->{'kernel-file'})); my $attrs = clone($info->{attrs} || {}); + chomp(my $slxVersion = qx{slxversion}); + my $params = { 'attrs' => $attrs, 'export-name' => $info->{export}->{name}, |