diff options
| author | Oliver Tappe | 2007-06-17 12:29:17 +0200 |
|---|---|---|
| committer | Oliver Tappe | 2007-06-17 12:29:17 +0200 |
| commit | 9ba85d5dc63dfd1e16b9ec85d532fe89ee58fd9b (patch) | |
| tree | 176dc068777af9af1119c55648ec73e78517393e /installer/OpenSLX/OSExport | |
| parent | Enabled busybox option to allow longer filenames in tar archives (see (diff) | |
| download | core-9ba85d5dc63dfd1e16b9ec85d532fe89ee58fd9b.tar.gz core-9ba85d5dc63dfd1e16b9ec85d532fe89ee58fd9b.tar.xz core-9ba85d5dc63dfd1e16b9ec85d532fe89ee58fd9b.zip | |
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
Diffstat (limited to 'installer/OpenSLX/OSExport')
| -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 |
3 files changed, 6 insertions, 5 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 |