From 1cae8252eed73ea69d8eb5b0526fcf524680d7cb Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Sun, 11 Aug 2024 04:03:43 +0300 Subject: [PATCH] --- build.sh | 1 + chroot_scripts/0-chroot.sh | 12 ++++++------ chroot_scripts/1-baseos.sh | 2 +- chroot_scripts/2-install-live-lists.sh | 2 +- chroot_scripts/4-uninstall-rem-lists.sh | 2 +- get_iso_build_dep.sh | 2 +- .../hooks/3-install-nvidia-driver.chroot | 2 +- 7 files changed, 12 insertions(+), 11 deletions(-) diff --git a/build.sh b/build.sh index f17becc..c4aeb65 100755 --- a/build.sh +++ b/build.sh @@ -73,6 +73,7 @@ DD_LIVE_IMAGE="./live.img" # Create Refind Image dd if=/dev/zero of="$DD_BOOT_IMAGE" bs=1M count=$REFIND_SIZE mkfs.vfat -F 32 "$DD_BOOT_IMAGE" + for directory in $(find ./data/refind/EFI/ -type d | cut -d'/' -f4-) do echo "creating directory $directory in $DD_BOOT_IMAGE" diff --git a/chroot_scripts/0-chroot.sh b/chroot_scripts/0-chroot.sh index 766c2c3..7a8a1b5 100755 --- a/chroot_scripts/0-chroot.sh +++ b/chroot_scripts/0-chroot.sh @@ -12,18 +12,18 @@ apt-get update -y apt-get install pika-sources -y # Actions to do before package lists -apt-get install initramfs-tools adwaita-icon-theme amdgpu-drm --yes --option Dpkg::Options::="--force-confnew" -apt-get install desktop-file-utils --yes --option Dpkg::Options::="--force-confnew" -apt-get install kernel-pika --yes --option Dpkg::Options::="--force-confnew" -apt-get install booster-placeholder --yes --option Dpkg::Options::="--force-confnew" +apt-get install initramfs-tools adwaita-icon-theme amdgpu-drm --yes --option Dpkg::Options::="--force-confnew" --option Dpkg::Options::="--force-overwrite" +apt-get install desktop-file-utils --yes --option Dpkg::Options::="--force-confnew" --option Dpkg::Options::="--force-overwrite" +apt-get install kernel-pika --yes --option Dpkg::Options::="--force-confnew" --option Dpkg::Options::="--force-overwrite" +apt-get install booster-placeholder --yes --option Dpkg::Options::="--force-confnew" --option Dpkg::Options::="--force-overwrite" # Upgrade system with new cache -apt-get full-upgrade --yes --option Dpkg::Options::="--force-confnew" +apt-get full-upgrade --yes --option Dpkg::Options::="--force-confnew" --option Dpkg::Options::="--force-overwrite" # Install Absolute Live Boot Basics -apt-get install --yes --option Dpkg::Options::="--force-confnew" --no-install-recommends \ +apt-get install --yes --option Dpkg::Options::="--force-confnew" --option Dpkg::Options::="--force-overwrite" --no-install-recommends \ live-boot \ systemd-sysv \ iwd \ diff --git a/chroot_scripts/1-baseos.sh b/chroot_scripts/1-baseos.sh index a01e0f9..f2b71e1 100755 --- a/chroot_scripts/1-baseos.sh +++ b/chroot_scripts/1-baseos.sh @@ -6,7 +6,7 @@ export DEBIAN_FRONTEND="noninteractive" # Install PikaOS Basics -apt-get install --yes --option Dpkg::Options::="--force-confnew" \ +apt-get install --yes --option Dpkg::Options::="--force-confnew" --option Dpkg::Options::="--force-overwrite" \ pika-baseos \ console-setup \ console-setup-linux \ diff --git a/chroot_scripts/2-install-live-lists.sh b/chroot_scripts/2-install-live-lists.sh index 7b19671..2aa1dae 100755 --- a/chroot_scripts/2-install-live-lists.sh +++ b/chroot_scripts/2-install-live-lists.sh @@ -17,6 +17,6 @@ do done done -apt-get install --yes --no-install-recommends --option Dpkg::Options::="--force-confnew" $(cat /chroot_scripts/live_list | tr "\n" " ") +apt-get install --yes --no-install-recommends --option Dpkg::Options::="--force-confnew" --option Dpkg::Options::="--force-overwrite" $(cat /chroot_scripts/live_list | tr "\n" " ") diff --git a/chroot_scripts/4-uninstall-rem-lists.sh b/chroot_scripts/4-uninstall-rem-lists.sh index 688d143..9263fc1 100755 --- a/chroot_scripts/4-uninstall-rem-lists.sh +++ b/chroot_scripts/4-uninstall-rem-lists.sh @@ -17,6 +17,6 @@ do done done -apt-get purge --yes --option Dpkg::Options::="--force-confnew" $(cat /chroot_scripts/rem_list | tr "\n" " ") || true +apt-get purge --yes --option Dpkg::Options::="--force-confnew" --option Dpkg::Options::="--force-overwrite" $(cat /chroot_scripts/rem_list | tr "\n" " ") || true diff --git a/get_iso_build_dep.sh b/get_iso_build_dep.sh index 5c8a21f..e4261bc 100755 --- a/get_iso_build_dep.sh +++ b/get_iso_build_dep.sh @@ -4,7 +4,7 @@ set -e export DEBIAN_FRONTEND="noninteractive" -apt-get install -y --no-install-recommends --option Dpkg::Options::="--force-confnew" \ +apt-get install -y --no-install-recommends --option Dpkg::Options::="--force-confnew" --option Dpkg::Options::="--force-overwrite" \ debootstrap \ squashfs-tools \ xorriso \ diff --git a/nvidia-enablement/hooks/3-install-nvidia-driver.chroot b/nvidia-enablement/hooks/3-install-nvidia-driver.chroot index 4862e74..a175658 100755 --- a/nvidia-enablement/hooks/3-install-nvidia-driver.chroot +++ b/nvidia-enablement/hooks/3-install-nvidia-driver.chroot @@ -1,4 +1,4 @@ #!/bin/bash -apt-get install --yes --option Dpkg::Options::="--force-confnew" \ +apt-get install --yes --option Dpkg::Options::="--force-confnew" --option Dpkg::Options::="--force-overwrite" \ nvidia-driver-555 \ No newline at end of file