- Update from version 4.13 to 4.14 - Update of rootfile - Updated remove bug report url patch - Changelog 4.14 Update grub-btrfsd submenu creation by @bkmo in #289 Add codespell support (config, workflow to alert on new typos) + make it fix typos by @yarikoptic in #309 Update Arch Linux package URL in README.md by @felixonmars in #305 Fix bashism by @bastien-roucaries in #311 add support for yabsnap snapshot information by @64-bitman in #318 Fix RAID by @aidan-gibson in #325 Add support for GRUB patches from SUSE by @StollD in #321 add support for booting snapshots on LUKS encrypted disk by @cip91sk in #333 Get default early initrd list from GRUB_EARLY_INITRD_LINUX_STOCK by @JustTNE in #389 Ignore Podman container images by @wgalen in #380
Signed-off-by: Adolf Belka <[email protected]> --- config/rootfiles/common/grub-btrfs | 4 ++-- lfs/grub-btrfs | 8 ++++---- ...patch => grub-btrfs-4.14-remove_bug_report_url.patch} | 9 ++++----- 3 files changed, 10 insertions(+), 11 deletions(-) rename src/patches/grub-btrfs/{grub-btrfs-4.13-remove_bug_report_url.patch => grub-btrfs-4.14-remove_bug_report_url.patch} (55%) diff --git a/config/rootfiles/common/grub-btrfs b/config/rootfiles/common/grub-btrfs index 1a91d38b2..ad75da387 100644 --- a/config/rootfiles/common/grub-btrfs +++ b/config/rootfiles/common/grub-btrfs @@ -9,5 +9,5 @@ usr/bin/grub-btrfsd #usr/share/licenses #usr/share/licenses/grub-btrfs #usr/share/licenses/grub-btrfs/LICENSE -#usr/share/man/man8/grub-btrfs.8.bz2 -#usr/share/man/man8/grub-btrfsd.8.bz2 +#usr/share/man/man8/grub-btrfs.8 +#usr/share/man/man8/grub-btrfsd.8 diff --git a/lfs/grub-btrfs b/lfs/grub-btrfs index 63428258e..a9c2793fc 100644 --- a/lfs/grub-btrfs +++ b/lfs/grub-btrfs @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2023 IPFire Team <[email protected]> # +# Copyright (C) 2007-2026 IPFire Team <[email protected]> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 4.13 +VER = 4.14 THISAPP = grub-btrfs-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = e2f11a0a8282e3ec8ff8223e3bad70b5d5c5e81b4d740a1bf3554db412dbe48a8a0f216f4e6c65ae1d11c01a27b8b92bae9b470c60d2389505ce089511536e1a +$(DL_FILE)_BLAKE2 = 361fabb41e603f84af096925db7498e24ff68436b9f32cc6d1fe81dd4db58826d02052181d577b6484290016c11009d0b138c4187fcedb76848ef7a52b55222f install : $(TARGET) @@ -73,7 +73,7 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-btrfs/grub-btrfs-4.13-remove_bug_report_url.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-btrfs/grub-btrfs-4.14-remove_bug_report_url.patch $(UPDATE_AUTOMAKE) cd $(DIR_APP) && GRUB_UPDATE_EXCLUDE=true make install @rm -rf $(DIR_APP) diff --git a/src/patches/grub-btrfs/grub-btrfs-4.13-remove_bug_report_url.patch b/src/patches/grub-btrfs/grub-btrfs-4.14-remove_bug_report_url.patch similarity index 55% rename from src/patches/grub-btrfs/grub-btrfs-4.13-remove_bug_report_url.patch rename to src/patches/grub-btrfs/grub-btrfs-4.14-remove_bug_report_url.patch index fae632dd3..93ddaaec7 100644 --- a/src/patches/grub-btrfs/grub-btrfs-4.13-remove_bug_report_url.patch +++ b/src/patches/grub-btrfs/grub-btrfs-4.14-remove_bug_report_url.patch @@ -1,6 +1,5 @@ -diff -Naur grub-btrfs-4.13.org/41_snapshots-btrfs grub-btrfs-4.13/41_snapshots-btrfs ---- grub-btrfs-4.13.org/41_snapshots-btrfs 2023-06-05 08:55:44.000000000 +0200 -+++ grub-btrfs-4.13/41_snapshots-btrfs 2024-03-31 15:18:56.660479209 +0200 +--- grub-btrfs-4.14/41_snapshots-btrfs.orig 2025-09-17 07:41:59.000000000 +0200 ++++ grub-btrfs-4.14/41_snapshots-btrfs 2026-05-05 20:29:04.312330374 +0200 @@ -48,8 +48,7 @@ print_error() { @@ -12,9 +11,9 @@ diff -Naur grub-btrfs-4.13.org/41_snapshots-btrfs grub-btrfs-4.13/41_snapshots-b } @@ -78,7 +77,7 @@ - [[ "${GRUB_BTRFS_DISABLE,,}" == "true" ]] && print_error "GRUB_BTRFS_DISABLE is set to true (default=false)" + [ "$(echo "$GRUB_BTRFS_DISABLE" | tr '[:upper:]' '[:lower:]')" = 'true' ] && print_error "GRUB_BTRFS_DISABLE is set to true (default=false)" if ! type btrfs >/dev/null 2>&1; then print_error "btrfs-progs isn't installed"; fi - [[ -f "${GRUB_BTRFS_MKCONFIG_LIB:-/usr/share/grub/grub-mkconfig_lib}" ]] && . "${GRUB_BTRFS_MKCONFIG_LIB:-/usr/share/grub/grub-mkconfig_lib}" || print_error "grub-mkconfig_lib couldn't be found" + [ -f "${GRUB_BTRFS_MKCONFIG_LIB:-/usr/share/grub/grub-mkconfig_lib}" ] && . "${GRUB_BTRFS_MKCONFIG_LIB:-/usr/share/grub/grub-mkconfig_lib}" || print_error "grub-mkconfig_lib couldn't be found" -[[ "$(btrfs filesystem df / 2>&1)" == *"not a btrfs filesystem"* ]] && print_error "Root filesystem isn't btrfs" +[[ "$(btrfs filesystem df / 2>&1)" == *"not a btrfs filesystem"* ]] && print_error "Root filesystem isn't btrfs, skipping..." -- 2.54.0
