git://git.camperquake.de
/
time-slider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add linux specific autosnapsmf module and dependencies
[time-slider.git]
/
usr
/
share
/
time-slider
/
lib
/
time_slider
/
timesliderd.py
diff --git
a/usr/share/time-slider/lib/time_slider/timesliderd.py
b/usr/share/time-slider/lib/time_slider/timesliderd.py
index
f9c8e3a
..
dc669b6
100755
(executable)
--- a/
usr/share/time-slider/lib/time_slider/timesliderd.py
+++ b/
usr/share/time-slider/lib/time_slider/timesliderd.py
@@
-31,6
+31,7
@@
import time
import datetime
import calendar
import signal
import datetime
import calendar
import signal
+import argparse
import glib
import gobject
import glib
import gobject
@@
-42,10
+43,10
@@
import dbus.mainloop.glib
import dbussvc
import zfs
import smf
import dbussvc
import zfs
import smf
-import timeslidersmf
-import autosnapsmf
+import time
_slider.linux.timeslidersmf as time
slidersmf
+import
time_slider.linux.autosnapsmf as
autosnapsmf
import plugin
import plugin
-from rbac import RBACprofile
+from
time_slider.linux.
rbac import RBACprofile
import util
_MINUTE = 60
import util
_MINUTE = 60
@@
-928,9
+929,13
@@
def create_daemon():
def main(argv):
def main(argv):
+ parser = argparse.ArgumentParser()
+ parser.add_argument('--foreground', action='store_true', help='Do not daemonize', default=False)
+ args, _ = parser.parse_known_args()
# Daemonise the service.
# Daemonise the service.
- create_daemon()
+ if not args.foreground:
+ create_daemon()
# The user security attributes checked are the following:
# Note that UID == 0 will match any profile search so
# The user security attributes checked are the following:
# Note that UID == 0 will match any profile search so