From f7e2450cb96893fac0de264198cd785d5eaa1fd3 Mon Sep 17 00:00:00 2001
From: Ward from fusion-voyager-3 <hotrod.master@hotmail.com>
Date: Thu, 1 Aug 2024 19:16:30 +0300
Subject: [PATCH] Fix data path

---
 .github/push-iso                       |  2 +-
 build.sh                               | 12 ++++++------
 chroot_scripts/2-install-live-lists.sh |  8 ++++----
 data/refind/EFI/boot/icons/README      |  2 +-
 generate_roofs_from_docker.sh          |  4 ++++
 info.sh                                |  4 +++-
 6 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/.github/push-iso b/.github/push-iso
index 4099407..a45fd52 100644
--- a/.github/push-iso
+++ b/.github/push-iso
@@ -1 +1 @@
-23
+24
diff --git a/build.sh b/build.sh
index 46697a6..4ea97f1 100755
--- a/build.sh
+++ b/build.sh
@@ -21,7 +21,7 @@ mount -t sysfs sys "$ROOTFS_PATH/sys" -o nosuid,nodev,noexec,ro
 
 cp -rvf ./chroot_scripts "$ROOTFS_PATH/"
 cp -rvf ./hooks "$ROOTFS_PATH/chroot_scripts/"
-cp -rvf ./linux/live-lists "$ROOTFS_PATH/chroot_scripts/"
+cp -rvf ./live-lists "$ROOTFS_PATH/chroot_scripts/"
 cp -rvf ./pool-lists "$ROOTFS_PATH/chroot_scripts/"
 cp -rvf ./rem-lists "$ROOTFS_PATH/chroot_scripts/"
 cp -rvf ./info.sh "$ROOTFS_PATH/chroot_scripts/"
@@ -42,7 +42,7 @@ umount "$ROOTFS_PATH/sys" || umount -lf "$ROOTFS_PATH/sys" || true
 
 mksquashfs \
     "$ROOTFS_PATH" \
-    "$LIVE_BOOT_PATH/linux/live/filesystem.squashfs" \
+    "$LIVE_BOOT_LIVE_PATH/filesystem.squashfs" \
     -e boot \
     -noappend \
     -comp xz \
@@ -52,11 +52,11 @@ mksquashfs \
     
 # Copy Kernel to live
 cp "$ROOTFS_PATH/boot"/vmlinuz-* \
-    "$LIVE_BOOT_PATH/linux/live/vmlinuz" && \
+    "$LIVE_BOOT_LIVE_PATH/vmlinuz" && \
 cp "$ROOTFS_PATH/boot"/initrd.img-* \
-    "$LIVE_BOOT_PATH/linux/live/initrd" && \
+    "$LIVE_BOOT_LIVE_PATH/initrd" && \
 cp ./data/refind/refind_linux.conf \
-    "$LIVE_BOOT_PATH/linux/live/refind_linux.conf"
+    "$LIVE_BOOT_LIVE_PATH/refind_linux.conf"
 
 # Generate bootable EFI Image from refind
 
@@ -80,4 +80,4 @@ xorriso \
     -e "$LIVE_BOOT_PATH/efiboot.img" \
     -no-emul-boot \
     -o "./output/$ISO_IMAGE" \
-    "$LIVE_BOOT_PATH/linux"
+    "$LIVE_BOOT_DATA_PATH"
diff --git a/chroot_scripts/2-install-live-lists.sh b/chroot_scripts/2-install-live-lists.sh
index f1c7f47..7b19671 100755
--- a/chroot_scripts/2-install-live-lists.sh
+++ b/chroot_scripts/2-install-live-lists.sh
@@ -4,19 +4,19 @@ set -e
 
 export DEBIAN_FRONTEND="noninteractive"
 
-touch /chroot_scripts/linux/live_list
+touch /chroot_scripts/live_list
 
-for live_list in /chroot_scripts/linux/live-lists/*.list
+for live_list in /chroot_scripts/live-lists/*.list
 do
 	for pkg in $(cat $live_list)
 	do
 		if [[ $pkg != "#"* ]]
 		then
-			echo $pkg >> /chroot_scripts/linux/live_list
+			echo $pkg >> /chroot_scripts/live_list
 		fi
 	done
 done
 
-apt-get install --yes --no-install-recommends --option Dpkg::Options::="--force-confnew" $(cat /chroot_scripts/linux/live_list | tr "\n" " ")
+apt-get install --yes --no-install-recommends --option Dpkg::Options::="--force-confnew" $(cat /chroot_scripts/live_list | tr "\n" " ")
 
 
diff --git a/data/refind/EFI/boot/icons/README b/data/refind/EFI/boot/icons/README
index c52da51..bad6fab 100644
--- a/data/refind/EFI/boot/icons/README
+++ b/data/refind/EFI/boot/icons/README
@@ -82,7 +82,7 @@ os_mandriva.png -- AwOken/clear/128x128/start-here/start-here-mandriva5.png
 os_network.png -- AwOken/clear/128x128/places/network-workgroup1.png
 os_uefi.png -- AwOkenWhite/clear/128x128/start-here/start-here-umbrella3.png
 os_unknown.png -- AwOken/clear/128x128/actions/color-line1.png
-os_win8.png -- AwOken/clear/128x128/apps/linux/live1.png
+os_win8.png -- AwOken/clear/128x128/apps/live1.png
 
 
 Icons modified from AwOken 2.5:
diff --git a/generate_roofs_from_docker.sh b/generate_roofs_from_docker.sh
index ec5a2e6..be67167 100755
--- a/generate_roofs_from_docker.sh
+++ b/generate_roofs_from_docker.sh
@@ -6,6 +6,10 @@ source ./info.sh
 
 mkdir -p "$ROOTFS_PATH"
 
+mkdir -p "$LIVE_BOOT_DATA_PATH"
+
+mkdir -p "$LIVE_BOOT_LIVE_PATH"
+
 # Pull and mount docker image
 
 podman --storage-driver=vfs pull ghcr.io/pikaos-linux/pikaos-base:canaryv3
diff --git a/info.sh b/info.sh
index 43ce0be..02a95e1 100755
--- a/info.sh
+++ b/info.sh
@@ -1,7 +1,9 @@
 #! /bin/bash
 
 export LIVE_BOOT_PATH="$(pwd)/LIVE_BOOT"
-export ROOTFS_PATH="$LIVE_BOOT_DIR/rootfs"
+export LIVE_BOOT_DATA_PATH="$LIVE_BOOT_PATH/data"
+export LIVE_BOOT_LIVE_PATH="$LIVE_BOOT_DATA_PATH/live"
+export ROOTFS_PATH="$LIVE_BOOT_PATH/rootfs"
 export LIVE_HOSTNAME="pikaos"
 export ISO_ARCH="amd64-v3"
 export ISO_RELEASE="4.0"