blob: 0c99b662c4d452d05a6a8645603789658f128a5e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
diff --git a/etc/Makefile.am b/etc/Makefile.am
index 9b6e752..a33ce8e 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -1,5 +1,5 @@
if ADD_SYSTEMD
-EXTRA_DIST = udevil.conf devmon devmon@.service
+EXTRA_DIST = udevil.conf devmon@.service
else
EXTRA_DIST = udevil.conf
endif
@@ -11,11 +11,6 @@ install-data-hook:
$(srcdir)/udevil.conf \
$(DESTDIR)/$(sysconfdir)/udevil/udevil.conf
if ADD_SYSTEMD
- test -d $(DESTDIR)/$(sysconfdir)/conf.d || mkdir -p -- \
- $(DESTDIR)/$(sysconfdir)/conf.d
- test -f $(DESTDIR)/$(sysconfdir)/conf.d/devmon || $(INSTALL_DATA) \
- $(srcdir)/systemd/devmon \
- $(DESTDIR)/$(sysconfdir)/conf.d/devmon
test -d $(DESTDIR)/$(libdir)/systemd/system || \
mkdir -p -- $(DESTDIR)/$(libdir)/systemd/system
$(INSTALL_DATA) $(srcdir)/systemd/devmon@.service \
diff --git a/etc/Makefile.in b/etc/Makefile.in
index bf2b19b..4489e30 100644
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -262,7 +262,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@ADD_SYSTEMD_FALSE@EXTRA_DIST = udevil.conf
-@ADD_SYSTEMD_TRUE@EXTRA_DIST = udevil.conf devmon devmon@.service
+@ADD_SYSTEMD_TRUE@EXTRA_DIST = udevil.conf devmon@.service
all: all-am
.SUFFIXES:
@@ -462,11 +462,6 @@ install-data-hook:
test -f $(DESTDIR)/$(sysconfdir)/udevil/udevil.conf || $(INSTALL_DATA) \
$(srcdir)/udevil.conf \
$(DESTDIR)/$(sysconfdir)/udevil/udevil.conf
-@ADD_SYSTEMD_TRUE@ test -d $(DESTDIR)/$(sysconfdir)/conf.d || mkdir -p -- \
-@ADD_SYSTEMD_TRUE@ $(DESTDIR)/$(sysconfdir)/conf.d
-@ADD_SYSTEMD_TRUE@ test -f $(DESTDIR)/$(sysconfdir)/conf.d/devmon || $(INSTALL_DATA) \
-@ADD_SYSTEMD_TRUE@ $(srcdir)/systemd/devmon \
-@ADD_SYSTEMD_TRUE@ $(DESTDIR)/$(sysconfdir)/conf.d/devmon
@ADD_SYSTEMD_TRUE@ test -d $(DESTDIR)/$(libdir)/systemd/system || \
@ADD_SYSTEMD_TRUE@ mkdir -p -- $(DESTDIR)/$(libdir)/systemd/system
@ADD_SYSTEMD_TRUE@ $(INSTALL_DATA) $(srcdir)/systemd/devmon@.service \
diff --git a/etc/systemd/devmon@.service b/etc/systemd/devmon@.service
index 23ccf87..1d707ce 100644
--- a/etc/systemd/devmon@.service
+++ b/etc/systemd/devmon@.service
@@ -6,8 +6,7 @@ Type=simple
User=%i
# Set DISPLAY for popup dialogs
Environment=DISPLAY=:0
-EnvironmentFile=/etc/conf.d/devmon
-ExecStart=/usr/bin/devmon $ARGS
+ExecStart=/usr/bin/devmon
[Install]
WantedBy=multi-user.target
|
