iso_build_dir=$tmp/build
input_image=$(readlink -f ${1:-$WORKTMP/goldenimage/$GOLDEN_IMAGE_NAME})
-output_image_path=${2:-$RESULT_IMAGES_DIR/rec.iso}
+output_image_path=${2:-$RESULT_IMAGES_DIR/install.iso}
output_bootcd_path=${3:-$RESULT_IMAGES_DIR/bootcd.iso}
mkdir -p $tmp
rm -rf $iso_build_dir
mkdir -p $iso_build_dir
-reposnap_base=$(_read_build_config DEFAULT centos_reposnap_base)
+reposnap_base=$(_read_build_config DEFAULT centos_reposnap)
release_version=$PRODUCT_RELEASE_LABEL
reposnap_base_dir="${reposnap_base}/os/x86_64/"
iso_image_label=$(_read_build_config DEFAULT iso_image_label)
echo $1 | sed -re 's#([^:])//+#\1/#g'
}
-get_nexus() {
- $scriptdir/nexus3_dl.sh \
- $nexus_url \
- $(basename $nexus_reposnaps) \
- ${reposnap_base#$nexus_reposnaps/}/os/x86_64 $@
-}
-
wget_dir() {
local url=$1
echo $url | grep -q /$ || _abort "wget path '$url' must end with slash for recursive wget"
pushd $iso_build_dir
# Get files needed for generating CD image.
-if echo $reposnap_base_dir | grep -E "https?://nexus3"; then
- nexus_url=$(_read_build_config DEFAULT nexus_url)
- nexus_reposnaps=$(_read_build_config DEFAULT nexus_reposnaps)
- get_nexus "EFI/BOOT" "EFI/BOOT/fonts"
- get_nexus "images:*efiboot.img" "images/pxeboot"
- get_nexus "isolinux"
-else
- wget_dir ${cd_efi_dir}/
- wget_dir ${cd_images_dir}/
- rm -rf images/boot.iso
- sync
- wget_dir ${cd_isolinux_dir}/
-fi
+wget_dir ${cd_efi_dir}/
+wget_dir ${cd_images_dir}/
+rm -f images/boot.iso
+sync
+wget_dir ${cd_isolinux_dir}/
chmod +w -R isolinux/ EFI/ images/
if [ -e $scriptdir/isolinux/isolinux.cfg ]; then
pushd $tmp
# Copy latest kernel and initrd-provisioning from boot dir
-virt-copy-out -a $input_image /boot/ ./
+qemu-img convert $input_image guest-image.raw
+myloop=$(sudo losetup -fP --show guest-image.raw)
+mkdir mnt
+sudo mount -o loop ${myloop}p1 mnt/
+sudo rsync -avA mnt/boot .
+sudo chown -R $(id -u):$(id -g) boot
+sudo umount mnt
+sudo losetup -d ${myloop}
+rm -f guest-image.raw
+
chmod u+w boot/
rm -f $iso_build_dir/isolinux/vmlinuz $iso_build_dir/isolinux/initrd.img
KVER=`ls -lrt boot/vmlinuz-* |grep -v rescue |tail -n1 |awk -F 'boot/vmlinuz-' '{print $2}'`
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 \
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"