* a little cleanup (no need for specific PrebootCD.pm in MakeInitRamFS)

* added copying of secondary uclib-rootfs layer for preboot environment

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

2 files changed, 3 insertions, 8 deletions

diff --git a/boot-env/OpenSLX/BootEnvironment/Preboot.pm b/boot-env/OpenSLX/BootEnvironment/Preboot.pm
index 430b876e..ae12a021 100644
--- a/boot-env/OpenSLX/BootEnvironment/Preboot.pm
+++ b/boot-env/OpenSLX/BootEnvironment/Preboot.pm
@@ -24,6 +24,7 @@ use File::Path;
 
 use OpenSLX::Basics;
 use OpenSLX::ConfigDB qw(:support);
+use OpenSLX::MakeInitRamFS::Engine::Preboot;
 use OpenSLX::Utils;
 
 sub writeBootloaderMenuFor
@@ -188,7 +189,8 @@ sub _makePrebootInitRamFS
         $params->{'debug-level'} = $debugLevel;
     }
 
-    my $makeInitRamFSEngine = $self->{'initramfs-factory'}->($params);
+    my $makeInitRamFSEngine 
+        = OpenSLX::MakeInitRamFS::Engine::Preboot->new($params);
     $makeInitRamFSEngine->execute($self->{'dry-run'});
 
     # copy back kernel-params, as they might have been changed (by plugins)
diff --git a/boot-env/OpenSLX/BootEnvironment/PrebootCD.pm b/boot-env/OpenSLX/BootEnvironment/PrebootCD.pm
index d4126ba9..481a61a0 100644
--- a/boot-env/OpenSLX/BootEnvironment/PrebootCD.pm
+++ b/boot-env/OpenSLX/BootEnvironment/PrebootCD.pm
@@ -23,7 +23,6 @@ use File::Basename;
 use File::Path;
 
 use OpenSLX::Basics;
-use OpenSLX::MakeInitRamFS::Engine::PrebootCD;
 use OpenSLX::Utils;
 
 sub initialize
@@ -42,12 +41,6 @@ sub initialize
         mkpath("$self->{'target-path'}/client-config");
     }
 
-    $self->{'initramfs-factory'} = sub {
-        my $makeInitRamFSEngine 
-            = OpenSLX::MakeInitRamFS::Engine::PrebootCD->new(shift);
-        return $makeInitRamFSEngine;
-    };
-
     return 1;
 }