Merge "dib-run-parts: make cp to target root more robust"

2016-04-18 19:37:29 +00:00 · 2016-04-18 19:37:29 +00:00 · 20def6a0cb
commit 20def6a0cb
parent 05382d10b9 33cd0fb40f
1 changed files with 5 additions and 1 deletions
--- a/elements/dib-run-parts/root.d/90-base-dib-run-parts
+++ b/elements/dib-run-parts/root.d/90-base-dib-run-parts
@ -6,6 +6,10 @@ fi
 set -eu
 set -o pipefail

+# Abort early if dib-run-parts is not found to prevent a meaningless
+# error message from the subsequent install command
+DIB_RUN_PARTS=$(which dib-run-parts)
+
 exec sudo install -m 0755 -o root -g root -D \
-    $(which dib-run-parts) \
+    $DIB_RUN_PARTS \
    $TARGET_ROOT/usr/local/bin/dib-run-parts