X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=build_step_create_install_cd.sh;h=ee66b90fbf0cb16e772efd1c5b011cf5c437e2cf;hb=refs%2Fchanges%2F92%2F692%2F1;hp=40de1cc407aa985c21e87335053e004a4e33c621;hpb=4ded4f2a805e9447be90751d7d4fb7e11552e545;p=ta%2Fbuild-tools.git

diff --git a/build_step_create_install_cd.sh b/build_step_create_install_cd.sh
index 40de1cc..ee66b90 100755
--- a/build_step_create_install_cd.sh
+++ b/build_step_create_install_cd.sh
@@ -23,11 +23,9 @@ _read_manifest_vars
 tmp=$WORKTMP/install_cd
 iso_build_dir=$tmp/build
 
-input_image="$WORKTMP/goldenimage/${GOLDEN_IMAGE_NAME}"
-output_image_path="$1"
-[[ $output_image_path =~ ^/ ]] || output_image_path=$(pwd)/$output_image_path
-output_bootcd_path="$2"
-[[ $output_bootcd_path =~ ^/ ]] || output_bootcd_path=$(pwd)/$output_bootcd_path
+input_image=$(readlink -f ${1:-$WORKTMP/goldenimage/$GOLDEN_IMAGE_NAME})
+output_image_path=${2:-$RESULT_IMAGES_DIR/rec.iso}
+output_bootcd_path=${3:-$RESULT_IMAGES_DIR/bootcd.iso}
 mkdir -p $tmp
 rm -rf $iso_build_dir
 mkdir -p $iso_build_dir
@@ -105,7 +103,7 @@ cp -fp boot/initrd-provisioning.img $iso_build_dir/isolinux/initrd.img
 rm -rf boot/
 
 echo "Generating boot iso"
-_run_cmd genisoimage  -U -r -v -T -J -joliet-long \
+genisoimage  -U -r -v -T -J -joliet-long \
   -V "${release_version}" -A "${release_version}" -P ${iso_image_label} \
   -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 \
   -boot-info-table -eltorito-alt-boot -e images/efiboot.img -no-emul-boot \
@@ -118,12 +116,12 @@ cp -f ${input_image} $iso_build_dir/
 mkdir -p $iso_build_dir/rpms
 
 echo "Generating product iso"
-_run_cmd genisoimage  -U -r -v -T -J -joliet-long \
+genisoimage  -U -r -v -T -J -joliet-long \
   -V "${release_version}" -A "${release_version}" -P ${iso_image_label} \
   -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 \
   -boot-info-table -eltorito-alt-boot -e images/efiboot.img -no-emul-boot \
   -o release.iso $iso_build_dir
-_run_cmd isohybrid $tmp/release.iso
+isohybrid $tmp/release.iso
 _publish_image $tmp/release.iso $output_image_path
 
 echo "Clean up to preserve workspace footprint"