diff options
author | Oliver Tappe | 2008-09-04 21:36:55 +0200 |
---|---|---|
committer | Oliver Tappe | 2008-09-04 21:36:55 +0200 |
commit | 50f1d0be005174b05032c34ae9e251377e3b3ef5 (patch) | |
tree | 5088b0bdc0b2cee825d6f783b67836b341aecd02 /boot-env/OpenSLX/BootEnvironment/Base.pm | |
parent | * added stage3 nvidia setup (diff) | |
download | core-50f1d0be005174b05032c34ae9e251377e3b3ef5.tar.gz core-50f1d0be005174b05032c34ae9e251377e3b3ef5.tar.xz core-50f1d0be005174b05032c34ae9e251377e3b3ef5.zip |
* turned the client fields 'boot_type','unbootable' and 'kernel_params' as well
as the system fields 'kernel_params' and 'hidden' into attributes
* added client-only attribute 'boot_uri' which will soon be evaluated by the
preboot-cd boot environment
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2205 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'boot-env/OpenSLX/BootEnvironment/Base.pm')
-rw-r--r-- | boot-env/OpenSLX/BootEnvironment/Base.pm | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/boot-env/OpenSLX/BootEnvironment/Base.pm b/boot-env/OpenSLX/BootEnvironment/Base.pm index 5e966374..8b8dc377 100644 --- a/boot-env/OpenSLX/BootEnvironment/Base.pm +++ b/boot-env/OpenSLX/BootEnvironment/Base.pm @@ -106,7 +106,7 @@ sub writeFilesRequiredForBooting my $file = $cached->{file}; vlog(1, _tr('copying initialramfs %s from %s', $initramfsName, $file)); slxsystem("cp -a $file $initramfsName") unless $self->{'dry-run'}; - $info->{kernel_params} = $cached->{kernel_params}; + $info->{attrs}->{kernel_params} = $cached->{attrs}->{kernel_params}; return 0; } else { @@ -114,7 +114,7 @@ sub writeFilesRequiredForBooting $self->_makeInitRamFS($info, $initramfsName); $initramfsMap{$initramfsID} = { file => $initramfsName, - kernel_params => $info->{kernel_params}, + kernel_params => $info->{attrs}->{kernel_params}, }; return 1; } @@ -138,7 +138,8 @@ sub _makeInitRamFS 'export-name' => $info->{export}->{name}, 'export-uri' => $info->{'export-uri'}, 'initramfs' => $initramfs, - 'kernel-params' => [ split ' ', ($info->{kernel_params} || '') ], + 'kernel-params' + => [ split ' ', ($info->{attrs}->{kernel_params} || '') ], 'kernel-version' => $kernelFile =~ m[-(.+)$] ? $1 : '', 'plugins' => $info->{'active-plugins'}, 'root-path' @@ -148,7 +149,7 @@ sub _makeInitRamFS }; # TODO: make debug-level an explicit attribute, it's used in many places! - my $kernelParams = $info->{kernel_params} || ''; + my $kernelParams = $info->{attrs}->{kernel_params} || ''; if ($kernelParams =~ m{debug(?:=(\d+))?}) { my $debugLevel = defined $1 ? $1 : '1'; $params->{'debug-level'} = $debugLevel; @@ -159,7 +160,8 @@ sub _makeInitRamFS $makeInitRamFSEngine->execute($self->{'dry-run'}); # copy back kernel-params, as they might have been changed (by plugins) - $info->{kernel_params} = join ' ', $makeInitRamFSEngine->kernelParams(); + $info->{attrs}->{kernel_params} + = join ' ', $makeInitRamFSEngine->kernelParams(); return; } |