Sysrestore fixes.

Latest patch used the wrong path and all files where actually going to /tmp
even if a different path was specified.
Makes also StateFile behave the same as FileStore, and be a public class, this
way a common path can be used too.

1 files changed, 8 insertions, 3 deletions

diff --git a/ipa-server/ipaserver/service.py b/ipa-server/ipaserver/service.py
index f9270f2ea..b9f6c505d 100644
--- a/ipa-server/ipaserver/service.py
+++ b/ipa-server/ipaserver/service.py
@@ -78,11 +78,16 @@ def print_msg(message, output_fd=sys.stdout):
 
 
 class Service:
-    def __init__(self, service_name):
+    def __init__(self, service_name, sstore=None):
         self.service_name = service_name
         self.steps = []
         self.output_fd = sys.stdout
 
+        if sstore:
+            self.sstore = sstore
+        else:
+            self.sstore = sysrestore.StateFile('/var/lib/ipa/sysrestore')
+
     def set_output(self, fd):
         self.output_fd = fd
 
@@ -114,10 +119,10 @@ class Service:
         return is_enabled(self.service_name)
 
     def backup_state(self, key, value):
-        sysrestore.backup_state(self.service_name, key, value)
+        self.sstore.backup_state(self.service_name, key, value)
 
     def restore_state(self, key):
-        return sysrestore.restore_state(self.service_name, key)
+        return self.sstore.restore_state(self.service_name, key)
 
     def print_msg(self, message):
         print_msg(message, self.output_fd)