summaryrefslogtreecommitdiffstats
path: root/os-plugins
diff options
context:
space:
mode:
authorDirk von Suchodoletz2008-10-13 22:34:48 +0200
committerDirk von Suchodoletz2008-10-13 22:34:48 +0200
commitd4bac3451616e57cff2228a1c236b56b6d904d8a (patch)
tree8593eac8ce3da580c0fb9a0191677aee27439914 /os-plugins
parent* fixed init scripts (diff)
downloadcore-d4bac3451616e57cff2228a1c236b56b6d904d8a.tar.gz
core-d4bac3451616e57cff2228a1c236b56b6d904d8a.tar.xz
core-d4bac3451616e57cff2228a1c236b56b6d904d8a.zip
Just an (incomplete) example for indenting ... (see #296 comment 3)
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2289 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins')
-rw-r--r--os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm8
-rw-r--r--os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm29
2 files changed, 17 insertions, 20 deletions
diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm
index 6dfa6a1a..3c3610dd 100644
--- a/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm
+++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm
@@ -33,7 +33,7 @@ sub fillRunlevelScript
my $kind = shift;
my $script = unshiftHereDoc(<<" End-of-Here");
- #! /bin/sh
+ #!/bin/sh
# Ubuntu/Debian specific start/stop script, generated via stage1 'vmware'
# plugin install
# inspiration taken from vmware start script:
@@ -68,7 +68,7 @@ sub fillRunlevelScript
End-of-Here
} elsif ($kind eq 'vmpl1.0') {
$script .= unshiftHereDoc(<<" End-of-Here");
- # load module manuall
+ # load modules manually
vmware_kind_path=/opt/openslx/plugin-repo/vmware/\${vmware_kind}/
module_src_path=\${vmware_kind_path}/vmroot/modules
insmod \${module_src_path}/vmmon.o
@@ -76,7 +76,7 @@ sub fillRunlevelScript
End-of-Here
} elsif ($kind ne "vmpl2.0") {
$script .= unshiftHereDoc(<<" End-of-Here");
- # load module manuall
+ # load modules manually
vmware_kind_path=/opt/openslx/plugin-repo/vmware/\${vmware_kind}/
module_src_path=\${vmware_kind_path}/vmroot/modules
insmod \${module_src_path}/vmmon.o
@@ -85,7 +85,7 @@ sub fillRunlevelScript
End-of-Here
} elsif ($kind eq 'vmpl2.5') {
$script .= unshiftHereDoc(<<" End-of-Here");
- # load module manuall
+ # load modules manually
vmware_kind_path=/opt/openslx/plugin-repo/vmware/\${vmware_kind}/
module_src_path=\${vmware_kind_path}/vmroot/modules
insmod \${module_src_path}/vmmon.o
diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm
index 8e006cb1..69287611 100644
--- a/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm
+++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm
@@ -32,7 +32,7 @@ sub fillRunlevelScript
my $kind = shift;
my $script = unshiftHereDoc(<<" End-of-Here");
- #! /bin/sh
+ #!/bin/sh
# SuSE compatible start/stop script, generated via stage1 'vmware' plugin
# installation
#
@@ -59,26 +59,23 @@ sub fillRunlevelScript
# Load modules
if ($kind eq 'local' || $kind eq 'local25') {
$script .= unshiftHereDoc(<<" End-of-Here");
- # to be filled in via the stage1 configuration script
- insmod /lib/modules/\$(uname -r)/misc/vmmon.o || return 1
- insmod /lib/modules/\$(uname -r)/misc/vmnet.o || return 1
- insmod /lib/modules/\$(uname -r)/misc/vmblock.o 2>/dev/null || return 0
- #insmod /lib/modules/\$(uname -r)/misc/vmci.o 2>/dev/null || return 0
- # most probably nobody wants to run the parallel port driver ...
- #modprobe vm...
+ # to be filled in via the stage1 configuration script
+ insmod /lib/modules/\$(uname -r)/misc/vmmon.o || return 1
+ insmod /lib/modules/\$(uname -r)/misc/vmnet.o || return 1
+ insmod /lib/modules/\$(uname -r)/misc/vmblock.o 2>/dev/null || return 0
End-of-Here
} elsif ($kind eq 'vmpl1.0') {
$script .= unshiftHereDoc(<<" End-of-Here");
- # load module manuall
- vmware_kind_path=/opt/openslx/plugin-repo/vmware/\${vmware_kind}/
- module_src_path=\${vmware_kind_path}/vmroot/modules
- insmod \${module_src_path}/vmmon.o
- insmod \${module_src_path}/vmnet.o
+ # load modules manually
+ vmware_kind_path=/opt/openslx/plugin-repo/vmware/\${vmware_kind}/
+ module_src_path=\${vmware_kind_path}/vmroot/modules
+ insmod \${module_src_path}/vmmon.o
+ insmod \${module_src_path}/vmnet.o
End-of-Here
} elsif ($kind ne "vmpl2.0") {
$script .= unshiftHereDoc(<<" End-of-Here");
- # load module manuall
- vmware_kind_path=/opt/openslx/plugin-repo/vmware/\${vmware_kind}/
+ # load modules manually
+ vmware_kind_path=/opt/openyslx/plugin-repo/vmware/\${vmware_kind}/
module_src_path=\${vmware_kind_path}/vmroot/modules
insmod \${module_src_path}/vmmon.o
insmod \${module_src_path}/vmnet.o
@@ -86,7 +83,7 @@ sub fillRunlevelScript
End-of-Here
} elsif ($kind eq 'vmpl2.5') {
$script .= unshiftHereDoc(<<" End-of-Here");
- # load module manuall
+ # load modules manually
vmware_kind_path=/opt/openslx/plugin-repo/vmware/\${vmware_kind}/
module_src_path=\${vmware_kind_path}/vmroot/modules
insmod \${module_src_path}/vmmon.o