diff --git a/.github/release-nest-v3-iso b/.github/release-nest-v3-iso index d8263ee..e440e5c 100644 --- a/.github/release-nest-v3-iso +++ b/.github/release-nest-v3-iso @@ -1 +1 @@ -2 \ No newline at end of file +3 \ No newline at end of file diff --git a/build.sh b/build.sh index fbdc649..472ef57 100755 --- a/build.sh +++ b/build.sh @@ -61,7 +61,8 @@ 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" diff --git a/chroot_scripts/0-chroot.sh b/chroot_scripts/0-chroot.sh index 587f251..5e95b0f 100755 --- a/chroot_scripts/0-chroot.sh +++ b/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 \ diff --git a/hooks/4-booster-setup.chroot b/hooks/4-booster-setup.chroot new file mode 100755 index 0000000..1f8883b --- /dev/null +++ b/hooks/4-booster-setup.chroot @@ -0,0 +1,69 @@ +#!/bin/sh + +# Create booster hook dirs +mkdir -p /usr/share/booster/hooks-early +mkdir -p /usr/share/booster/hooks-late + +# Create Early hook +touch /usr/share/booster/hooks-early/pika_live.sh +tee /usr/share/booster/hooks-early/pika_live.sh <<'EOF' +#! /bin/sh + +set -e + + +cat /proc/cmdline | grep 'boot=live' || exit 0 + +### Config +MEDIUM_LABEL="PikaOS 4" +#TMPFS_SIZE="3G" + +### Create mounting dirs +mkdir -p /mnt/medium /mnt/filesystem /mnt/overlay /root + +### Mount live medium +mount -o ro "$(findfs LABEL="$MEDIUM_LABEL" | head -n1)" /mnt/medium + +### Load loop module if not already loaded +modprobe loop + +### Create loop from squashfs + +#losetup /dev/loop69 /mnt/medium/live/filesystem.squashfs +## Mount squashfs loop +#mount -o ro /dev/loop69 /mnt/filesystem +mount -o loop,ro /mnt/medium/live/filesystem.squashfs /mnt/filesystem + +### Mount tmpfs on ram + +#mount -t tmpfs -o size="$TMPFS_SIZE",mode=1777 overlay_tmpfs /mnt/overlay +mount -t tmpfs -o mode=1777 overlay_tmpfs /mnt/overlay + +### Create overlay dirs +mkdir -p /mnt/overlay/upper /mnt/overlay/work + +### Create merged overlay +mount -t overlay overlay -o lowerdir=/mnt/filesystem:/mnt/medium,upperdir=/mnt/overlay/upper,workdir=/mnt/overlay/work /root + +### mount kernel filesystems +mount -n -t devtmpfs devtmpfs /root/dev +mount -n -t proc proc /root/proc +mount -n -t sysfs sysfs /root/sys +mount -n -t tmpfs tmpfs /root/run + + +### Switch to new root +#switch_root "/root/" "/root/sbin/init" +EOF + +touch /etc/booster.yaml +tee /etc/booster.yaml <<'EOF' +vconsole: true +extra_files: busybox +enable_lvm: true +modules_force_load: usbhid +universal: true +modules: * +enable_hooks: true +enable_plymouth: true +EOF diff --git a/live-lists/0-basics.list b/live-lists/0-basics.list index 552db4c..0f25a45 100755 --- a/live-lists/0-basics.list +++ b/live-lists/0-basics.list @@ -23,4 +23,6 @@ xfsprogs refind mesa-hybrid console-common -console-data \ No newline at end of file +console-data +booster +plymouth \ No newline at end of file