From 1884eb4a99aa20ddbb0ad4e5661cfafc67ee5fde Mon Sep 17 00:00:00 2001
From: Alexander Sulfrian <alexander@sulfrian.net>
Date: Mon, 9 Feb 2015 04:43:02 +0100
Subject: Only save old vshelper, if it is different from our helper.

---
 util-vserver-netns | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/util-vserver-netns b/util-vserver-netns
index 5e5b287..ca69e43 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
-- 
cgit v1.2.3-1-g7c22


From 86132f55441a464418a5c566516f23d42e3303c4 Mon Sep 17 00:00:00 2001
From: Alexander Sulfrian <alexander@sulfrian.net>
Date: Mon, 9 Feb 2015 04:43:08 +0100
Subject: Use util-vserver core function to set old vshelper.

---
 util-vserver-netns | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/util-vserver-netns b/util-vserver-netns
index ca69e43..3141b5f 100755
--- a/util-vserver-netns
+++ b/util-vserver-netns
@@ -46,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
 
-- 
cgit v1.2.3-1-g7c22