diff --git a/.github/release-nest-v3-nvidia-iso b/.github/release-nest-v3-nvidia-iso index 7813681..62f9457 100644 --- a/.github/release-nest-v3-nvidia-iso +++ b/.github/release-nest-v3-nvidia-iso @@ -1 +1 @@ -5 \ No newline at end of file +6 \ No newline at end of file diff --git a/build.sh b/build.sh index 0e0df31..af89669 100755 --- a/build.sh +++ b/build.sh @@ -61,35 +61,36 @@ mksquashfs \ # Copy kernel to refind mkdir -p ./data/refind/EFI -cp -vf "$ROOTFS_PATH/boot"/vmlinuz-"$ISO_KERNEL"* "./data/refind/EFI/vmlinuz" -cp -vf "$ROOTFS_PATH/boot"/initrd.img-"$ISO_KERNEL"* "./data/refind/EFI/initrd" +cp -vf "$ROOTFS_PATH/boot"/vmlinuz-"$ISO_KERNEL" "./data/refind/EFI/vmlinuz" +cp -vf "$ROOTFS_PATH/boot"/initrd.img-"$ISO_KERNEL" "./data/refind/EFI/initrd" -dd if=/dev/zero of="$LIVE_BOOT_PATH/efiboot.img" bs=1 count=$(du -s -B1 ./data/refind | cut -f1) -mkfs.vfat -F 32 "$LIVE_BOOT_PATH/efiboot.img" +# Create Refind Image +dd if=/dev/zero of="$DD_BOOT_IMAGE" bs=1 count=$REFIND_SIZE +mkfs.vfat -F 32 "$DD_BOOT_IMAGE" for directory in $(find ./data/refind/EFI/ -type d | cut -d'/' -f4-) do - mmd -i "$LIVE_BOOT_PATH/efiboot.img" ::"$(echo $directory | tr '[:lower:]' '[:upper:]' | sed 's:/*$::')" + mmd -i "$DD_BOOT_IMAGE" ::"$(echo $directory | tr '[:lower:]' '[:upper:]' | sed 's:/*$::')" done for file in $(find ./data/refind/EFI/ -type f) do - mcopy -i "$LIVE_BOOT_PATH/efiboot.img" $file ::"$(echo $file | cut -d'/' -f4- | tr '[:lower:]' '[:upper:]')" + mcopy -i "$DD_BOOT_IMAGE" $file ::"$(echo $file | cut -d'/' -f4- | tr '[:lower:]' '[:upper:]')" done -# Create Bootable UEFI Full Image -mkdir -p ./output +# Create Live medium image +dd if=/dev/zero of="$DD_LIVE_IMAGE" bs=1 count=$LIVE_SIZE +mkfs.ext4 "$DD_LIVE_IMAGE" +for directory in $(find $LIVE_BOOT_LIVE_PATH -type d | cut -d'/' -f4-) +do + mmd -i "$DD_LIVE_IMAGE" ::"$(echo $directory | tr '[:lower:]' '[:upper:]' | sed 's:/*$::')" +done + +for file in $(find $LIVE_BOOT_LIVE_PATH -type f) +do + mcopy -i "$DD_LIVE_IMAGE" $file ::"$(echo $file | cut -d'/' -f4- | tr '[:lower:]' '[:upper:]')" +done -xorriso \ - -as mkisofs \ - -iso-level 3 \ - -V "PikaOS 4" \ - -e --interval:appended_partition_2:all:: \ - -append_partition 2 0xef "$LIVE_BOOT_PATH/efiboot.img" \ - -J -joliet-long \ - -no-emul-boot \ - -isohybrid-gpt-basdat \ - -o "./output/$ISO_IMAGE".iso \ - "$LIVE_BOOT_DATA_PATH" +cat $DD_BOOT_IMAGE $DD_LIVE_IMAGE > "./output/$ISO_IMAGE".iso # Generate an integrity sum touch "./output/$ISO_IMAGE".md5 diff --git a/info.sh b/info.sh index 3bf791f..6aac8b9 100755 --- a/info.sh +++ b/info.sh @@ -6,7 +6,7 @@ export LIVE_BOOT_LIVE_PATH="$LIVE_BOOT_DATA_PATH/live" export ROOTFS_PATH="$LIVE_BOOT_PATH/rootfs" export LIVE_HOSTNAME="pikaos" export ISO_DISTNAME="#DISTNAME#" -export ISO_KERNEL="6.10-pikaos" +export ISO_KERNEL="6.10.0-pikaos" export ISO_ARCH="#ARCH#" export ISO_RELEASE="4.0" export ISO_DESKTOP="GNOME"