From e437b8813f2a84ccffa3a75ba1f534b38ce72b9c Mon Sep 17 00:00:00 2001
From: Michael Janczyk
Date: Tue, 6 Apr 2010 20:01:24 +0200
Subject: cumulative commit of local branch, many changes regarding
 virtualization

---
 installer/OpenSLX/OSSetup/Engine.pm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'installer')

diff --git a/installer/OpenSLX/OSSetup/Engine.pm b/installer/OpenSLX/OSSetup/Engine.pm
index 4160b4b5..72e8c7e8 100644
--- a/installer/OpenSLX/OSSetup/Engine.pm
+++ b/installer/OpenSLX/OSSetup/Engine.pm
@@ -1106,8 +1106,9 @@ sub _generateDefaultDirs
     my $OPENSLX_DEFAULT_DIR = "/opt/openslx";
     my $OPENSLX_DEFAULT_CONFDIR = "/etc/opt/openslx";
     my $OPENSLX_DEFAULT_LOGDIR = "/var/log/openslx";
-    my $OPENSLX_DEFAULT_BINDIR = "/var/opt/openslx/bin";
-    my $OPENSLX_DEFAULT_LIBDIR = "/var/opt/openslx/lib";
+    my $OPENSLX_DEFAULT_VARDIR = "/var/opt/openslx";
+    my $OPENSLX_DEFAULT_BINDIR = "$OPENSLX_DEFAULT_VARDIR/bin";
+    my $OPENSLX_DEFAULT_LIBDIR = "$OPENSLX_DEFAULT_VARDIR/lib";
     my $OPENSLX_DEFAULT_VIRTDIR = "/var/lib/virt";
     mkpath("$targetRoot/$OPENSLX_DEFAULT_DIR",
         "$targetRoot/$OPENSLX_DEFAULT_CONFDIR",
@@ -1117,9 +1118,12 @@ sub _generateDefaultDirs
         "$targetRoot/$OPENSLX_DEFAULT_VIRTDIR");
     slxsystem("chmod 1777 $targetRoot/$OPENSLX_DEFAULT_LOGDIR");
 
-    my $openslxConfig = "OPENSLX_DEFAULT_DIR=$OPENSLX_DEFAULT_DIR\n";
+    my $openslxConfig = "# Default OpenSLX directories defined by satge 1\n";
+    $openslxConfig .= "# Version 0.2\n\n";
+    $openslxConfig .= "OPENSLX_DEFAULT_DIR=$OPENSLX_DEFAULT_DIR\n";
     $openslxConfig .= "OPENSLX_DEFAULT_CONFDIR=$OPENSLX_DEFAULT_CONFDIR\n";
     $openslxConfig .= "OPENSLX_DEFAULT_LOGDIR=$OPENSLX_DEFAULT_LOGDIR\n";
+    $openslxConfig .= "OPENSLX_DEFAULT_VARDIR=$OPENSLX_DEFAULT_VARDIR\n";
     $openslxConfig .= "OPENSLX_DEFAULT_BINDIR=$OPENSLX_DEFAULT_BINDIR\n";
     $openslxConfig .= "OPENSLX_DEFAULT_LIBDIR=$OPENSLX_DEFAULT_LIBDIR\n";
     $openslxConfig .= "OPENSLX_DEFAULT_VIRTDIR=$OPENSLX_DEFAULT_VIRTDIR\n";
-- 
cgit v1.2.3-55-g7522