Update .github/release-nest-v3-nvidia-iso

.github/release-nest-v3-iso

@@ -1 +1 @@
-2
+1

.github/release-nest-v3-nvidia-iso

@@ -1 +1 @@
-3
+1

.github/workflows/build-canary-v3-cosmo-iso.yml

@@ -31,7 +31,7 @@ jobs:
         if_key_exists: replace
 
     - name: Set ISO Info 
-      run: sed "s/#DISTNAME#/PikaOS-Canary-COSMO/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh
+      run: sed "s/#DISTNAME#/PikaOS-Canary-COSMO/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh && sed "s/#IS_ISO_NVIDIA#/false/g" -i ./info.sh
 
     - name: Get ISO Build Dependencies 
       run: ./get_iso_build_dep.sh

.github/workflows/build-canary-v3-iso.yml

@@ -31,7 +31,7 @@ jobs:
         if_key_exists: replace
 
     - name: Set ISO Info 
-      run: sed "s/#DISTNAME#/PikaOS-Canary/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh
+      run: sed "s/#DISTNAME#/PikaOS-Canary/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh && sed "s/#IS_ISO_NVIDIA#/false/g" -i ./info.sh
 
     - name: Get ISO Build Dependencies 
       run: ./get_iso_build_dep.sh

.github/workflows/build-canary-v3-nvidia-iso.yml

@@ -31,7 +31,7 @@ jobs:
         if_key_exists: replace
 
     - name: Set ISO Info 
-      run: sed "s/#DISTNAME#/PikaOS-Canary-NVIDIA/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh
+      run: sed "s/#DISTNAME#/PikaOS-Canary-NVIDIA/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh && sed "s/#IS_ISO_NVIDIA#/true/g" -i ./info.sh
 
     - name: Get ISO Build Dependencies 
       run: ./get_iso_build_dep.sh

.github/workflows/build-nest-v3-cosmo-iso.yml

@@ -31,7 +31,7 @@ jobs:
         if_key_exists: replace
 
     - name: Set ISO Info 
-      run: sed "s/#DISTNAME#/PikaOS-Nest-COSMO/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh
+      run: sed "s/#DISTNAME#/PikaOS-Nest-COSMO/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh && sed "s/#IS_ISO_NVIDIA#/false/g" -i ./info.sh
 
     - name: Get ISO Build Dependencies 
       run: ./get_iso_build_dep.sh

.github/workflows/build-nest-v3-iso.yml

@@ -31,7 +31,7 @@ jobs:
         if_key_exists: replace
 
     - name: Set ISO Info 
-      run: sed "s/#DISTNAME#/PikaOS-Nest/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh
+      run: sed "s/#DISTNAME#/PikaOS-Nest/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh && sed "s/#IS_ISO_NVIDIA#/false/g" -i ./info.sh
 
     - name: Get ISO Build Dependencies 
       run: ./get_iso_build_dep.sh

.github/workflows/build-nest-v3-nvidia-iso.yml

@@ -31,7 +31,7 @@ jobs:
         if_key_exists: replace
 
     - name: Set ISO Info 
-      run: sed "s/#DISTNAME#/PikaOS-Nest-NVIDIA/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh
+      run: sed "s/#DISTNAME#/PikaOS-Nest-NVIDIA/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh && sed "s/#IS_ISO_NVIDIA#/true/g" -i ./info.sh
 
     - name: Get ISO Build Dependencies 
       run: ./get_iso_build_dep.sh

.github/workflows/release-canary-v3-cosmo-iso.yml

@@ -31,7 +31,7 @@ jobs:
         if_key_exists: replace
 
     - name: Set ISO Info 
-      run: sed "s/#DISTNAME#/PikaOS-Canary-COSMO/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh
+      run: sed "s/#DISTNAME#/PikaOS-Canary-COSMO/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh && sed "s/#IS_ISO_NVIDIA#/false/g" -i ./info.sh
 
     - name: Get ISO Build Dependencies 
       run: ./get_iso_build_dep.sh

.github/workflows/release-canary-v3-iso.yml

@@ -31,7 +31,7 @@ jobs:
         if_key_exists: replace
 
     - name: Set ISO Info 
-      run: sed "s/#DISTNAME#/PikaOS-Canary/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh
+      run: sed "s/#DISTNAME#/PikaOS-Canary/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh && sed "s/#IS_ISO_NVIDIA#/false/g" -i ./info.sh
 
     - name: Get ISO Build Dependencies 
       run: ./get_iso_build_dep.sh

