diff options
author | Alexander Sulfrian <alexander@sulfrian.net> | 2015-02-09 04:27:47 +0100 |
---|---|---|
committer | Alexander Sulfrian <alexander@sulfrian.net> | 2015-02-09 04:27:47 +0100 |
commit | 5442c7cf59f10af06ce8481242c7ba31ff2f5e66 (patch) | |
tree | dd8640ab2ee16e6cee35cafacc90c7bbbd8cd63b | |
parent | 576a824a7456562dff779465376199649462cf3f (diff) | |
parent | 8ebb29c9e5127a5523b16389e5f02289403690b4 (diff) | |
download | util-vserver-netns-5442c7cf59f10af06ce8481242c7ba31ff2f5e66.tar.gz util-vserver-netns-5442c7cf59f10af06ce8481242c7ba31ff2f5e66.tar.bz2 util-vserver-netns-5442c7cf59f10af06ce8481242c7ba31ff2f5e66.zip |
Merge commit '2.5' into debian
* commit '2.5':
Save old vshelper during start and restore it during stop.
-rwxr-xr-x | util-vserver-netns | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/util-vserver-netns b/util-vserver-netns index 6e1a04a..5e5b287 100755 --- a/util-vserver-netns +++ b/util-vserver-netns @@ -26,8 +26,16 @@ LOCKFILE=util-vserver-netns function start() { _beginResult $"Setting path to vshelper" - set_helper - local retval=$? + + local retval + if test -r /proc/sys/kernel/vshelper; then + cat /proc/sys/kernel/vshelper > "$lockfile.save" + set_helper + retval=$? + else + retval=1 + fi + _endResult $retval test "$retval" -ne 0 || touch "$lockfile" return $retval @@ -35,6 +43,11 @@ function start() function stop() { + if test -r "$lockfile.save"; then + cat "$lockfile.save" > /proc/sys/kernel/vshelper + $_RM -f "$lockfile.save" + fi + $_RM -f "$lockfile" } |