* added requiresDefaultClientConfig() which is going to be used by the config

  demuxer, soon

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

4 files changed, 31 insertions, 19 deletions

diff --git a/boot-env/OpenSLX/BootEnvironment/Base.pm b/boot-env/OpenSLX/BootEnvironment/Base.pm
index 8b8dc377..dd3e4e1c 100644
--- a/boot-env/OpenSLX/BootEnvironment/Base.pm
+++ b/boot-env/OpenSLX/BootEnvironment/Base.pm
@@ -68,6 +68,13 @@ sub finalize
     return 1;
 }
 
+sub requiresDefaultClientConfig
+{
+    my $self = shift;
+    
+    return $self->{'requires-default-client-config'};
+}
+
 sub writeBootloaderMenuFor
 {
     my $self             = shift;
diff --git a/boot-env/OpenSLX/BootEnvironment/PXE.pm b/boot-env/OpenSLX/BootEnvironment/PXE.pm
index e8c05090..fe72b1cf 100644
--- a/boot-env/OpenSLX/BootEnvironment/PXE.pm
+++ b/boot-env/OpenSLX/BootEnvironment/PXE.pm
@@ -34,6 +34,8 @@ sub initialize
     $self->{'original-path'} = "$openslxConfig{'public-path'}/tftpboot";
     $self->{'target-path'}   = "$openslxConfig{'public-path'}/tftpboot.new";
 
+    $self->{'requires-default-client-config'} = 1;
+
     if (!$self->{'dry-run'}) {
         mkpath([$self->{'original-path'}]);
         rmtree($self->{'target-path'});
diff --git a/boot-env/OpenSLX/BootEnvironment/Preboot.pm b/boot-env/OpenSLX/BootEnvironment/Preboot.pm
index ae12a021..c27391b0 100644
--- a/boot-env/OpenSLX/BootEnvironment/Preboot.pm
+++ b/boot-env/OpenSLX/BootEnvironment/Preboot.pm
@@ -27,6 +27,28 @@ use OpenSLX::ConfigDB qw(:support);
 use OpenSLX::MakeInitRamFS::Engine::Preboot;
 use OpenSLX::Utils;
 
+sub initialize
+{
+    my $self   = shift;
+    my $params = shift;
+    
+    return if !$self->SUPER::initialize($params);
+
+    $self->{'original-path'} = "$openslxConfig{'public-path'}/preboot";
+    $self->{'target-path'}   = "$openslxConfig{'public-path'}/preboot.new";
+
+    $self->{'requires-default-client-config'} = 0;
+        # we do not need a default.tgz since there's always an explicit client
+    
+    if (!$self->{'dry-run'}) {
+        mkpath([$self->{'original-path'}]);
+        rmtree($self->{'target-path'});
+        mkpath("$self->{'target-path'}/client-config");
+    }
+
+    return 1;
+}
+
 sub writeBootloaderMenuFor
 {
     my $self             = shift;
diff --git a/boot-env/OpenSLX/BootEnvironment/PrebootCD.pm b/boot-env/OpenSLX/BootEnvironment/PrebootCD.pm
index 481a61a0..2775a192 100644
--- a/boot-env/OpenSLX/BootEnvironment/PrebootCD.pm
+++ b/boot-env/OpenSLX/BootEnvironment/PrebootCD.pm
@@ -25,25 +25,6 @@ use File::Path;
 use OpenSLX::Basics;
 use OpenSLX::Utils;
 
-sub initialize
-{
-    my $self   = shift;
-    my $params = shift;
-    
-    return if !$self->SUPER::initialize($params);
-
-    $self->{'original-path'} = "$openslxConfig{'public-path'}/preboot";
-    $self->{'target-path'}   = "$openslxConfig{'public-path'}/preboot.new";
-
-    if (!$self->{'dry-run'}) {
-        mkpath([$self->{'original-path'}]);
-        rmtree($self->{'target-path'});
-        mkpath("$self->{'target-path'}/client-config");
-    }
-
-    return 1;
-}
-
 sub _createImage
 {
     my $self   = shift;