Allow for other custom configs other than just crowbar.json

mvidner-scratch · Oct 21, 2011 · bc7ab67 · bc7ab67
1 parent 069f2f1
commit bc7ab67
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/build_crowbar.sh b/build_crowbar.sh
@@ -457,10 +457,11 @@ BC_QUERY_STRINGS["test_timeouts"]="smoketest timeouts"
     echo "$VERSION" >> "$BUILD_DIR/dell/Version"
 
     # Custom start-up in place
-    if [ -f "$CROWBAR_DIR/crowbar.json" ] ; then
+    for f in "$CROWBAR_DIR"/*.json ; do
+      [[ -f $f ]] || continue
       mkdir -p "$BUILD_DIR/extra/config"
-      cp "$CROWBAR_DIR/crowbar.json" "$BUILD_DIR/extra/config"
-    fi
+      cp "$f" "$BUILD_DIR/extra/config"
+    done
 
     final_build_fixups