diff options
Diffstat (limited to 'installer/OpenSLX')
| -rw-r--r-- | installer/OpenSLX/OSExport/Engine.pm | 6 | ||||
| -rw-r--r-- | installer/OpenSLX/OSExport/ExportType/NBD_Squash.pm | 2 | ||||
| -rw-r--r-- | installer/OpenSLX/OSExport/ExportType/NFS.pm | 3 | ||||
| -rw-r--r-- | installer/OpenSLX/OSSetup/Distro/Base.pm | 2 | ||||
| -rw-r--r-- | installer/OpenSLX/OSSetup/Engine.pm | 12 |
5 files changed, 13 insertions, 12 deletions
diff --git a/installer/OpenSLX/OSExport/Engine.pm b/installer/OpenSLX/OSExport/Engine.pm index d02ac597..6668416a 100644 --- a/installer/OpenSLX/OSExport/Engine.pm +++ b/installer/OpenSLX/OSExport/Engine.pm @@ -208,9 +208,9 @@ sub _initialize # setup source and target paths: $self->{'vendor-os-path'} - = "$openslxConfig{'stage1-path'}/$vendorOSName"; - $self->{'export-path'} - = "$openslxConfig{'export-path'}/$exportType/$vendorOSName"; + = "$openslxConfig{'private-path'}/stage1/$vendorOSName"; + my $exportBasePath = "$openslxConfig{'public-path'}/export"; + $self->{'export-path'} = "$exportBasePath/$exportType/$vendorOSName"; vlog 1, _tr("vendor-OS from '%s' will be exported to '%s'", $self->{'vendor-os-path'}, $self->{'export-path'}); } diff --git a/installer/OpenSLX/OSExport/ExportType/NBD_Squash.pm b/installer/OpenSLX/OSExport/ExportType/NBD_Squash.pm index e2a558bd..a1ec0c26 100644 --- a/installer/OpenSLX/OSExport/ExportType/NBD_Squash.pm +++ b/installer/OpenSLX/OSExport/ExportType/NBD_Squash.pm @@ -183,7 +183,7 @@ sub createSquashFS # ... invoke mksquashfs ... vlog 0, _tr("invoking mksquashfs..."); my $mksquashfsBinary - = "$openslxConfig{'share-path'}/squashfs/mksquashfs"; + = "$openslxConfig{'base-path'}/share/squashfs/mksquashfs"; my $res = system("$mksquashfsBinary $source $target -ff $filterFile"); unlink($filterFile); # ... remove filter file if done diff --git a/installer/OpenSLX/OSExport/ExportType/NFS.pm b/installer/OpenSLX/OSExport/ExportType/NFS.pm index bfe4ba1f..12fa4bfc 100644 --- a/installer/OpenSLX/OSExport/ExportType/NFS.pm +++ b/installer/OpenSLX/OSExport/ExportType/NFS.pm @@ -70,7 +70,8 @@ sub generateExportURI : generatePlaceholderFor('serverip'); $server .= ":$export->{port}" if length($export->{port}); - return "nfs://$server$openslxConfig{'export-path'}/nfs/$vendorOS->{name}"; + my $exportPath = "$openslxConfig{'public-path'}/export"; + return "nfs://$server/$exportPath/nfs/$vendorOS->{name}"; } sub requiredFSMods 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"); } |