Merge commit '2.5' into debian

* commit '2.5':
  Save old vshelper during start and restore it during stop.

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"
 }