From ca594ef20f6ef321a186f9e624ddb0df5a10b890 Mon Sep 17 00:00:00 2001 From: Gregory Haynes Date: Fri, 14 Aug 2015 14:40:59 +0000 Subject: [PATCH] Fix init-scripts element path munging and deps There is a bug where the init scripts element incorrectly munges the install path making it useless. Also removing the dep on rsync since this occurs from inside the chroot. Change-Id: I8f2717d36d7d2ff4b195ec21e91afeaf30a1d803 --- elements/dib-init-system/install.d/20-install-init-scripts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/elements/dib-init-system/install.d/20-install-init-scripts b/elements/dib-init-system/install.d/20-install-init-scripts index e55f29c7..49099614 100755 --- a/elements/dib-init-system/install.d/20-install-init-scripts +++ b/elements/dib-init-system/install.d/20-install-init-scripts @@ -9,7 +9,7 @@ fi set -eu set -o pipefail -scripts_dir="$(dirname $0)../init-scripts/$DIB_INIT_SYSTEM/" +scripts_dir="$(dirname $0)/../init-scripts/$DIB_INIT_SYSTEM/" if [ -d "$scripts_dir" ]; then dest= case $DIB_INIT_SYSTEM in @@ -22,5 +22,5 @@ if [ -d "$scripts_dir" ]; then echo "ERROR: DIB_INIT_SYSTEM ($DIB_INIT_SYSTEM) is not an unknown type" exit 1 fi - rsync -lCr "$scripts_dir" $dest + cp -RP $scripts_dir. $dest || true fi