Support for ISO extras

cmds/deploy

@@ -7,13 +7,19 @@ deploy_iso_legacy() {
     local iso_name="openxt-installer.iso"
     local iso_path="${DEPLOY_DIR}/${iso_name}"
 
+    local STAGING_EXTRA=""
+    if [ -e "$CONF_DIR/extra-manifest" ] ; then
+        STAGING_EXTRA="${STAGING_DIR}/extra"
+    fi
+
     if ! genisoimage -o "${iso_path}" \
         -b "isolinux/isolinux.bin" -c "isolinux/boot.cat" \
         -no-emul-boot \
         -boot-load-size 4 \
         -boot-info-table \
         -r -J -l -V "OpenXT ${OPENXT_RELEASE} installer." \
         "${STAGING_DIR}/iso" \
+        $STAGING_EXTRA \
         "${STAGING_DIR}/repository"
     then
         echo "genisoimage failed."
@@ -33,6 +39,11 @@ deploy_iso() {
     local iso_name="openxt-installer.iso"
     local iso_path="${DEPLOY_DIR}/${iso_name}"
 
+    local STAGING_EXTRA=""
+    if [ -e "$CONF_DIR/extra-manifest" ] ; then
+        STAGING_EXTRA="${STAGING_DIR}/extra"
+    fi
+
     if ! command_sane "xorriso" "libisoburn"; then
         return 1
     fi
@@ -56,6 +67,7 @@ deploy_iso() {
         -f \
         -quiet \
         "${STAGING_DIR}/iso" \
+        $STAGING_EXTRA \
         "${STAGING_DIR}/repository"
 
     echo "ISO created: $iso_path"

cmds/stage

@@ -277,6 +277,32 @@ stage_iso() {
     if [ -e "${IMAGES_DIR}/${isohdp_src}" ]; then
         stage_build_output "${isohdp_src}" "${isohdp_dst}"
     fi
+
+    stage_extra_iso
+}
+
+stage_extra_iso() {
+    local src
+    local dst
+    local dest_dir="$STAGING_DIR/extra/extra"
+
+    # Need a placeholder, even if empty, so xorriso doesn't error out.
+    mkdir -p $STAGING_DIR/extra/
+
+    if [ ! -r "$CONF_DIR/extra-manifest" ] ; then
+        return
+    fi
+
+    while read src dst ; do
+        if [ -z "${src%%#*}" ]; then
+            continue
+        fi
+
+        src="$IMAGES_DIR/$src"
+        dst="$dest_dir/$dst"
+        mkdir -p "$(dirname "$dst")"
+        cp -rv -L -T "$src" "$dst"
+    done < "$CONF_DIR/extra-manifest"
 }
 
 # Usage: stage_pxe