From 3eb7e5c0750760ed49c037c1dda1bfe196110fe3 Mon Sep 17 00:00:00 2001
From: Oliver Tappe
Date: Tue, 29 May 2007 20:37:11 +0000
Subject: * renamed export type 'nbd-squash' to 'nbd' to make it shorter

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1110 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 installer/OpenSLX/OSExport/Engine.pm |  9 +--------
 installer/slxos-export               | 16 ++++++++--------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/installer/OpenSLX/OSExport/Engine.pm b/installer/OpenSLX/OSExport/Engine.pm
index 6264471a..f7046f60 100644
--- a/installer/OpenSLX/OSExport/Engine.pm
+++ b/installer/OpenSLX/OSExport/Engine.pm
@@ -35,14 +35,10 @@ use vars qw(%supportedExportTypes %supportedDistros);
 %supportedExportTypes = (
 	'nfs'
 		=> { module => 'NFS' },
-	'nbd-squash'
+	'nbd'
 		=> { module => 'NBD_Squash' },
 );
 
-my %aliasedExportTypes = (
-	'nbd' => 'nbd-squash',
-);
-
 %supportedDistros = (
 	'<any>'
 		=> { module => 'Any' },
@@ -170,9 +166,6 @@ sub _initialize
 	my $exportName = shift;
 	my $exportType = lc(shift);
 
-	if (exists $aliasedExportTypes{lc($exportType)}) {
-		$exportType = $aliasedExportTypes{lc($exportType)};
-	}
 	if (!exists $supportedExportTypes{lc($exportType)}) {
 		print _tr("Sorry, export type '%s' is unsupported.\n", $exportType);
 		print _tr("List of supported export types:\n\t");
diff --git a/installer/slxos-export b/installer/slxos-export
index 4ba63ec2..91c81706 100755
--- a/installer/slxos-export
+++ b/installer/slxos-export
@@ -187,12 +187,12 @@ in different flavors:
 
 =over 8
 
-=item B<    Export Type 'NFS'>
+=item B<    Export Type 'nfs'>
 
 NFS (network file system) is a well established networking file system, which
 is supported by LINUX since long.
 
-=item B<    Export Type 'NBD-squash'>
+=item B<    Export Type 'nbd'>
 
 A rather modern concept is the network block device, which basically "transports"
 a block device over the network (from server to client), making it possible to
@@ -243,14 +243,14 @@ resulting NFS-export will live in C</srv/openslx/export/nfs/suse-10.2>.
 
 =back
 
-=head3 Exporting a Vendor-OS via NBD-Squash
+=head3 Exporting a Vendor-OS via NBD
 
 =over 8
 
-=item B<<     slxos-export export ubuntu-6.10 nbd-squash >>
+=item B<<     slxos-export export ubuntu-6.10 nbd >>
 
-Exports the installed vendor-OS ubuntu-6.10 via nbd-squash, the resulting
-Squash-FS will live in C</srv/openslx/export/nbd-squash/ubuntu-6.10>.
+Exports the installed vendor-OS ubuntu-6.10 via nbd, the resulting
+Squash-FS will live in C</srv/openslx/export/nbd/ubuntu-6.10>.
 
 =back
 
@@ -258,10 +258,10 @@ Squash-FS will live in C</srv/openslx/export/nbd-squash/ubuntu-6.10>.
 
 =over 8
 
-=item B<<     slxos-export remove ubuntu-6.10 nbd-squash >>
+=item B<<     slxos-export remove ubuntu-6.10 nbd >>
 
 Wipes the squash-FS of the export named 'ubuntu-6.10' from disk (i.e. the
-file C</srv/openslx/export/nbd-squash/ubuntu-6.10> will be deleted) and
+file C</srv/openslx/export/nbd/ubuntu-6.10> will be deleted) and
 removes that export from the config-DB, too.
 
 =back
-- 
cgit v1.2.3-55-g7522