diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2015-02-09 02:44:20 +0100 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2015-02-09 02:44:20 +0100 |
| commit | 8c9b11aed2c2eb9ad3a77f821efeabb48f848e31 (patch) | |
| tree | e6c423e4046cb76c6a61dbc157d313dd7c5822a6 /util-vserver-vars | |
| parent | 29fc7eb1549de7622dc1f9fbbfe647b55adace17 (diff) | |
| parent | 40f8ecbf261c8b3319350e681a207ed4b42f424d (diff) | |
| download | util-vserver-netns-8c9b11aed2c2eb9ad3a77f821efeabb48f848e31.tar.gz util-vserver-netns-8c9b11aed2c2eb9ad3a77f821efeabb48f848e31.tar.bz2 util-vserver-netns-8c9b11aed2c2eb9ad3a77f821efeabb48f848e31.zip | |
Merge commit '2.3' into debian
* commit '2.3':
Add insserv config to define $util-vserver system facility.
Add util-vserver-netns initscript.
Use spline-netns folder, to not collidate with default netns handling.
Add vshelper with netns support.
Use nullglob for all globbings.
Diffstat (limited to 'util-vserver-vars')
| -rw-r--r-- | util-vserver-vars | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/util-vserver-vars b/util-vserver-vars index 4d23588..167d975 100644 --- a/util-vserver-vars +++ b/util-vserver-vars @@ -8,6 +8,7 @@ test -e "$REAL_UTIL_VSERVER_VARS" || { # save defaults _REAL_LIB_VSERVER_FUNCTIONS="${_LIB_VSERVER_FUNCTIONS}" _REAL_VSERVER="${_VSERVER}" +_REAL_VSHELPER="${_VSHELPER}" case "$0" in /usr/sbin/vserver*) @@ -23,3 +24,5 @@ case "$0" in ;; esac +# overwrite _VSHELPER for init script +_VSHELPER="$__PKGLIBEXECDIR/vshelper.netns" |