diff options
| author | Oliver Tappe | 2008-02-29 23:01:50 +0100 |
|---|---|---|
| committer | Oliver Tappe | 2008-02-29 23:01:50 +0100 |
| commit | db6ea726990599b09e4bb056eae05fc6f35997d2 (patch) | |
| tree | 2a613a5d70ab9188b360c97d81557765a2d7e7ef /installer | |
| parent | Trying on another export type -> dnbd2 ... (diff) | |
| download | core-db6ea726990599b09e4bb056eae05fc6f35997d2.tar.gz core-db6ea726990599b09e4bb056eae05fc6f35997d2.tar.xz core-db6ea726990599b09e4bb056eae05fc6f35997d2.zip | |
* Forced DNBD2.pm into a (hopefully) working condition.
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1586 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'installer')
| -rw-r--r-- | installer/OpenSLX/OSExport/BlockDevice/DNBD2.pm | 20 | ||||
| -rw-r--r-- | installer/OpenSLX/OSExport/Engine.pm | 13 |
2 files changed, 21 insertions, 12 deletions
diff --git a/installer/OpenSLX/OSExport/BlockDevice/DNBD2.pm b/installer/OpenSLX/OSExport/BlockDevice/DNBD2.pm index 69462e5c..8cd20904 100644 --- a/installer/OpenSLX/OSExport/BlockDevice/DNBD2.pm +++ b/installer/OpenSLX/OSExport/BlockDevice/DNBD2.pm @@ -51,7 +51,7 @@ sub getExportPort my $self = shift; my $openslxDB = shift; - return $openslxDB->incrementGlobalCounter('next-dnbd2-server-port'); + return $openslxDB->incrementGlobalCounter('next-nbd-server-port'); } sub generateExportURI @@ -86,16 +86,16 @@ sub showExportConfigInfo my $self = shift; my $export = shift; - print(('#' x 80) . "\n"); - print _tr( + print '#' x 80 , "\n", + _tr( "Please make sure you start a corresponding dnbd2-server:\n\t%s\n", - "Create or modify a config file like /etc/dnbd2/server.conf, looking like:", - "$server", - "$export->{port}", - "$self->{fs}->{'export-path'} - "dnbd2-server /etc/dnbd2/server.conf" - ); - print(('#' x 80) . "\n"); + "dnbd2-server /etc/dnbd2/server.conf\n" + ), + "Create or modify a config file like /etc/dnbd2/server.conf, looking like:", + "<server>\n", + "$export->{port}\n", + "$self->{fs}->{'export-path'}\n", + '#' x 80, "\n"; return; } diff --git a/installer/OpenSLX/OSExport/Engine.pm b/installer/OpenSLX/OSExport/Engine.pm index 12d4b862..743a46b9 100644 --- a/installer/OpenSLX/OSExport/Engine.pm +++ b/installer/OpenSLX/OSExport/Engine.pm @@ -42,9 +42,18 @@ our ( 'sqfs' => 'SquashFS', ); -%supportedExportBlockDevices = ('nbd' => 'NBD', 'aoe' => 'AoE'); +%supportedExportBlockDevices = ( + 'dnbd2' => 'DNBD2', + 'nbd' => 'NBD', + 'aoe' => 'AoE', +); -@supportedExportTypes = ('nfs', 'sqfs-aoe', 'sqfs-nbd'); +@supportedExportTypes = ( + 'nfs', + 'sqfs-aoe', + 'sqfs-dnbd2', + 'sqfs-nbd', +); %supportedDistros = ( '<any>' => {module => 'Any'}, |