From 5105ff91d9090b4b36b86644ce0b3ac433c73076 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Wed, 10 Feb 2021 13:46:32 +0100 Subject: [PATCH] contrib: install .conf files from installed (fixed) services This fixes the problem with lingering Makefile's in /etc/finit.d/ on the target systems. We also get the new enabled services properly set up. Signed-off-by: Joachim Wiberg --- contrib/alpine/install.sh | 2 +- contrib/debian/install.sh | 6 ++++-- contrib/void/install.sh | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/contrib/alpine/install.sh b/contrib/alpine/install.sh index ddbd7672..714997ee 100755 --- a/contrib/alpine/install.sh +++ b/contrib/alpine/install.sh @@ -29,7 +29,7 @@ if [ "x$yorn" = "xy" -o "x$yorn" = "xY" ]; then echo echo "*** Installing Finit files ..." make install - cd `dirname $0` + cd /usr/share/doc/finit/contrib/alpine for file in finit.conf rc.local; do install -vbD $file /etc/$file done diff --git a/contrib/debian/install.sh b/contrib/debian/install.sh index 1577042f..9926deb5 100755 --- a/contrib/debian/install.sh +++ b/contrib/debian/install.sh @@ -31,8 +31,10 @@ echo if [ "x$yorn" = "xy" -o "x$yorn" = "xY" ]; then echo "Installing Finit files ..." make install - cd `dirname $0` - install -vbD finit.conf /etc/finit.conf + cd /usr/share/doc/finit/contrib/debian + for file in finit.conf; do + install -vbD $file /etc/$file + done cp -va finit.d /etc/ echo "*** Setting up a GRUB boot entry ..." diff --git a/contrib/void/install.sh b/contrib/void/install.sh index 787e3556..c85a8ed0 100755 --- a/contrib/void/install.sh +++ b/contrib/void/install.sh @@ -30,7 +30,7 @@ if [ "x$yorn" = "xy" -o "x$yorn" = "xY" ]; then echo echo "*** Installing Finit files ..." make install - cd `dirname $0` + cd /usr/share/doc/finit/contrib/void for file in finit.conf rc.local; do install -vbD $file /etc/$file done