summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRudolf J Streif <rstreif@debian.streifs.net>2016-02-12 16:57:22 -0800
committerUlf Wiger <ulf@wiger.net>2016-02-23 22:24:26 +0100
commit7a989b386748007e759b6e8e92d5688d52ab474f (patch)
tree7b7a06565175b16f4e959ef5e84db6148122d56f
parent060405d01015c193108d37d9db9c8dfc919f1a3b (diff)
downloadrvi_core-7a989b386748007e759b6e8e92d5688d52ab474f.tar.gz
Various Fixes for Debian Packaging
1. Minor typo fixes in Makefile 2. rvi.postrm should not remove /etc/rvi 3. systemd rvi.service a) incorrect path for HOME b) when starting daemon from shell script RemainAfterExit=yes needs to be added to prevent systemd from calling ExecStop right after ExecStart. Signed-off-by: Rudolf J Streif <rudolf.streif@gmail.com>
-rw-r--r--Makefile4
-rw-r--r--debian_template/rvi.postrm1
-rw-r--r--debian_template/rvi.service4
3 files changed, 4 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index ad3bd82..9aaeb4f 100644
--- a/Makefile
+++ b/Makefile
@@ -101,7 +101,7 @@ ubuntu_package: clean ubuntu_clean escript
# Pack up all relevant files, and ubuntu/, necessary for a build.
# Add rvi-$(VERSION) at the beginning of each file so
-# that theu get packed up into a correctly named subdirectory
+# that they get packed up into a correctly named subdirectory
#
tar czf ./ubuntu_build/rvi_$(VERSION).orig.tar.gz \
--exclude-vcs --transform="s|^|./rvi-$(VERSION)/|" \
@@ -123,7 +123,7 @@ debian_package: clean debian_clean escript
# Pack up all relevant files, and debian/, necessary for a build.
# Add rvi-$(VERSION) at the beginning of each file so
-# that theu get packed up into a correctly named subdirectory
+# that they get packed up into a correctly named subdirectory
#
tar czf ./debian_build/rvi_$(VERSION).orig.tar.gz \
--exclude-vcs --transform="s|^|./rvi-$(VERSION)/|" \
diff --git a/debian_template/rvi.postrm b/debian_template/rvi.postrm
index 0c7252f..a0c5d5b 100644
--- a/debian_template/rvi.postrm
+++ b/debian_template/rvi.postrm
@@ -25,7 +25,6 @@ case "$1" in
remove|purge|upgrde|disappear)
rm -f /etc/init.d/rvi
- rm -rf /etc/rvi
#DEBHELPER#
;;
diff --git a/debian_template/rvi.service b/debian_template/rvi.service
index 5e98259..43788bd 100644
--- a/debian_template/rvi.service
+++ b/debian_template/rvi.service
@@ -5,14 +5,14 @@ Description=Remote Vehicle Interaction Service
Wants=network-online.target
[Service]
-Environment="HOME=/usr/lib/rvi"
+Environment="HOME=/usr/lib/rvi_core"
Type=forking
StandardOutput=journal
StandardError=journal
-#ExecStartPre=/opt/rvi-0.5.0/erts-5.10.4/bin/epmd -daemon
ExecStart=/bin/sh /usr/bin/rvi_ctl -c /etc/rvi/rvi.config start
ExecStop=/bin/sh /usr/bin/rvi_ctl stop
GuessMainPID=yes
+RemainAfterExit=yes
[Install]
WantedBy=graphical.target multi-user.target