.github/workflows/release-canary-v3-nvidia-iso.yml

@@ -31,7 +31,7 @@ jobs:
         if_key_exists: replace
 
     - name: Set ISO Info 
-      run: sed "s/#DISTNAME#/PikaOS-Canary-NVIDIA/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh
+      run: sed "s/#DISTNAME#/PikaOS-Canary-NVIDIA/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh && sed "s/#IS_ISO_NVIDIA#/true/g" -i ./info.sh
 
     - name: Get ISO Build Dependencies 
       run: ./get_iso_build_dep.sh

.github/workflows/release-nest-v3-cosmo-iso.yml

@@ -31,7 +31,7 @@ jobs:
         if_key_exists: replace
 
     - name: Set ISO Info 
-      run: sed "s/#DISTNAME#/PikaOS-Nest-COSMO/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh
+      run: sed "s/#DISTNAME#/PikaOS-Nest-COSMO/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh && sed "s/#IS_ISO_NVIDIA#/false/g" -i ./info.sh
 
     - name: Get ISO Build Dependencies 
       run: ./get_iso_build_dep.sh

.github/workflows/release-nest-v3-iso.yml

@@ -31,7 +31,7 @@ jobs:
         if_key_exists: replace
 
     - name: Set ISO Info 
-      run: sed "s/#DISTNAME#/PikaOS-Nest/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh
+      run: sed "s/#DISTNAME#/PikaOS-Nest/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh && sed "s/#IS_ISO_NVIDIA#/false/g" -i ./info.sh
 
     - name: Get ISO Build Dependencies 
       run: ./get_iso_build_dep.sh

.github/workflows/release-nest-v3-nvidia-iso.yml

@@ -31,7 +31,7 @@ jobs:
         if_key_exists: replace
 
     - name: Set ISO Info 
-      run: sed "s/#DISTNAME#/PikaOS-Nest-NVIDIA/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh
+      run: sed "s/#DISTNAME#/PikaOS-Nest-NVIDIA/g" -i ./info.sh && sed "s/#ARCH#/amd64-v3/g" -i ./info.sh && sed "s/#IS_ISO_NVIDIA#/true/g" -i ./info.sh
 
     - name: Get ISO Build Dependencies 
       run: ./get_iso_build_dep.sh

README.md

@@ -1,3 +1,3 @@
-# live-iso-gnome-amd64-v3
+# live-iso-gnome
 
-Live ISO Builder for PikaOS GNOME (amd64-v3)
+Live ISO Builder for PikaOS GNOME

build.sh

@@ -44,10 +44,9 @@ mksquashfs \
     "$ROOTFS_PATH" \
     "$LIVE_BOOT_LIVE_PATH/filesystem.squashfs" \
     -noappend \
-    -comp xz \
-    -b 1M \
-    -Xdict-size 1M \
-    -Xbcj x86
+    -comp zstd \
+    -Xcompression-level 19 \
+    -b 1M
     
 # Copy Kernel to live (Disabled, Copy Kernels to refind instead)
 #cp "$ROOTFS_PATH/boot"/vmlinuz-* \
@@ -62,11 +61,18 @@ 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"/initrd.img-"$ISO_KERNEL" "./data/refind/EFI/initrd"
+cp -vf "$ROOTFS_PATH/boot"/booster.img-"$ISO_KERNEL" "./data/refind/EFI/initrd"
 
 EFI_BOOT_IMAGE_SIZE=$(($(du -s -B1048576 ./data/refind | cut -f1) + 10))
 EFI_BOOT_IMAGE="$LIVE_BOOT_PATH/efiboot.img"
 
+# Create needed ISO Params in refind
+sed -i "s#THE_NAME_OF_CURRENT_ISO_FOR_VENTOY#$ISO_IMAGE".iso"#g" ./data/refind/refind_linux.conf
+sed -i "s#THE_NAME_OF_CURRENT_ISO_FOR_VENTOY#$ISO_IMAGE".iso"#g" ./data/refind/EFI/boot/refind.conf
+sed -i "s#THE_LABEL_OF_CURRENT_ID#$ISO_LABEL#g" ./data/refind/refind_linux.conf
+sed -i "s#THE_LABEL_OF_CURRENT_ID#$ISO_LABEL#g" ./data/refind/EFI/boot/refind.conf
+
 # Create Refind Boot Image
 dd if=/dev/zero of="$EFI_BOOT_IMAGE" bs=1M count=$EFI_BOOT_IMAGE_SIZE
 mkfs.vfat -F 32 "$EFI_BOOT_IMAGE"
