diff --git a/.github/release-nest-v3 b/.github/release-nest-v3 index 56a6051..d8263ee 100644 --- a/.github/release-nest-v3 +++ b/.github/release-nest-v3 @@ -1 +1 @@ -1 \ No newline at end of file +2 \ No newline at end of file diff --git a/main.sh b/main.sh index ac7521e..4d435c5 100755 --- a/main.sh +++ b/main.sh @@ -2,7 +2,7 @@ set -e -VERSION="2.0.4" +VERSION="2.0.5" source ./pika-build-config.sh diff --git a/pikainstall/debian/changelog b/pikainstall/debian/changelog index c6a424d..325d65a 100644 --- a/pikainstall/debian/changelog +++ b/pikainstall/debian/changelog @@ -1,3 +1,9 @@ +pikainstall (2.0.5-101pika1) pika; urgency=medium + + * Fix refind and jq + + -- Ward Nakchbandi Fri, 07 Oct 2022 23:26:00 +0300 + pikainstall (2.0.4-101pika10) pika; urgency=medium * Fix btrfs snapshots diff --git a/pikainstall/debian/control b/pikainstall/debian/control index 82a2627..9e6ef6f 100644 --- a/pikainstall/debian/control +++ b/pikainstall/debian/control @@ -8,5 +8,5 @@ Rules-Requires-Root: no Package: pikainstall Architecture: linux-any -Depends: ${misc:Depends}, squashfs-tools, arch-install-scripts, cryptsetup, whois +Depends: ${misc:Depends}, squashfs-tools, arch-install-scripts, cryptsetup, whois, jq Description: Command line installer for PikaOS diff --git a/pikainstall/usr/lib/pika/pikainstall/pika-install-chroot.sh b/pikainstall/usr/lib/pika/pikainstall/pika-install-chroot.sh index c51ed4b..507bf7d 100755 --- a/pikainstall/usr/lib/pika/pikainstall/pika-install-chroot.sh +++ b/pikainstall/usr/lib/pika/pikainstall/pika-install-chroot.sh @@ -41,11 +41,7 @@ chmod +x /var/albius-lang_linux.sh echo 'BOOTLOADER' | nc -U $SOCKET_PATH || true chmod +x /var/albius-refind_linux.sh /var/albius-refind_linux.sh -refind-install apt install -y /var/cache/apt/archives/pika-refind-theme*.deb /var/cache/apt/archives/booster*.deb -# EFI workaround for MSI -mkdir -p /boot/efi/EFI/BOOT -cp -vf /boot/efi/EFI/refind/refind_x64.efi /boot/efi/EFI/BOOT/BOOTX64.EFI # Remove installer from installed system echo 'LIVE_REMOVE' | nc -U $SOCKET_PATH || true apt remove live-boot pika-installer-gtk4 -y || true diff --git a/pikainstall/usr/lib/pika/pikainstall/pika-install-host.sh b/pikainstall/usr/lib/pika/pikainstall/pika-install-host.sh index 5487f4e..49b0b85 100755 --- a/pikainstall/usr/lib/pika/pikainstall/pika-install-host.sh +++ b/pikainstall/usr/lib/pika/pikainstall/pika-install-host.sh @@ -41,7 +41,7 @@ then fi # This fixes first boot being to backup refind -refind-install || true +refind-install --usedefault "$(/usr/lib/pika/pikainstall/partition-helper.sh part "$1"/boot/efi)" echo 'UNBIND' | nc -U $SOCKET_PATH || true # Unmount host partitions from chroot