sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix init-scripts element path munging and deps

Browse Source 
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
This commit is contained in:
Gregory Haynes 2015-08-14 14:40:59 +00:00
parent caf402fd04
commit ca594ef20f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
elements/dib-init-system/install.d/20-install-init-scripts
View File

@ -9,7 +9,7 @@ fi
set -eu set -eu
set -o pipefail 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 if [ -d "$scripts_dir" ]; then
dest= dest=
case $DIB_INIT_SYSTEM in 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" echo "ERROR: DIB_INIT_SYSTEM ($DIB_INIT_SYSTEM) is not an unknown type"
exit 1 exit 1
fi fi
rsync -lCr "$scripts_dir" $dest cp -RP $scripts_dir. $dest || true
fi fi