@@ -89,10 +95,11 @@ mkdir -p ./output
 xorriso \
     -as mkisofs \
     -iso-level 3 \
-    -V "PikaOS 4" \
+    -V "$ISO_LABEL" \
     -partition_offset 16 \
     -appended_part_as_gpt \
     -no-pad \
+    -no-emul-boot \
     -append_partition 2 0xef "$EFI_BOOT_IMAGE" \
     --efi-boot --interval:appended_partition_2:all:: \
     -o "./output/$ISO_IMAGE".iso \

chroot_scripts/0-chroot.sh

@@ -24,7 +24,6 @@ apt-get full-upgrade --yes --option Dpkg::Options::="--force-confnew" --option D
 # Install Absolute Live Boot Basics
 
 apt-get install --yes --option Dpkg::Options::="--force-confnew" --option Dpkg::Options::="--force-overwrite" --no-install-recommends \
-    live-boot \
     systemd-sysv \
     iwd \
     curl openssh-client \

chroot_scripts/2-install-live-lists.sh

@@ -19,4 +19,5 @@ done
 
 apt-get install --yes --no-install-recommends --option Dpkg::Options::="--force-confnew" --option Dpkg::Options::="--force-overwrite" $(cat /chroot_scripts/live_list | tr "\n" " ")
 
-
+systemctl mask fwupd || true
+systemctl mask nmdb || true

data/refind/EFI/boot/refind-dark/refind-dark.conf

@@ -14,7 +14,7 @@ banner refind-dark/banners/refind.png
 #timeout -1
 
 #Display, customize according to your display
-#resolution 3440 1440
+resolution max
 
 #Graphics
 use_graphics_for linux,grub,osx,windows

data/refind/EFI/boot/refind.conf

@@ -186,7 +186,7 @@ use_nvram false
 #resolution 1024 768
 #resolution 1440 900
 #resolution 3
-#resolution max
+resolution max
 
 # Enable touch screen support. If active, this feature enables use of
 # touch screen controls (as on tablets). Note, however, that not all
@@ -276,7 +276,7 @@ use_nvram false
 # with no options.
 #
 #showtools shell, bootorder, gdisk, memtest, mok_tool, apple_recovery, windows_recovery, about, hidden_tags, reboot, exit, firmware, fwupdate
-showtools install,bootorder,shell,memtest,gdisk,apple_recovery,csr_rotate,windows_recovery,mok_tool,about,shutdown,reboot,firmware
+#showtools install,bootorder,shell,memtest,gdisk,apple_recovery,csr_rotate,windows_recovery,mok_tool,about,shutdown,reboot,firmware
 
 # Additional directories to scan for tools. You may specify a directory
 # alone or a volume identifier plus pathname. The default is to scan no
@@ -651,12 +651,12 @@ menuentry "PikaOS Live Image" {
     icon   EFI/BOOT/REFIND-DARK/ICONS/OS_PIKAOS.PNG
     loader   EFI/VMLINUZ
     initrd   EFI/INITRD
-    options  "boot=live quiet splash"
+    options  "VTOY_ISO_NAME=THE_NAME_OF_CURRENT_ISO_FOR_VENTOY ISO_LABEL_NAME=""THE_LABEL_OF_CURRENT_ID"" boot=live booster.loadcdrom booster.skiproot quiet splash"
     submenuentry "Boot live image with logging" {
-        options  "boot=live"
+        options  "VTOY_ISO_NAME=THE_NAME_OF_CURRENT_ISO_FOR_VENTOY ISO_LABEL_NAME=""THE_LABEL_OF_CURRENT_ID"" boot=live booster.loadcdrom booster.skiproot"
     }
     submenuentry "Boot live image with safe graphics" {
-        options  "boot=live nomodeset"
+        options  "VTOY_ISO_NAME=THE_NAME_OF_CURRENT_ISO_FOR_VENTOY ISO_LABEL_NAME=""THE_LABEL_OF_CURRENT_ID"" boot=live booster.loadcdrom booster.skiproot nomodeset"
     }
 }
 

data/refind/EFI/boot/refind.conf-sample

