Merge commit '2.6' into debian

* commit '2.6':
  Use util-vserver core function to set old vshelper.
  Only save old vshelper, if it is different from our helper.

1 files changed, 8 insertions, 2 deletions

diff --git a/util-vserver-netns b/util-vserver-netns
index 5e5b287..3141b5f 100755
--- a/util-vserver-netns
+++ b/util-vserver-netns
@@ -29,7 +29,9 @@ function start()
 
     local retval
     if test -r /proc/sys/kernel/vshelper; then
-        cat /proc/sys/kernel/vshelper > "$lockfile.save"
+        grep -qv "$_VSHELPER" /proc/sys/kernel/vshelper && \
+            cat /proc/sys/kernel/vshelper > "$lockfile.save"
+
         set_helper
         retval=$?
     else
@@ -44,7 +46,11 @@ function start()
 function stop()
 {
     if test -r "$lockfile.save"; then
-        cat "$lockfile.save" > /proc/sys/kernel/vshelper
+        _beginResult $"Setting old path to vshelper"
+        _VSHELPER="$(cat "$lockfile.save")"
+        set_helper
+        _endResult $?
+
         $_RM -f "$lockfile.save"
     fi