* removed caching of initramfs files from boot environments, since it does

  not really make sense, as the different clients across boot-environments may
  specify different sets of active plugins, which in turn may require the
  resulting initramfs to be different


git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2572 95ad53e4-c205-0410-b2fa-d234c58c8868

1 files changed, 4 insertions, 20 deletions

diff --git a/boot-env/OpenSLX/BootEnvironment/Base.pm b/boot-env/OpenSLX/BootEnvironment/Base.pm
index dd3e4e1c..aa4cbe5b 100644
--- a/boot-env/OpenSLX/BootEnvironment/Base.pm
+++ b/boot-env/OpenSLX/BootEnvironment/Base.pm
@@ -104,27 +104,11 @@ sub writeFilesRequiredForBooting
             unless $self->{'dry-run'};
     }
     
-    # reuse initramfs if it has already been created for another boot 
-    # environment, create it otherwise:
+    # create initramfs:
     my $initramfsName = "$vendorOSPath/$info->{'initramfs-name'}";
-    my $initramfsID = $info->{'initramfs-name'};
-    my $cached = $initramfsMap{$initramfsID};
-    if ($cached) {
-        my $file = $cached->{file};
-        vlog(1, _tr('copying initialramfs %s from %s', $initramfsName, $file));
-        slxsystem("cp -a $file $initramfsName") unless $self->{'dry-run'};
-        $info->{attrs}->{kernel_params} = $cached->{attrs}->{kernel_params};
-        return 0;
-    }
-    else {
-        vlog(1, _tr('generating initialramfs %s', $initramfsName));
-        $self->_makeInitRamFS($info, $initramfsName);
-        $initramfsMap{$initramfsID} = {
-            file          => $initramfsName,
-            kernel_params => $info->{attrs}->{kernel_params},
-        };
-        return 1;
-    }
+    vlog(1, _tr('generating initialramfs %s', $initramfsName));
+    $self->_makeInitRamFS($info, $initramfsName);
+    return 1;
 }
 
 sub _makeInitRamFS