From 75e1cd555466a0920ba9ea8569f5fa34563d488c Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Mon, 30 Sep 2013 20:07:01 +0200 Subject: vservers-default: include configuration for initscripts --- vservers-default | 31 +++++++++++++++++++++++-------- 1 file 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 -- cgit v1.2.3-1-g7c22