diff --git a/srcpkgs/vmklive/files/mklive.sh.in b/srcpkgs/vmklive/files/mklive.sh.in index 9d8b3ba29c6..ce0607e9a28 100755 --- a/srcpkgs/vmklive/files/mklive.sh.in +++ b/srcpkgs/vmklive/files/mklive.sh.in @@ -205,16 +205,6 @@ mount_pseudofs mkdir -p "$ROOTFS/tmp" if [ -z "$ROOTDIR" ]; then - # - # Register all package repositories in the target rootfs. - # - xver=$(${XBPS_BIN_CMD} -V|awk '{print $2}') - if [ -z "$xver" -o "$xver" = "" ]; then - for _repo_ in ${PACKAGE_REPO}; do - info_msg "Adding ${_repo_} package repository..." - ${XBPS_REPO_CMD} -r "$ROOTFS" add "${_repo_}" || error_out $? - done - fi ${XBPS_BIN_CMD} -r "$ROOTFS" -y install ${PACKAGE_LIST} || error_out $? ${XBPS_BIN_CMD} -r "$ROOTFS" -y autoupdate || error_out $? ${XBPS_BIN_CMD} -r "$ROOTFS" -yp autoremove || error_out $? @@ -243,16 +233,16 @@ fi # Rebuild the initramfs image with LZMA compression. # info_msg "Copying initramfs image..." -cp -f "${INITRD_IMG:-$ROOTFS/boot/initrd.img-${kver}}" \ - "$BUILDDIR/casper/initrd.lz" || error_out $? +INITRD_IMAGE=$(echo $ROOTFS/boot/initrd.img-*) +cp -f "$INITRD_IMAGE" "$BUILDDIR/casper/initrd.lz" || error_out $? mkdir -p "$ROOTFS"/cow # # Copy the linux image to the target directory. # info_msg "Copying kernel image..." -cp -f "${KERNEL_IMG:-$ROOTFS/boot/vmlinuz-${kver}}" \ - "$BUILDDIR/casper/vmlinuz" || error_out $? +KERNEL_IMG=$(echo $ROOTFS/boot/vmlinuz-*) +cp -f "$KERNEL_IMG" "$BUILDDIR/casper/vmlinuz" || error_out $? # # Remove stuff that uses a lot of space. diff --git a/srcpkgs/vmklive/template b/srcpkgs/vmklive/template index e29fe138616..dbd694cb9d4 100644 --- a/srcpkgs/vmklive/template +++ b/srcpkgs/vmklive/template @@ -1,6 +1,6 @@ # Template file for 'vmklive' pkgname=vmklive -version=0.5.0 +version=0.5.1 build_style=custom-install short_desc="Void GNU/Linux live image maker" maintainer="Juan RP "