From: Egbert Eich Date: Wed Nov 28 09:00:00 2018 +0100 Subject: common: LSB: Move common functions script library to libexec Patch-mainline: Not yet Git-repo: https://github.com/warewulf/warewulf3 Git-commit: 547e2c5bd4af666d281d76e2f5b91e82a2c3e326 References: Per LSB only config files are allowed in /etc. Signed-off-by: Egbert Eich Signed-off-by: Egbert Eich --- common/bin/wwinit | 2 +- common/etc/Makefile.am | 2 +- common/libexec/wwinit/Makefile.am | 2 +- common/{etc => libexec/wwinit}/functions | 0 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/bin/wwinit b/common/bin/wwinit index b5160a6..bb2bd31 100644 --- a/common/bin/wwinit +++ b/common/bin/wwinit @@ -22,7 +22,7 @@ fi eval `wwconfig -sea` WWINITDIR="$WAREWULF_LIBEXECDIR/warewulf/wwinit" -WWFUNCTIONS="$WAREWULF_SYSCONFDIR/warewulf/functions" +WWFUNCTIONS="$WWINITDIR/functions" WWTMPDIR=`mktemp -d -t wwinit.XXXXXXXXX` SHELL="/bin/bash" diff --git a/common/etc/Makefile.am b/common/etc/Makefile.am index ed01448..36a420f 100644 --- a/common/etc/Makefile.am +++ b/common/etc/Makefile.am @@ -8,7 +8,7 @@ dist_confDATA_INSTALL = ${INSTALL} -m 640 confdir = $(sysconfdir)/warewulf/ -dist_conf_DATA = database.conf database-root.conf functions +dist_conf_DATA = database.conf database-root.conf MAINTAINERCLEANFILES = Makefile.in diff --git a/common/libexec/wwinit/Makefile.am b/common/libexec/wwinit/Makefile.am index 8b9a715..56eaebb 100644 --- a/common/libexec/wwinit/Makefile.am +++ b/common/libexec/wwinit/Makefile.am @@ -1,6 +1,6 @@ wwinitdir = $(libexecdir)/warewulf/wwinit -dist_wwinit_SCRIPTS = 10-database.init 25-wwsh.init +dist_wwinit_SCRIPTS = 10-database.init 25-wwsh.init functions MAINTAINERCLEANFILES = Makefile.in diff --git a/common/etc/functions b/common/libexec/wwinit/functions similarity index 100% rename from common/etc/functions rename to common/libexec/wwinit/functions