From c555188af068f441f78a74f0ec5c7c01f2ab1a7c Mon Sep 17 00:00:00 2001
From: John Southworth <john.southworth@vyatta.com>
Date: Mon, 25 Jul 2011 13:22:30 -0500
Subject: Bugfix 7362: Make some adjustments to previous patch per An-Cheng's
 suggestions

---
 src/cstore/unionfs/cstore-unionfs.hpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/cstore/unionfs/cstore-unionfs.hpp b/src/cstore/unionfs/cstore-unionfs.hpp
index c56f060..4edcfa7 100644
--- a/src/cstore/unionfs/cstore-unionfs.hpp
+++ b/src/cstore/unionfs/cstore-unionfs.hpp
@@ -162,11 +162,11 @@ private:
       } else {
         tmpl_path = C_DEF_TMPL_ROOT;
       }
-      orig_tmpl_path = val;
-      orig_mutable_cfg_path = "/";
+      mutable_cfg_path = "/";
+    } else {
+      tmpl_path = orig_tmpl_path;
+      mutable_cfg_path = orig_mutable_cfg_path;
     }
-    tmpl_path = orig_tmpl_path;
-    mutable_cfg_path = orig_mutable_cfg_path;
   };
 
   class UnionfsSavePaths : public SavePaths {
-- 
cgit v1.2.3