summaryrefslogtreecommitdiffstats
path: root/installer/OpenSLX/OSExport
diff options
context:
space:
mode:
Diffstat (limited to 'installer/OpenSLX/OSExport')
-rw-r--r--installer/OpenSLX/OSExport/BlockDevice/AoE.pm2
-rw-r--r--installer/OpenSLX/OSExport/BlockDevice/NBD.pm2
-rw-r--r--installer/OpenSLX/OSExport/Distro/Any.pm1
-rw-r--r--installer/OpenSLX/OSExport/Distro/Base.pm1
-rw-r--r--installer/OpenSLX/OSExport/Distro/Debian.pm1
-rw-r--r--installer/OpenSLX/OSExport/Distro/Fedora.pm1
-rw-r--r--installer/OpenSLX/OSExport/Distro/Gentoo.pm1
-rw-r--r--installer/OpenSLX/OSExport/Distro/SUSE.pm1
-rw-r--r--installer/OpenSLX/OSExport/Distro/Ubuntu.pm1
-rw-r--r--installer/OpenSLX/OSExport/Engine.pm7
-rw-r--r--installer/OpenSLX/OSExport/FileSystem/NFS.pm4
-rw-r--r--installer/OpenSLX/OSExport/FileSystem/SquashFS.pm4
12 files changed, 26 insertions, 0 deletions
diff --git a/installer/OpenSLX/OSExport/BlockDevice/AoE.pm b/installer/OpenSLX/OSExport/BlockDevice/AoE.pm
index 2113ef5c..b0439a6d 100644
--- a/installer/OpenSLX/OSExport/BlockDevice/AoE.pm
+++ b/installer/OpenSLX/OSExport/BlockDevice/AoE.pm
@@ -49,6 +49,7 @@ sub initialize
$self->{'engine'} = $engine;
$self->{'fs'} = $fs;
+ return;
}
sub getExportPort
@@ -90,6 +91,7 @@ sub showExportConfigInfo
"... (don't know how this is done yet)"
);
print(('#' x 80) . "\n");
+ return;
}
1;
diff --git a/installer/OpenSLX/OSExport/BlockDevice/NBD.pm b/installer/OpenSLX/OSExport/BlockDevice/NBD.pm
index 89f10b66..1199a4dc 100644
--- a/installer/OpenSLX/OSExport/BlockDevice/NBD.pm
+++ b/installer/OpenSLX/OSExport/BlockDevice/NBD.pm
@@ -43,6 +43,7 @@ sub initialize
$self->{'engine'} = $engine;
$self->{'fs'} = $fs;
+ return;
}
sub getExportPort
@@ -84,6 +85,7 @@ sub showExportConfigInfo
"nbd-server $export->{port} $self->{fs}->{'export-path'} -r"
);
print(('#' x 80) . "\n");
+ return;
}
1;
diff --git a/installer/OpenSLX/OSExport/Distro/Any.pm b/installer/OpenSLX/OSExport/Distro/Any.pm
index 976bbadf..f56673d8 100644
--- a/installer/OpenSLX/OSExport/Distro/Any.pm
+++ b/installer/OpenSLX/OSExport/Distro/Any.pm
@@ -54,6 +54,7 @@ sub initDistroInfo
+ /lib/modules/*/misc/vmnet.o
+ /lib/modules/*/misc/vmmon.o
";
+ return;
}
1; \ No newline at end of file
diff --git a/installer/OpenSLX/OSExport/Distro/Base.pm b/installer/OpenSLX/OSExport/Distro/Base.pm
index f1986ee5..67d18951 100644
--- a/installer/OpenSLX/OSExport/Distro/Base.pm
+++ b/installer/OpenSLX/OSExport/Distro/Base.pm
@@ -37,6 +37,7 @@ sub initialize
$self->{'engine'} = $engine;
$self->initDistroInfo();
+ return;
}
sub initDistroInfo
diff --git a/installer/OpenSLX/OSExport/Distro/Debian.pm b/installer/OpenSLX/OSExport/Distro/Debian.pm
index 5f161902..5ff7216a 100644
--- a/installer/OpenSLX/OSExport/Distro/Debian.pm
+++ b/installer/OpenSLX/OSExport/Distro/Debian.pm
@@ -48,6 +48,7 @@ sub initDistroInfo
- /boot/initrd*
- /boot/grub
";
+ return;
}
1; \ No newline at end of file
diff --git a/installer/OpenSLX/OSExport/Distro/Fedora.pm b/installer/OpenSLX/OSExport/Distro/Fedora.pm
index 0ef3e028..3e5d1f31 100644
--- a/installer/OpenSLX/OSExport/Distro/Fedora.pm
+++ b/installer/OpenSLX/OSExport/Distro/Fedora.pm
@@ -54,6 +54,7 @@ sub initDistroInfo
- *.rpmsave
- *.rpmnew
";
+ return;
}
1; \ No newline at end of file
diff --git a/installer/OpenSLX/OSExport/Distro/Gentoo.pm b/installer/OpenSLX/OSExport/Distro/Gentoo.pm
index 4d908650..e4bcd6db 100644
--- a/installer/OpenSLX/OSExport/Distro/Gentoo.pm
+++ b/installer/OpenSLX/OSExport/Distro/Gentoo.pm
@@ -48,6 +48,7 @@ sub initDistroInfo
- /boot/initrd*
- /boot/grub
";
+ return;
}
1; \ No newline at end of file
diff --git a/installer/OpenSLX/OSExport/Distro/SUSE.pm b/installer/OpenSLX/OSExport/Distro/SUSE.pm
index 1f826159..3dbf6e76 100644
--- a/installer/OpenSLX/OSExport/Distro/SUSE.pm
+++ b/installer/OpenSLX/OSExport/Distro/SUSE.pm
@@ -96,6 +96,7 @@ sub initDistroInfo
- *.rpmnew
- *.YaST2save
";
+ return;
}
1;
diff --git a/installer/OpenSLX/OSExport/Distro/Ubuntu.pm b/installer/OpenSLX/OSExport/Distro/Ubuntu.pm
index 8dbaae9e..f436c533 100644
--- a/installer/OpenSLX/OSExport/Distro/Ubuntu.pm
+++ b/installer/OpenSLX/OSExport/Distro/Ubuntu.pm
@@ -50,6 +50,7 @@ sub initDistroInfo
- /boot/initrd*
- /boot/grub
";
+ return;
}
1; \ No newline at end of file
diff --git a/installer/OpenSLX/OSExport/Engine.pm b/installer/OpenSLX/OSExport/Engine.pm
index 31a71b5a..ad0c0c0a 100644
--- a/installer/OpenSLX/OSExport/Engine.pm
+++ b/installer/OpenSLX/OSExport/Engine.pm
@@ -86,6 +86,7 @@ sub initializeFromExisting
$self->_initialize($vendorOS->{name}, $vendorOS->{id}, $export->{name},
$export->{type});
+ return;
}
sub initializeForNew
@@ -108,6 +109,7 @@ sub initializeForNew
$self->_initialize($vendorOS->{name}, $vendorOS->{id}, $exportName,
$exportType);
+ return;
}
sub exportVendorOS
@@ -130,6 +132,7 @@ sub exportVendorOS
)
);
$self->_addExportToConfigDB();
+ return;
}
sub purgeExport
@@ -146,6 +149,7 @@ sub purgeExport
);
}
$self->_removeExportFromConfigDB();
+ return;
}
sub generateExportURI
@@ -238,6 +242,7 @@ sub _initialize
$exporter->{'export-path'}
)
);
+ return;
}
sub _addExportToConfigDB
@@ -285,6 +290,7 @@ sub _addExportToConfigDB
}
$openslxDB->disconnect();
+ return;
}
sub _removeExportFromConfigDB
@@ -325,6 +331,7 @@ sub _removeExportFromConfigDB
}
$openslxDB->disconnect();
+ return;
}
1;
diff --git a/installer/OpenSLX/OSExport/FileSystem/NFS.pm b/installer/OpenSLX/OSExport/FileSystem/NFS.pm
index 0073d55c..878b956b 100644
--- a/installer/OpenSLX/OSExport/FileSystem/NFS.pm
+++ b/installer/OpenSLX/OSExport/FileSystem/NFS.pm
@@ -43,6 +43,7 @@ sub initialize
$self->{'engine'} = $engine;
my $exportBasePath = "$openslxConfig{'public-path'}/export";
$self->{'export-path'} = "$exportBasePath/nfs/$engine->{'vendor-os-name'}";
+ return;
}
sub exportVendorOS
@@ -52,6 +53,7 @@ sub exportVendorOS
my $target = $self->{'export-path'};
$self->_copyViaRsync($source, $target);
+ return;
}
sub purgeExport
@@ -101,6 +103,7 @@ sub showExportConfigInfo
# TODO : add something a bit more clever here...
# my $exports = slurpFile("/etc/exports");
+ return;
}
################################################################################
@@ -126,6 +129,7 @@ sub _copyViaRsync
close($rsyncFH)
or die _tr("unable to export to target '%s', giving up! (%s)",
$target, $!);
+ return;
}
sub _determineIncludeExcludeList
diff --git a/installer/OpenSLX/OSExport/FileSystem/SquashFS.pm b/installer/OpenSLX/OSExport/FileSystem/SquashFS.pm
index 6aeb9cd2..82c4fdda 100644
--- a/installer/OpenSLX/OSExport/FileSystem/SquashFS.pm
+++ b/installer/OpenSLX/OSExport/FileSystem/SquashFS.pm
@@ -45,6 +45,7 @@ sub initialize
$self->{'block-device'} = $blockDevice;
my $exportBasePath = "$openslxConfig{'public-path'}/export";
$self->{'export-path'} = "$exportBasePath/sqfs/$engine->{'vendor-os-name'}";
+ return;
}
sub exportVendorOS
@@ -74,6 +75,7 @@ sub exportVendorOS
$self->_createSquashFS($source, $target, $includeExcludeList);
}
$self->_addBlockDeviceTagToExport($target);
+ return;
}
sub purgeExport
@@ -176,6 +178,7 @@ sub showExportConfigInfo
my $export = shift;
$self->{'block-device'}->showExportConfigInfo($export);
+ return;
}
################################################################################
@@ -317,6 +320,7 @@ sub _addBlockDeviceTagToExport
my $tagName = "$target" . '@' . lc($self->{'block-device'}->{name});
linkFile(basename($target), $tagName);
+ return;
}
sub _removeBlockDeviceTagFromExport