@@ -186,7 +186,7 @@ use_nvram false
 #resolution 1024 768
 #resolution 1440 900
 #resolution 3
-#resolution max
+resolution max
 
 # Enable touch screen support. If active, this feature enables use of
 # touch screen controls (as on tablets). Note, however, that not all

data/refind/refind_linux.conf

@@ -1,3 +1,3 @@
-"Boot live image with standard options" "boot=live quiet splash  ---"
-"Boot live image with logging" "boot=live  ---"
-"Boot live image with safe graphics" "boot=live nomodeset ---"
+"Boot live image with standard options" "VTOY_ISO_NAME=THE_NAME_OF_CURRENT_ISO_FOR_VENTOY ISO_LABEL_NAME=""THE_LABEL_OF_CURRENT_ID"" boot=live booster.loadcdrom booster.skiproot quiet splash  ---"
+"Boot live image with logging" "VTOY_ISO_NAME=THE_NAME_OF_CURRENT_ISO_FOR_VENTOY ISO_LABEL_NAME=""THE_LABEL_OF_CURRENT_ID"" boot=live booster.loadcdrom booster.skiproot ---"
+"Boot live image with safe graphics" "VTOY_ISO_NAME=THE_NAME_OF_CURRENT_ISO_FOR_VENTOY ISO_LABEL_NAME=""THE_LABEL_OF_CURRENT_ID"" boot=live booster.loadcdrom booster.skiproot nomodeset ---"

hooks/0-create-liveuser.chroot

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-adduser --quiet --disabled-password --shell /bin/bash --gecos "PikaOS Live User" "pikaos"
+groupadd -g 1001 "pikaos"
+adduser --uid 1001 --gid 1001 --quiet --disabled-password --shell /bin/bash --gecos "PikaOS Live User" "pikaos"
 passwd -d "pikaos"
 for group in adm cdrom sudo render dip video plugdev input render lpadmin sambashare
 do

hooks/4-booster-setup.chroot

@@ -0,0 +1,14 @@
+#!/bin/sh
+touch /etc/booster.yaml
+tee /etc/booster.yaml <<'EOF'
+vconsole: true
+extra_files: busybox
+enable_lvm: true
+modules_force_load: usbhid,hid_generic,loop,usb_storage
+universal: true
+modules: usbhid,hid_generic,loop,usb_storage
+enable_hooks: true
+enable_plymouth: true
+EOF
+
+update-initramfs -c -k all

hooks/999-cleanup-apt-cache.chroot

