From d57c625b5c0645c7b5a79600fe77e81a6bffa43a Mon Sep 17 00:00:00 2001 From: john30 Date: Sat, 9 Sep 2017 11:48:59 +0200 Subject: [PATCH] fix for wrong /etc directory --- contrib/debian/systemd/ebusd.service | 2 +- make_debian.sh | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) mode change 100755 => 100644 make_debian.sh diff --git a/contrib/debian/systemd/ebusd.service b/contrib/debian/systemd/ebusd.service index 00078092..66f4df81 100644 --- a/contrib/debian/systemd/ebusd.service +++ b/contrib/debian/systemd/ebusd.service @@ -7,7 +7,7 @@ ConditionPathExists=/var/log Type=forking Restart=always PIDFile=/var/run/ebusd.pid -EnvironmentFile=-/etc/conf.d/ebusd +EnvironmentFile=-/etc/default/ebusd ExecStart=/usr/bin/ebusd $EBUSD_OPTS [Install] diff --git a/make_debian.sh b/make_debian.sh old mode 100755 new mode 100644 index 75c1fd30..ac77438a --- a/make_debian.sh +++ b/make_debian.sh @@ -59,12 +59,11 @@ rm $RELEASE/usr/bin/ebusfeed if [ -d /run/systemd/system ]; then mkdir -p $RELEASE/lib/systemd/system || exit 1 cp contrib/debian/systemd/ebusd.service $RELEASE/lib/systemd/system/ebusd.service || exit 1 - cp contrib/debian/default/ebusd $RELEASE/etc/default/ebusd || exit 1 else mkdir -p $RELEASE/etc/init.d || exit 1 cp contrib/debian/init.d/ebusd $RELEASE/etc/init.d/ebusd || exit 1 - cp contrib/debian/default/ebusd $RELEASE/etc/default/ebusd || exit 1 fi + cp contrib/debian/default/ebusd $RELEASE/etc/default/ebusd || exit 1 cp contrib/etc/ebusd/* $RELEASE/etc/ebusd/ || exit 1 cp contrib/etc/logrotate.d/ebusd $RELEASE/etc/logrotate.d/ || exit 1 cp ChangeLog.md $RELEASE/DEBIAN/changelog || exit 1