From c07d3e7ec943d54f73de1102c93a317e645d406b Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Tue, 29 Aug 2023 09:03:44 +0200 Subject: [PATCH] Relocate confd-bootstrap.sh to /usr/libexec Bootstrap and daemon-specific helper scripts, sometimes known as foot guns, should not be in $PATH. Signed-off-by: Joachim Wiberg --- board/netconf/rootfs/lib/infix/cfg-bootstrap | 2 +- src/confd/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/board/netconf/rootfs/lib/infix/cfg-bootstrap b/board/netconf/rootfs/lib/infix/cfg-bootstrap index dd17f7db..8749ea76 100755 --- a/board/netconf/rootfs/lib/infix/cfg-bootstrap +++ b/board/netconf/rootfs/lib/infix/cfg-bootstrap @@ -32,4 +32,4 @@ chmod 444 $CFG_D/auto-factory-config.cfg ln -sf auto-factory-config.cfg $CFG_D/factory-config.cfg # Bootstrap sysrepo db with all modules required by confd -confd-bootstrap.sh $CFG_D/factory-config.cfg $CFG_D/startup-config.cfg +/usr/libexec/confd/confd-bootstrap.sh $CFG_D/factory-config.cfg $CFG_D/startup-config.cfg diff --git a/src/confd/Makefile.am b/src/confd/Makefile.am index ec60078b..7f49515b 100644 --- a/src/confd/Makefile.am +++ b/src/confd/Makefile.am @@ -1,5 +1,5 @@ SUBDIRS = src yang dist_doc_DATA = README.md LICENSE -dist_bin_SCRIPTS = confd-bootstrap.sh +pkglibexec_SCRIPTS = confd-bootstrap.sh DISTCLEANFILES = *~ *.d ACLOCAL_AMFLAGS = -I m4