X-Git-Url: https://git.camperquake.de/gitweb.cgi?p=time-slider.git;a=blobdiff_plain;f=usr%2Fshare%2Ftime-slider%2Flib%2Ftime_slider%2Ftimesliderd.py;h=3eb03810b71202cf257dcb67fe43023bcdde6a33;hp=99f802adc59ebfa35d465a186d08de84f64621e4;hb=9e15cb93887023c342fadf8f21310e80cf09d024;hpb=bff9182e1ef4ed57de8d68f99af736ed37b5fcd8

diff --git a/usr/share/time-slider/lib/time_slider/timesliderd.py b/usr/share/time-slider/lib/time_slider/timesliderd.py
index 99f802a..3eb0381 100755
--- a/usr/share/time-slider/lib/time_slider/timesliderd.py
+++ b/usr/share/time-slider/lib/time_slider/timesliderd.py
@@ -45,7 +45,7 @@ import zfs
 import smf
 import time_slider.linux.timeslidersmf as timeslidersmf
 import time_slider.linux.autosnapsmf as autosnapsmf
-import plugin
+# import plugin
 from time_slider.linux.rbac import RBACprofile
 import util
 
@@ -99,7 +99,7 @@ class SnapshotManager(threading.Thread):
                                       '/org/opensolaris/TimeSlider/autosnap',
                                       self)
 
-        self._plugin = plugin.PluginManager(self.verbose)
+        # self._plugin = plugin.PluginManager(self.verbose)
         self.exitCode = smf.SMF_EXIT_OK
         self.refresh()
 
@@ -208,7 +208,7 @@ class SnapshotManager(threading.Thread):
             self._configure_svc_props()
             self._rebuild_schedules()
             self._update_schedules()
-            self._plugin.refresh()
+            # self._plugin.refresh()
             self._stale = False
         self._refreshLock.release()
 
@@ -451,7 +451,7 @@ class SnapshotManager(threading.Thread):
         now = long(time.time())
         while next != None and next <= now:
             label = self._take_snapshots(schedule)
-            self._plugin.execute_plugins(schedule, label)
+            # self._plugin.execute_plugins(schedule, label)
             self._refreshLock.acquire()
             self._update_schedules()
             next,schedule = self._next_due();
@@ -934,8 +934,13 @@ def main(argv):
     parser = argparse.ArgumentParser()
     parser.add_argument('--foreground', action='store_true', help='Do not daemonize', default=False)
     parser.add_argument('--config', '-c', type=str, help='Configuration file', default='/etc/time-slider/timesliderd.conf')
+    parser.add_argument('--configdump', action='store_true', help='Dump default values in config file format', default=False)
     args, _ = parser.parse_known_args()
 
+    if args.configdump:
+        timesliderconfig.configdump()
+        sys.exit(smf.SMF_EXIT_OK)
+
     timesliderconfig.configfile = args.config
 
     # Daemonise the service.