From 34df7b0b646e16bc6473124bd7d08ce34559c6b4 Mon Sep 17 00:00:00 2001 From: Andy Nguyen Date: Fri, 19 Jun 2026 20:14:58 +0200 Subject: [PATCH] Undo changes to zz-update-boot. --- distros/shared/zz-update-boot | 10 ---------- distros/shared/zz-update-boot-multi | 10 ---------- 2 files changed, 20 deletions(-) diff --git a/distros/shared/zz-update-boot b/distros/shared/zz-update-boot index d003b3a..6e8a5c9 100755 --- a/distros/shared/zz-update-boot +++ b/distros/shared/zz-update-boot @@ -6,16 +6,6 @@ BOOT_PART="/boot/efi" KVER="$1" [ -z "$KVER" ] && KVER="$(ls -1t /lib/modules | head -1)" -# Debian-based desktop metapackages may also install a generic kernel. Once -# linux-ps5 is present, never deploy another kernel to the PS5 boot partition. -if command -v dpkg-query >/dev/null 2>&1 && dpkg-query -W linux-ps5 >/dev/null 2>&1; then - PS5_KVER="$(dpkg-query -L linux-ps5 | sed -n 's#^/boot/vmlinuz-##p' | head -1)" - if [ -n "$PS5_KVER" ] && [ "$KVER" != "$PS5_KVER" ]; then - echo ">> Ignoring non-PS5 kernel $KVER (PS5 kernel is $PS5_KVER)" - exit 0 - fi -fi - if [ -f "$BOOT_PART/bzImage" ]; then mv "$BOOT_PART/bzImage" "$BOOT_PART/bzImage.old" fi diff --git a/distros/shared/zz-update-boot-multi b/distros/shared/zz-update-boot-multi index 765e9d0..e5937b9 100644 --- a/distros/shared/zz-update-boot-multi +++ b/distros/shared/zz-update-boot-multi @@ -9,16 +9,6 @@ KVER="$1" DISTRO="unknown" [ -f /etc/ps5-distro ] && DISTRO="$(cat /etc/ps5-distro)" -# Debian-based desktop metapackages may also install a generic kernel. Once -# linux-ps5 is present, never deploy another kernel to the PS5 boot partition. -if command -v dpkg-query >/dev/null 2>&1 && dpkg-query -W linux-ps5 >/dev/null 2>&1; then - PS5_KVER="$(dpkg-query -L linux-ps5 | sed -n 's#^/boot/vmlinuz-##p' | head -1)" - if [ -n "$PS5_KVER" ] && [ "$KVER" != "$PS5_KVER" ]; then - echo ">> Ignoring non-PS5 kernel $KVER (PS5 kernel is $PS5_KVER)" - exit 0 - fi -fi - if [ -f "$BOOT_PART/bzImage" ]; then mv "$BOOT_PART/bzImage" "$BOOT_PART/bzImage.old" fi