From 10c1174f466ddf555eed0ee8fe3c1449a11d463a Mon Sep 17 00:00:00 2001
From: Oliver Tappe
Date: Fri, 12 Jun 2009 11:34:39 +0000
Subject: Closing #461: * The creation of the default.tgz (containing the
 system's defaults) must   not be intermixed with creation of individual
 clients' config archive,   as any client's individual attributes could
 pollute the default.tgz of   the next boot environment.   Instead, we now
 have two seperate loops: one for the default settings   and another one for
 the settings of the individual clients

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2954 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 config-db/slxconfig-demuxer | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'config-db')

diff --git a/config-db/slxconfig-demuxer b/config-db/slxconfig-demuxer
index e812dd93..84e1ed00 100755
--- a/config-db/slxconfig-demuxer
+++ b/config-db/slxconfig-demuxer
@@ -585,8 +585,9 @@ sub createBootEnvironmentsForSystem
         my $type = $client->{attrs}->{boot_type} || 'pxe';
         $bootTypes{$type}++;
     }
+
     foreach my $bootType (sort keys %bootTypes) {
-        vlog(0, _tr("creating boot environment for $bootType"));
+        vlog(0, _tr("creating boot environment (system part) for $bootType"));
     
         my $bootEnv = bootEnvironmentForType($bootType);
 
@@ -598,6 +599,12 @@ sub createBootEnvironmentsForSystem
                 = "$bootEnv->{'target-path'}/client-config/$info->{'external-id'}";
             createTarOfPath($buildPath, "default.tgz", $systemPath);
         }
+    }
+
+    foreach my $bootType (sort keys %bootTypes) {
+        vlog(0, _tr("creating boot environment (client part) for $bootType"));
+    
+        my $bootEnv = bootEnvironmentForType($bootType);
 
         writeClientConfigurationsForSystem(
             $info, $buildPath, $attrFile, $bootType, $clients
-- 
cgit v1.2.3-55-g7522