@@ -4,3 +4,6 @@
 rm -f /var/lib/apt/lists/*_Packages
 rm -f /var/lib/apt/lists/*_Sources
 rm -f /var/lib/apt/lists/*_Translation-*
+systemctl unmask fwupd || true
+systemctl unmask nmdb || true
+apt clean -y

info.sh

@@ -6,10 +6,18 @@ 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.5-pikaos"
+export ISO_NVIDIA=#IS_ISO_NVIDIA#
+export ISO_KERNEL="6.12.8-pikaos"
 export ISO_ARCH="#ARCH#"
 export ISO_RELEASE="4.0"
 export ISO_DESKTOP="GNOME"
-export ISO_PATCH="7"
+export ISO_DESKTOP_ID="GN"
+export ISO_PATCH="1"
+if [ "ISO_NVIDIA" = true ]
+then
+    export ISO_LABEL="P"$ISO_DESKTOP_ID"N $(date '+%y.%m.%d') $ISO_PATCH"
+else
+    export ISO_LABEL="P"$ISO_DESKTOP_ID" $(date '+%y.%m.%d') $ISO_PATCH"
+fi
 export ISO_IMAGE="$ISO_DISTNAME-$ISO_DESKTOP-$ISO_RELEASE-$ISO_ARCH-$(date '+%y.%m.%d')-$ISO_PATCH"
 export LIVE_BOOT_VOLUME_NAME="$ISO_DISTNAME-$ISO_DESKTOP-$ISO_RELEASE-$ISO_ARCH-$ISO_PATCH"

live-lists/0-basics.list

@@ -22,5 +22,9 @@ f2fs-tools
 xfsprogs
 refind
 mesa-hybrid
-console-common
-console-data
+console-data
+booster
+plymouth
+plymouth-themes
+plymouth-theme-pika
+pika-live-booster-hooks

nvidia-enablement/data/refind/EFI/boot/refind.conf

@@ -186,7 +186,7 @@ use_nvram false
 #resolution 1024 768
 #resolution 1440 900
 #resolution 3
-#resolution max
+resolution max
 
 # Enable touch screen support. If active, this feature enables use of
 # touch screen controls (as on tablets). Note, however, that not all
@@ -276,7 +276,7 @@ use_nvram false
 # with no options.
 #
 #showtools shell, bootorder, gdisk, memtest, mok_tool, apple_recovery, windows_recovery, about, hidden_tags, reboot, exit, firmware, fwupdate
-showtools install,bootorder,shell,memtest,gdisk,apple_recovery,csr_rotate,windows_recovery,mok_tool,about,shutdown,reboot,firmware
+#showtools install,bootorder,shell,memtest,gdisk,apple_recovery,csr_rotate,windows_recovery,mok_tool,about,shutdown,reboot,firmware
 
 # Additional directories to scan for tools. You may specify a directory
 # alone or a volume identifier plus pathname. The default is to scan no
@@ -651,12 +651,12 @@ menuentry "PikaOS Live Image" {
     icon   EFI/BOOT/REFIND-DARK/ICONS/OS_PIKAOS.PNG
     loader   EFI/VMLINUZ
     initrd   EFI/INITRD
-    options  "boot=live modules_load=nvidia nvidia-drm.modeset=0 quiet splash"
+    options  "VTOY_ISO_NAME=THE_NAME_OF_CURRENT_ISO_FOR_VENTOY ISO_LABEL_NAME=""THE_LABEL_OF_CURRENT_ID"" boot=live booster.loadcdrom booster.skiproot modules_load=nvidia nvidia-drm.modeset=0 quiet splash"
     submenuentry "Boot live image with logging" {
-        options  "boot=live modules_load=nvidia nvidia-drm.modeset=0"
+        options  "VTOY_ISO_NAME=THE_NAME_OF_CURRENT_ISO_FOR_VENTOY ISO_LABEL_NAME=""THE_LABEL_OF_CURRENT_ID"" boot=live booster.loadcdrom booster.skiproot modules_load=nvidia nvidia-drm.modeset=0"
     }
     submenuentry "Boot live image with safe graphics" {
-        options  "boot=live nomodeset"
+        options  "VTOY_ISO_NAME=THE_NAME_OF_CURRENT_ISO_FOR_VENTOY ISO_LABEL_NAME=""THE_LABEL_OF_CURRENT_ID"" boot=live booster.loadcdrom booster.skiproot nomodeset"
     }
 }
 

nvidia-enablement/data/refind/refind_linux.conf

@@ -1,3 +1,3 @@
-"Boot live image with standard options" "boot=live modules_load=nvidia nvidia-drm.modeset=0 quiet splash  ---"
-"Boot live image with logging" "boot=live modules_load=nvidia nvidia-drm.modeset=0 ---"
-"Boot live image with safe graphics" "boot=live nomodeset ---"
+"Boot live image with standard options" "VTOY_ISO_NAME=THE_NAME_OF_CURRENT_ISO_FOR_VENTOY ISO_LABEL_NAME=""THE_LABEL_OF_CURRENT_ID"" boot=live booster.loadcdrom booster.skiproot modules_load=nvidia nvidia-drm.modeset=0 quiet splash  ---"
+"Boot live image with logging" "VTOY_ISO_NAME=THE_NAME_OF_CURRENT_ISO_FOR_VENTOY ISO_LABEL_NAME=""THE_LABEL_OF_CURRENT_ID"" boot=live booster.loadcdrom booster.skiproot modules_load=nvidia nvidia-drm.modeset=0 ---"
+"Boot live image with safe graphics" "VTOY_ISO_NAME=THE_NAME_OF_CURRENT_ISO_FOR_VENTOY ISO_LABEL_NAME=""THE_LABEL_OF_CURRENT_ID"" boot=live booster.loadcdrom booster.skiproot nomodeset ---"

nvidia-enablement/hooks/3-install-nvidia-driver.chroot

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 apt-get install --yes --option Dpkg::Options::="--force-confnew" --option Dpkg::Options::="--force-overwrite" \
-	nvidia-driver-555
+	nvidia-driver-565

pool-lists/0-main.list

@@ -26,3 +26,4 @@ refind
 mokutil
 pika-refind-theme
 booster
+zram-tools