* implemented creation of bootmenu for preboot environments

* separated general preboot-files from the cd-specific ones

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

1 files changed, 5 insertions, 5 deletions

diff --git a/boot-env/OpenSLX/BootEnvironment/PrebootCD.pm b/boot-env/OpenSLX/BootEnvironment/PrebootCD.pm
index 6da11577..d4126ba9 100644
--- a/boot-env/OpenSLX/BootEnvironment/PrebootCD.pm
+++ b/boot-env/OpenSLX/BootEnvironment/PrebootCD.pm
@@ -33,8 +33,8 @@ sub initialize
     
     return if !$self->SUPER::initialize($params);
 
-    $self->{'original-path'} = "$openslxConfig{'public-path'}/preboot-cd";
-    $self->{'target-path'}   = "$openslxConfig{'public-path'}/preboot-cd.new";
+    $self->{'original-path'} = "$openslxConfig{'public-path'}/preboot";
+    $self->{'target-path'}   = "$openslxConfig{'public-path'}/preboot.new";
 
     if (!$self->{'dry-run'}) {
         mkpath([$self->{'original-path'}]);
@@ -68,8 +68,8 @@ sub _createImage
     my $imageDir = "$openslxConfig{'public-path'}/images/$client->{name}";
     mkpath($imageDir)   unless $self->{'dry-run'};
 
-    # copy static data and init script
-    my $dataDir = "$openslxConfig{'base-path'}/share/boot-env/preboot-cd";
+    # copy static data
+    my $dataDir = "$openslxConfig{'base-path'}/share/boot-env/preboot/cd";
     slxsystem(qq{rsync -rlpt $dataDir/iso "$imageDir/"})
         unless $self->{'dry-run'};
 
@@ -81,7 +81,7 @@ sub _createImage
 
     # create initramfs
     my $initramfsName = qq{"$imageDir/iso/isolinux/initramfs"};
-    $self->_makePrebootInitRamFS($info, $initramfsName);
+    $self->_makePrebootInitRamFS($info, $initramfsName, $client);
 
     # write trivial isolinux config
     my $isolinuxConfig = unshiftHereDoc(<<"    End-of-Here");