From a35c0feffd1131c1b644539699bad7c26b310526 Mon Sep 17 00:00:00 2001 From: Itxaka Date: Thu, 3 Aug 2023 19:49:57 +0200 Subject: [PATCH] Test for squashfs recovery (#359) --- packages/static/grub-config/definition.yaml | 2 +- packages/static/grub-config/files/grub.cfg | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/static/grub-config/definition.yaml b/packages/static/grub-config/definition.yaml index 319635b..90aff50 100644 --- a/packages/static/grub-config/definition.yaml +++ b/packages/static/grub-config/definition.yaml @@ -1,3 +1,3 @@ name: "grub-config" category: "static" -version: "0.4" \ No newline at end of file +version: "0.5" \ No newline at end of file diff --git a/packages/static/grub-config/files/grub.cfg b/packages/static/grub-config/files/grub.cfg index f17ac39..d410dac 100644 --- a/packages/static/grub-config/files/grub.cfg +++ b/packages/static/grub-config/files/grub.cfg @@ -81,13 +81,13 @@ menuentry "${display_name} (fallback)" --id fallback { } menuentry "${display_name} recovery" --id recovery { - if search --no-floppy --file /cOS/recovery.squashfs ; then + search --no-floppy --label --set=root COS_RECOVERY + if [ test -s /cOS/recovery.squashfs ]; then set img=/cOS/recovery.squashfs set recoverylabel=COS_RECOVERY else set img=/cOS/recovery.img fi - search --no-floppy --label --set=root COS_RECOVERY set label=COS_SYSTEM loopback loop0 /$img set root=($root)