From 9ba85d5dc63dfd1e16b9ec85d532fe89ee58fd9b Mon Sep 17 00:00:00 2001
From: Oliver Tappe
Date: Sun, 17 Jun 2007 10:29:17 +0000
Subject: largish change with respect to configurable paths: * instead of
 supporting configurable paths at different hierarchy levels,   there are now
 only five configurable folder:   + base-path (/opt/openslx), fixed at
 installation time   + config-path (/etc/opt/openslx), fixed at installation
 time   + private-path (/var/opt/openslx), freely configurable by user   +
 public-path (/srv/openslx), freely configurable by user   + temp-path (/tmp),
 freely configurable by user   this closes ticket#143 * several holes have
 been plugged concerning the creation of folders   before they are accessed,
 closing ticket#142 * the functionality of generating config default folders
 has been moved   from the Makefile into a new Perl-module (ConfigFolder.pm),
 in order   to be available to the Perl-scripts, too * slxsettings has been
 changed to reflect the nature of base-path and   config-path as fixed paths

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1172 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 installer/OpenSLX/OSSetup/Distro/Base.pm |  2 +-
 installer/OpenSLX/OSSetup/Engine.pm      | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'installer/OpenSLX/OSSetup')

diff --git a/installer/OpenSLX/OSSetup/Distro/Base.pm b/installer/OpenSLX/OSSetup/Distro/Base.pm
index 6ed6078c..769288f1 100644
--- a/installer/OpenSLX/OSSetup/Distro/Base.pm
+++ b/installer/OpenSLX/OSSetup/Distro/Base.pm
@@ -50,7 +50,7 @@ sub initialize
 	}
 
 	$self->{'stage1a-binaries'} = {
-		"$openslxConfig{'share-path'}/busybox/busybox" => 'bin',
+		"$openslxConfig{'base-path'}/share/busybox/busybox" => 'bin',
 	};
 
 	$self->{'stage1b-faked-files'} = [
diff --git a/installer/OpenSLX/OSSetup/Engine.pm b/installer/OpenSLX/OSSetup/Engine.pm
index 35dbb32e..4d313e73 100644
--- a/installer/OpenSLX/OSSetup/Engine.pm
+++ b/installer/OpenSLX/OSSetup/Engine.pm
@@ -138,7 +138,7 @@ sub initialize
 	if ($actionType ne 'clone') {
 		# setup path to distribution-specific info:
 		my $sharedDistroInfoDir 
-			= "$openslxConfig{'share-path'}/distro-info/$distro->{'base-name'}";
+			= "$openslxConfig{'base-path'}/share/distro-info/$distro->{'base-name'}";
 		if (!-d $sharedDistroInfoDir) {
 			die _tr("unable to find shared distro-info in '%s'\n", 
 					$sharedDistroInfoDir);
@@ -164,7 +164,7 @@ sub initialize
 	}
 
 	$self->{'vendor-os-path'}
-		= "$openslxConfig{'stage1-path'}/$self->{'vendor-os-name'}";
+		= "$openslxConfig{'private-path'}/stage1/$self->{'vendor-os-name'}";
 	vlog 1, "vendor-OS path is '$self->{'vendor-os-path'}'";
 
 	if ($actionType ne 'clone') {
@@ -601,7 +601,7 @@ sub startLocalURLServersAsNeeded
 				= $self->hostIs64Bit()
 					? 'busybox.x86_64'
 					: 'busybox.i586';
-			my $busybox = "$openslxConfig{'share-path'}/busybox/$busyboxName";
+			my $busybox = "$openslxConfig{'base-path'}/share/busybox/$busyboxName";
 			my $port = 5080;
 			if ($localURL =~ m[:(\d+)/]) {
 				$port = $1;
@@ -653,13 +653,13 @@ sub stage1A_createBusyboxEnvironment
 		= $self->hostIs64Bit()
 			? 'busybox.x86_64'
 			: 'busybox.i586';
-	copyFile("$openslxConfig{'share-path'}/busybox/$busyboxName",
+	copyFile("$openslxConfig{'base-path'}/share/busybox/$busyboxName",
 			 "$self->{stage1aDir}/bin", 'busybox');
 
 	# determine all required libraries and copy those, too:
 	vlog 1, _tr("calling slxldd for $busyboxName");
 	my $slxlddCmd
-		= "slxldd $openslxConfig{'share-path'}/busybox/$busyboxName";
+		= "slxldd $openslxConfig{'base-path'}/share/busybox/$busyboxName";
 	vlog 2, "executing: $slxlddCmd";
 	my $requiredLibsStr = `$slxlddCmd`;
 	if ($?) {
@@ -682,7 +682,7 @@ sub stage1A_createBusyboxEnvironment
 
 	# create all needed links to busybox:
 	my $links
-		= slurpFile("$openslxConfig{'share-path'}/busybox/busybox.links");
+		= slurpFile("$openslxConfig{'base-path'}/share/busybox/busybox.links");
 	foreach my $linkTarget (split "\n", $links) {
 		linkFile('/bin/busybox', "$self->{stage1aDir}/$linkTarget");
 	}
-- 
cgit v1.2.3-55-g7522