From 4ced2dbd171f248d0dc75c9e859cd082588ea7af Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Sun, 11 Aug 2024 02:47:05 +0300 Subject: [PATCH] WHO IS DIS? --- .github/release-nest-v3-nvidia-iso | 2 +- build.sh | 24 ++++++++++-------------- chroot_scripts/0-chroot.sh | 2 ++ live-lists/0-basics.list | 1 + live-lists/2-installer.list | 1 + 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/release-nest-v3-nvidia-iso b/.github/release-nest-v3-nvidia-iso index 9d60796..3cacc0b 100644 --- a/.github/release-nest-v3-nvidia-iso +++ b/.github/release-nest-v3-nvidia-iso @@ -1 +1 @@ -11 \ No newline at end of file +12 \ No newline at end of file diff --git a/build.sh b/build.sh index 189a37f..3049ed4 100755 --- a/build.sh +++ b/build.sh @@ -85,22 +85,18 @@ do mcopy -i "$DD_BOOT_IMAGE" $file ::"$(echo $file | cut -d'/' -f4- | tr '[:lower:]' '[:upper:]')" done -# Create Live medium image -dd if=/dev/zero of="$DD_LIVE_IMAGE" bs=1M count=$LIVE_SIZE -mkfs.ext4 "$DD_LIVE_IMAGE" -for directory in $(find $LIVE_BOOT_LIVE_PATH -type d | cut -d'/' -f4-) -do - echo "creating directory $directory in $DD_LIVE_IMAGE" - mmd -i "$DD_LIVE_IMAGE" ::"$(echo $directory | tr '[:lower:]' '[:upper:]' | sed 's:/*$::')" -done - -for file in $(find $LIVE_BOOT_LIVE_PATH -type f) -do - echo "copying file $file to $DD_LIVE_IMAGE" - mcopy -i "$DD_LIVE_IMAGE" $file ::"$(echo $file | cut -d'/' -f4- | tr '[:lower:]' '[:upper:]')" -done +# Create System Image + +xorriso \ + -as mkisofs \ + -iso-level 3 \ + -V "PikaOS 4" \ + -isohybrid-gpt-basdat \ + -o $DD_LIVE_IMAGE \ + "$LIVE_BOOT_DATA_PATH" # Join the 2 images into one +mkdir -p ./output echo "joining images" cat $DD_BOOT_IMAGE $DD_LIVE_IMAGE > "./output/$ISO_IMAGE".iso diff --git a/chroot_scripts/0-chroot.sh b/chroot_scripts/0-chroot.sh index 5e91d28..766c2c3 100755 --- a/chroot_scripts/0-chroot.sh +++ b/chroot_scripts/0-chroot.sh @@ -4,6 +4,8 @@ set -e export DEBIAN_FRONTEND="noninteractive" +dpkg --add-architecture i386 + # Update APT Caches apt-get update -y diff --git a/live-lists/0-basics.list b/live-lists/0-basics.list index 7f0842e..71f66b9 100755 --- a/live-lists/0-basics.list +++ b/live-lists/0-basics.list @@ -21,3 +21,4 @@ locales-all f2fs-tools xfsprogs refind +mesa-hybrid diff --git a/live-lists/2-installer.list b/live-lists/2-installer.list index da6c85b..e8d22f6 100755 --- a/live-lists/2-installer.list +++ b/live-lists/2-installer.list @@ -1,3 +1,4 @@ pika-first-setup-gtk4 pikainstall pika-installer-gtk4 +arch-install-scripts