images/live-iso-gnome
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix data path
Some checks failed
Push ISO / build (push) Failing after 6m22s
Details

Browse Source
This commit is contained in:
Ward from fusion-voyager-3 2024-08-01 19:16:30 +03:00
parent 417b1209e2
commit f7e2450cb9
6 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/push-iso vendored
View File

@ -1 +1 @@
23 24

12
build.sh
View File

@ -21,7 +21,7 @@ mount -t sysfs sys "$ROOTFS_PATH/sys" -o nosuid,nodev,noexec,ro
cp -rvf ./chroot_scripts "$ROOTFS_PATH/" cp -rvf ./chroot_scripts "$ROOTFS_PATH/"
cp -rvf ./hooks "$ROOTFS_PATH/chroot_scripts/" 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 ./pool-lists "$ROOTFS_PATH/chroot_scripts/"
cp -rvf ./rem-lists "$ROOTFS_PATH/chroot_scripts/" cp -rvf ./rem-lists "$ROOTFS_PATH/chroot_scripts/"
cp -rvf ./info.sh "$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 \ mksquashfs \
"$ROOTFS_PATH" \ "$ROOTFS_PATH" \
"$LIVE_BOOT_PATH/linux/live/filesystem.squashfs" \ "$LIVE_BOOT_LIVE_PATH/filesystem.squashfs" \
-e boot \ -e boot \
-noappend \ -noappend \
-comp xz \ -comp xz \
@ -52,11 +52,11 @@ mksquashfs \
# Copy Kernel to live # Copy Kernel to live
cp "$ROOTFS_PATH/boot"/vmlinuz-* \ cp "$ROOTFS_PATH/boot"/vmlinuz-* \
"$LIVE_BOOT_PATH/linux/live/vmlinuz" && \ "$LIVE_BOOT_LIVE_PATH/vmlinuz" && \
cp "$ROOTFS_PATH/boot"/initrd.img-* \ cp "$ROOTFS_PATH/boot"/initrd.img-* \
"$LIVE_BOOT_PATH/linux/live/initrd" && \ "$LIVE_BOOT_LIVE_PATH/initrd" && \
cp ./data/refind/refind_linux.conf \ 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 # Generate bootable EFI Image from refind
@ -80,4 +80,4 @@ xorriso \
-e "$LIVE_BOOT_PATH/efiboot.img" \ -e "$LIVE_BOOT_PATH/efiboot.img" \
-no-emul-boot \ -no-emul-boot \
-o "./output/$ISO_IMAGE" \ -o "./output/$ISO_IMAGE" \
"$LIVE_BOOT_PATH/linux" "$LIVE_BOOT_DATA_PATH"

8
chroot_scripts/2-install-live-lists.sh
View File

@ -4,19 +4,19 @@ set -e
export DEBIAN_FRONTEND="noninteractive" 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 do
for pkg in $(cat $live_list) for pkg in $(cat $live_list)
do do
if [[ $pkg != "#"* ]] if [[ $pkg != "#"* ]]
then then
echo $pkg >> /chroot_scripts/linux/live_list echo $pkg >> /chroot_scripts/live_list
fi fi
done done
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" " ")

2
data/refind/EFI/boot/icons/README
View File

@ -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_network.png -- AwOken/clear/128x128/places/network-workgroup1.png
os_uefi.png -- AwOkenWhite/clear/128x128/start-here/start-here-umbrella3.png os_uefi.png -- AwOkenWhite/clear/128x128/start-here/start-here-umbrella3.png
os_unknown.png -- AwOken/clear/128x128/actions/color-line1.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: Icons modified from AwOken 2.5:

4
generate_roofs_from_docker.sh
View File

@ -6,6 +6,10 @@ source ./info.sh
mkdir -p "$ROOTFS_PATH" mkdir -p "$ROOTFS_PATH"
mkdir -p "$LIVE_BOOT_DATA_PATH"
mkdir -p "$LIVE_BOOT_LIVE_PATH"
# Pull and mount docker image # Pull and mount docker image
podman --storage-driver=vfs pull ghcr.io/pikaos-linux/pikaos-base:canaryv3 podman --storage-driver=vfs pull ghcr.io/pikaos-linux/pikaos-base:canaryv3

4
info.sh
View File

@ -1,7 +1,9 @@
#! /bin/bash #! /bin/bash
export LIVE_BOOT_PATH="$(pwd)/LIVE_BOOT" 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 LIVE_HOSTNAME="pikaos"
export ISO_ARCH="amd64-v3" export ISO_ARCH="amd64-v3"
export ISO_RELEASE="4.0" export ISO_RELEASE="4.0"