summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2013-09-30 20:07:01 +0200
committerAlexander Sulfrian <alexander@sulfrian.net>2013-09-30 20:08:39 +0200
commit75e1cd555466a0920ba9ea8569f5fa34563d488c (patch)
tree83bb8c1082941ce3b31e6d978670d3447425c5aa
parent5e44b974d2458b8a1a0a41ae39092418f4cd206b (diff)
downloadutil-vserver-netns-75e1cd555466a0920ba9ea8569f5fa34563d488c.tar.gz
util-vserver-netns-75e1cd555466a0920ba9ea8569f5fa34563d488c.tar.bz2
util-vserver-netns-75e1cd555466a0920ba9ea8569f5fa34563d488c.zip
vservers-default: include configuration for initscripts1.1
-rw-r--r--vservers-default31
1 files changed, 23 insertions, 8 deletions
diff --git a/vservers-default b/vservers-default
index b2ca484..51e5ca4 100644
--- a/vservers-default
+++ b/vservers-default
@@ -16,16 +16,31 @@ fi
name="$(basename "$0")"
# This is a requirement, stated in the init script. So we set it
-# here, to not confuse the user.
+# here, to not bother the user.
LOCKFILE="$name"
-function _get_flavor() {
- local flavor=""
- if [ "$name" = "${name#vserver-default[-.]}" ]; then
-
- else
- fi
-}
+
+# Include default configuration
+if [[ -r "/etc/vservers/.defaults/apps/vserver-startup/default" ]]; then
+ . "/etc/vservers/.defaults/apps/vserver-startup/default"
+fi
+
+
+# Include special configuration for initscript
+if [ "$name" = "${name#vserver-default[-.]}" ]; then
+ falvor="${name#vserver-default[-.]}"
+else
+ flavor="${name#vserver[-.]}"
+fi
+
+if [[ "default" != "$flavor" &&
+ -r "/etc/vservers/.defaults/apps/vserver-startup/$flavor" ]]; then
+ . "/etc/vservers/.defaults/apps/vserver-startup/$flavor"
+fi
+
+unset flavor
+unset name
+
# Added the ability to disable a flaver without disabling the
# initscript. (Debian enables all initscripts during installation