diff -Nru grub2-unsigned-2.12/debian/build-efi-images grub2-unsigned-2.12/debian/build-efi-images --- grub2-unsigned-2.12/debian/build-efi-images 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/build-efi-images 2024-04-04 10:11:57.000000000 +0000 @@ -33,6 +33,12 @@ sbat_csv="$7" efi_vendor="${8:-$(dpkg-vendor --query vendor | tr '[:upper:]' '[:lower:]')}" +# make sure downstreams didn't mess up sbat.csv +if ! grep -q ^grub.peimage $sbat_csv; then + echo Missing sbat entry for "grub.peimage" >&2 + exit 1 +fi + # mkfs.msdos may not be on the default PATH. export PATH="$PATH:/sbin:/usr/sbin" diff -Nru grub2-unsigned-2.12/debian/changelog grub2-unsigned-2.12/debian/changelog --- grub2-unsigned-2.12/debian/changelog 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/changelog 2024-04-04 10:12:35.000000000 +0000 @@ -1,4 +1,59 @@ -grub2-unsigned (2.12-1ubuntu1) noble; urgency=medium +grub2-unsigned (2.12-1ubuntu7) noble; urgency=medium + + * d/p/grub-sort-version.patch: Also patch grub-mkconfig to export GRUB_FLAVOUR_ORDER + * d/grub-sort-version: Update regex to correctly match kernel flavour + * d/grub-sort-version: Append `-0` to abi strings before passing to python-apt (Fixes LP: #2041827) + * debian/: Add tests for grub-sort-version + * Revert peimage to re-use GRUB's image handle (LP: #2057679) (LP: #2054127) + * Increase SBAT level to "grub.ubuntu,2" and "grub.peimage,2" + * d/build-efi-images: Make sure downstream didn't remove peimage SBAT entry + * SECURITY UPDATE: Use-after-free in peimage module [LP: #2054127] + - CVE-2024-2312 + + -- Mate Kukri Thu, 04 Apr 2024 11:12:35 +0100 + +grub2 (2.12-1ubuntu6) noble; urgency=medium + + * No-change rebuild for CVE-2024-3094 + + -- Steve Langasek Sun, 31 Mar 2024 08:54:41 +0000 + +grub2 (2.12-1ubuntu5) noble; urgency=medium + + * No-change rebuild for libefivar1t64 on riscv64. + + -- Steve Langasek Thu, 07 Mar 2024 09:18:17 +0000 + +grub2 (2.12-1ubuntu4) noble; urgency=medium + + * d/grub-multi-install: Treat missing `cloud_style_installation` debconf as + false (LP: #2055294) + + -- Mate Kukri Wed, 28 Feb 2024 15:55:10 +0000 + +grub2 (2.12-1ubuntu3) noble; urgency=medium + + * Improve GRUB reinstallation in cloud images (LP: #2054103): + - Add debconf options "grub-{efi,pc}/cloud_style_installation" + - d/postinst.in: Make empty "grub-pc/install_devices" non-fatal in + noninteractive mode + * Determine GRUB_DISTRIBUTOR from os-release and fall back to build-time + dpkg vendor (LP: #2034253) + * d/p/grub-install-efi-title.patch: Use case-sensitive GRUB distributor as + EFI option title (LP: #2026310) + * Unreleased changes from Debian: + - d/p/revert-term-ns8250-spcr.patch: Revert ACPI SPCR table support + (#1062073) + + -- Mate Kukri Tue, 27 Feb 2024 10:54:26 +0000 + +grub2 (2.12-1ubuntu2) noble; urgency=medium + + * Revert patchset "ppc64: Restrict memory allocations" (LP: #2053117) + + -- Mate Kukri Wed, 14 Feb 2024 09:19:35 +0000 + +grub2 (2.12-1ubuntu1) noble; urgency=medium * Merge from Debian unstable; remaining changes: - Add Ubuntu sbat data diff -Nru grub2-unsigned-2.12/debian/control grub2-unsigned-2.12/debian/control --- grub2-unsigned-2.12/debian/control 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/control 2024-04-04 10:12:35.000000000 +0000 @@ -7,6 +7,8 @@ Build-Depends: debhelper-compat (= 13), patchutils, python3, + python3-apt, + python3-pytest, flex, bison, gawk, diff -Nru grub2-unsigned-2.12/debian/default/grub grub2-unsigned-2.12/debian/default/grub --- grub2-unsigned-2.12/debian/default/grub 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/default/grub 2024-04-04 10:03:45.000000000 +0000 @@ -5,7 +5,7 @@ GRUB_DEFAULT=0 GRUB_TIMEOUT=@DEFAULT_TIMEOUT@ -GRUB_DISTRIBUTOR=`lsb_release -i -s 2> /dev/null || echo Debian` +GRUB_DISTRIBUTOR=`( . /etc/os-release; echo ${NAME:-@DPKG_VENDOR@} ) 2>/dev/null || echo @DPKG_VENDOR@` GRUB_CMDLINE_LINUX_DEFAULT="@DEFAULT_CMDLINE@" GRUB_CMDLINE_LINUX="" diff -Nru grub2-unsigned-2.12/debian/grub-multi-install grub2-unsigned-2.12/debian/grub-multi-install --- grub2-unsigned-2.12/debian/grub-multi-install 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/grub-multi-install 2024-04-04 10:03:45.000000000 +0000 @@ -246,6 +246,15 @@ ############################################################################### # MAGIC SCRIPT ############################################################################### + +# Just do regular installation to /boot/efi on cloud images +db_get grub-efi/cloud_style_installation || true +if [ "$RET" = true ]; then + grub-install "$@" + touch /boot/grub/grub.cfg + exit 0 +fi + FALLBACK_MOUNTPOINT=/var/lib/grub/esp # Initial install/upgrade from /boot/efi? diff -Nru grub2-unsigned-2.12/debian/grub-pc.templates.in grub2-unsigned-2.12/debian/grub-pc.templates.in --- grub2-unsigned-2.12/debian/grub-pc.templates.in 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/grub-pc.templates.in 2024-04-04 10:03:45.000000000 +0000 @@ -155,3 +155,8 @@ Type: boolean Default: @DEFAULT_HIDDEN_TIMEOUT_BOOL@ Description: Hide the GRUB timeout; for internal use + +Template: grub-pc/cloud_style_installation +Type: boolean +Default: false +_Description: Choose installation target based on the device containing /boot? diff -Nru grub2-unsigned-2.12/debian/grub-sort-version grub2-unsigned-2.12/debian/grub-sort-version --- grub2-unsigned-2.12/debian/grub-sort-version 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/grub-sort-version 2024-04-04 10:11:57.000000000 +0000 @@ -28,7 +28,7 @@ if self._index != other._index: # Ordering is reversed, what should be considered highest comes first. return self._index > other._index - return apt_pkg.version_compare(self.abi, other.abi) < 0 + return apt_pkg.version_compare(f"{self.abi}-0", f"{other.abi}-0") < 0 def main() -> None: @@ -43,7 +43,7 @@ order = [] for flavour in os.environ.get("GRUB_FLAVOUR_ORDER", "").split(): - order.append(re.compile(f"[0-9]*-{flavour}$")) + order.append(re.compile(f"[\\s\\S]*-{flavour}(\\s*\\d*)$")) versions = [KernelABI(line.rstrip(), order) for line in sys.stdin] versions.sort(reverse=args.reverse) diff -Nru grub2-unsigned-2.12/debian/patches/Revert-kern-ieee1275-cmain-ppc64-Introduce-flags-to-ident.patch grub2-unsigned-2.12/debian/patches/Revert-kern-ieee1275-cmain-ppc64-Introduce-flags-to-ident.patch --- grub2-unsigned-2.12/debian/patches/Revert-kern-ieee1275-cmain-ppc64-Introduce-flags-to-ident.patch 1970-01-01 00:00:00.000000000 +0000 +++ grub2-unsigned-2.12/debian/patches/Revert-kern-ieee1275-cmain-ppc64-Introduce-flags-to-ident.patch 2024-04-04 10:03:45.000000000 +0000 @@ -0,0 +1,52 @@ +From: Mate Kukri +Date: Tue, 13 Feb 2024 16:23:06 +0000 +Subject: Revert "kern/ieee1275/cmain/ppc64: Introduce flags to identify KVM + and PowerVM" + +This reverts commit 2a9a8518e9df5cb308b3d17bc52ef85ff7be0591. +--- + grub-core/kern/ieee1275/cmain.c | 8 +------- + include/grub/ieee1275/ieee1275.h | 4 ---- + 2 files changed, 1 insertion(+), 11 deletions(-) + +diff --git a/grub-core/kern/ieee1275/cmain.c b/grub-core/kern/ieee1275/cmain.c +index e74de32..400d85d 100644 +--- a/grub-core/kern/ieee1275/cmain.c ++++ b/grub-core/kern/ieee1275/cmain.c +@@ -126,10 +126,7 @@ grub_ieee1275_find_options (void) + + #if defined(__powerpc__) + if (grub_strncmp (tmp, "IBM,", 4) == 0) +- { +- grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_CAN_TRY_CAS_FOR_MORE_MEMORY); +- grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_POWER_VM); +- } ++ grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_CAN_TRY_CAS_FOR_MORE_MEMORY); + #endif + } + +@@ -196,9 +193,6 @@ grub_ieee1275_find_options (void) + grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_NO_PRE1_5M_CLAIM); + + grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_HAS_CURSORONOFF); +-#if defined(__powerpc__) +- grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_POWER_KVM); +-#endif + } + } + +diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h +index dddb385..9f669fb 100644 +--- a/include/grub/ieee1275/ieee1275.h ++++ b/include/grub/ieee1275/ieee1275.h +@@ -141,10 +141,6 @@ enum grub_ieee1275_flag + */ + GRUB_IEEE1275_FLAG_CAN_TRY_CAS_FOR_MORE_MEMORY, + #endif +- +- GRUB_IEEE1275_FLAG_POWER_VM, +- +- GRUB_IEEE1275_FLAG_POWER_KVM, + }; + + extern int EXPORT_FUNC(grub_ieee1275_test_flag) (enum grub_ieee1275_flag flag); diff -Nru grub2-unsigned-2.12/debian/patches/Revert-kern-ieee1275-ieee1275-Display-successful-memory-c.patch grub2-unsigned-2.12/debian/patches/Revert-kern-ieee1275-ieee1275-Display-successful-memory-c.patch --- grub2-unsigned-2.12/debian/patches/Revert-kern-ieee1275-ieee1275-Display-successful-memory-c.patch 1970-01-01 00:00:00.000000000 +0000 +++ grub2-unsigned-2.12/debian/patches/Revert-kern-ieee1275-ieee1275-Display-successful-memory-c.patch 2024-04-04 10:03:45.000000000 +0000 @@ -0,0 +1,52 @@ +From: Mate Kukri +Date: Tue, 13 Feb 2024 16:23:05 +0000 +Subject: Revert "kern/ieee1275/ieee1275: Display successful memory claims + when debugging" + +This reverts commit dc569b0777d002d92be9a7421dca763e60c528e9. +--- + grub-core/kern/ieee1275/ieee1275.c | 3 --- + include/grub/powerpc/ieee1275/ieee1275.h | 3 --- + include/grub/sparc64/ieee1275/ieee1275.h | 3 --- + 3 files changed, 9 deletions(-) + +diff --git a/grub-core/kern/ieee1275/ieee1275.c b/grub-core/kern/ieee1275/ieee1275.c +index 36ca2db..db870db 100644 +--- a/grub-core/kern/ieee1275/ieee1275.c ++++ b/grub-core/kern/ieee1275/ieee1275.c +@@ -590,9 +590,6 @@ grub_ieee1275_claim (grub_addr_t addr, grub_size_t size, unsigned int align, + *result = args.base; + if (args.base == IEEE1275_CELL_INVALID) + return -1; +- grub_dprintf ("mmap", "CLAIMED: 0x%" PRIxGRUB_IEEE1275_CELL_T " (%" +- PRIuGRUB_IEEE1275_CELL_T " MiB) size: %" PRIuGRUB_SIZE " MiB\n", +- args.base, args.base >> 20, ALIGN_UP (size, 1 << 20) >> 20); + return 0; + } + +diff --git a/include/grub/powerpc/ieee1275/ieee1275.h b/include/grub/powerpc/ieee1275/ieee1275.h +index 4eb2070..3c7683f 100644 +--- a/include/grub/powerpc/ieee1275/ieee1275.h ++++ b/include/grub/powerpc/ieee1275/ieee1275.h +@@ -25,7 +25,4 @@ + #define GRUB_IEEE1275_CELL_SIZEOF 4 + typedef grub_uint32_t grub_ieee1275_cell_t; + +-#define PRIxGRUB_IEEE1275_CELL_T PRIxGRUB_UINT32_T +-#define PRIuGRUB_IEEE1275_CELL_T PRIuGRUB_UINT32_T +- + #endif /* ! GRUB_IEEE1275_MACHINE_HEADER */ +diff --git a/include/grub/sparc64/ieee1275/ieee1275.h b/include/grub/sparc64/ieee1275/ieee1275.h +index ccc71aa..4b18468 100644 +--- a/include/grub/sparc64/ieee1275/ieee1275.h ++++ b/include/grub/sparc64/ieee1275/ieee1275.h +@@ -25,9 +25,6 @@ + #define GRUB_IEEE1275_CELL_SIZEOF 8 + typedef grub_uint64_t grub_ieee1275_cell_t; + +-#define PRIxGRUB_IEEE1275_CELL_T PRIxGRUB_UINT64_T +-#define PRIuGRUB_IEEE1275_CELL_T PRIuGRUB_UINT64_T +- + /* Encoding of 'mode' argument to grub_ieee1275_map_physical() */ + #define IEEE1275_MAP_WRITE 0x0001 /* Writable */ + #define IEEE1275_MAP_READ 0x0002 /* Readable */ diff -Nru grub2-unsigned-2.12/debian/patches/Revert-kern-ieee1275-init-ppc64-Add-support-for-alignment.patch grub2-unsigned-2.12/debian/patches/Revert-kern-ieee1275-init-ppc64-Add-support-for-alignment.patch --- grub2-unsigned-2.12/debian/patches/Revert-kern-ieee1275-init-ppc64-Add-support-for-alignment.patch 1970-01-01 00:00:00.000000000 +0000 +++ grub2-unsigned-2.12/debian/patches/Revert-kern-ieee1275-init-ppc64-Add-support-for-alignment.patch 2024-04-04 10:03:45.000000000 +0000 @@ -0,0 +1,48 @@ +From: Mate Kukri +Date: Tue, 13 Feb 2024 16:23:08 +0000 +Subject: Revert "kern/ieee1275/init/ppc64: Add support for alignment + requirements" + +This reverts commit d49e86db2c15dd20f42262c0977f739ddf7bd6f6. +--- + grub-core/kern/ieee1275/init.c | 14 -------------- + include/grub/ieee1275/alloc.h | 1 - + 2 files changed, 15 deletions(-) + +diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c +index 019532a..2d1b0f1 100644 +--- a/grub-core/kern/ieee1275/init.c ++++ b/grub-core/kern/ieee1275/init.c +@@ -515,20 +515,6 @@ regions_claim (grub_uint64_t addr, grub_uint64_t len, grub_memory_type_t type, + } + } + } +- +- /* Honor alignment restrictions on candidate addr */ +- if (rcr->align) +- { +- grub_uint64_t align_addr = ALIGN_UP (addr, rcr->align); +- grub_uint64_t d = align_addr - addr; +- +- if (d > len) +- return 0; +- +- len -= d; +- addr = align_addr; +- } +- + if (rcr->flags & GRUB_MM_ADD_REGION_CONSECUTIVE && len < rcr->total) + return 0; + +diff --git a/include/grub/ieee1275/alloc.h b/include/grub/ieee1275/alloc.h +index e314c98..f3065ff 100644 +--- a/include/grub/ieee1275/alloc.h ++++ b/include/grub/ieee1275/alloc.h +@@ -30,7 +30,6 @@ struct regions_claim_request { + grub_uint32_t total; /* number of requested bytes */ + bool init_region; /* whether to add memory to the heap using grub_mm_init_region() */ + grub_uint64_t addr; /* result address */ +- grub_size_t align; /* alignment restrictions */ + }; + + #endif /* GRUB_IEEE1275_ALLOC_HEADER */ diff -Nru grub2-unsigned-2.12/debian/patches/Revert-kern-ieee1275-init-ppc64-Decide-by-request-whether.patch grub2-unsigned-2.12/debian/patches/Revert-kern-ieee1275-init-ppc64-Decide-by-request-whether.patch --- grub2-unsigned-2.12/debian/patches/Revert-kern-ieee1275-init-ppc64-Decide-by-request-whether.patch 1970-01-01 00:00:00.000000000 +0000 +++ grub2-unsigned-2.12/debian/patches/Revert-kern-ieee1275-init-ppc64-Decide-by-request-whether.patch 2024-04-04 10:03:45.000000000 +0000 @@ -0,0 +1,60 @@ +From: Mate Kukri +Date: Tue, 13 Feb 2024 16:23:09 +0000 +Subject: Revert "kern/ieee1275/init/ppc64: Decide by request whether to + initialize region" + +This reverts commit ea2c93484943e4f6e217e1768df38ce74986fc59. +--- + grub-core/kern/ieee1275/init.c | 5 +---- + include/grub/ieee1275/alloc.h | 3 --- + 2 files changed, 1 insertion(+), 7 deletions(-) + +diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c +index 389a75d..e995fbf 100644 +--- a/grub-core/kern/ieee1275/init.c ++++ b/grub-core/kern/ieee1275/init.c +@@ -528,8 +528,7 @@ regions_claim (grub_uint64_t addr, grub_uint64_t len, grub_memory_type_t type, + err = grub_claimmap (addr, len); + if (err) + return err; +- if (rcr->init_region) +- grub_mm_init_region ((void *) (grub_addr_t) addr, len); ++ grub_mm_init_region ((void *) (grub_addr_t) addr, len); + rcr->total -= len; + } + +@@ -548,7 +547,6 @@ heap_init (grub_uint64_t addr, grub_uint64_t len, grub_memory_type_t type, + struct regions_claim_request rcr = { + .flags = GRUB_MM_ADD_REGION_NONE, + .total = *(grub_uint32_t *) data, +- .init_region = true, + }; + int ret; + +@@ -566,7 +564,6 @@ region_claim (grub_uint64_t addr, grub_uint64_t len, grub_memory_type_t type, + struct regions_claim_request rcr = { + .flags = GRUB_MM_ADD_REGION_CONSECUTIVE, + .total = *(grub_uint32_t *) data, +- .init_region = true, + }; + int ret; + +diff --git a/include/grub/ieee1275/alloc.h b/include/grub/ieee1275/alloc.h +index 523f51f..12fade5 100644 +--- a/include/grub/ieee1275/alloc.h ++++ b/include/grub/ieee1275/alloc.h +@@ -21,14 +21,11 @@ + #ifndef GRUB_IEEE1275_ALLOC_HEADER + #define GRUB_IEEE1275_ALLOC_HEADER 1 + +-#include +- + #include + + struct regions_claim_request { + unsigned int flags; /* GRUB_MM_ADD_REGION_(NONE|CONSECUTIVE) */ + grub_uint32_t total; /* number of requested bytes */ +- bool init_region; /* whether to add memory to the heap using grub_mm_init_region() */ + }; + + #endif /* GRUB_IEEE1275_ALLOC_HEADER */ diff -Nru grub2-unsigned-2.12/debian/patches/Revert-kern-ieee1275-init-ppc64-Display-upper_mem_limit-w.patch grub2-unsigned-2.12/debian/patches/Revert-kern-ieee1275-init-ppc64-Display-upper_mem_limit-w.patch --- grub2-unsigned-2.12/debian/patches/Revert-kern-ieee1275-init-ppc64-Display-upper_mem_limit-w.patch 1970-01-01 00:00:00.000000000 +0000 +++ grub2-unsigned-2.12/debian/patches/Revert-kern-ieee1275-init-ppc64-Display-upper_mem_limit-w.patch 2024-04-04 10:03:45.000000000 +0000 @@ -0,0 +1,24 @@ +From: Mate Kukri +Date: Tue, 13 Feb 2024 16:23:02 +0000 +Subject: Revert "kern/ieee1275/init/ppc64: Display upper_mem_limit when + debugging" + +This reverts commit 17c68472d1e7746a043b174afb8aab44bda109da. +--- + grub-core/kern/ieee1275/init.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c +index c32b5f4..dc78357 100644 +--- a/grub-core/kern/ieee1275/init.c ++++ b/grub-core/kern/ieee1275/init.c +@@ -467,9 +467,6 @@ grub_regions_claim (grub_uint64_t addr, grub_uint64_t len, + + check_kernel_dump (&upper_mem_limit); + +- grub_dprintf ("ieee1275", "upper_mem_limit is at %llx (%lld MiB)\n", +- upper_mem_limit, upper_mem_limit >> 20); +- + /* + * we order these cases to prefer higher addresses and avoid some + * splitting issues diff -Nru grub2-unsigned-2.12/debian/patches/Revert-kern-ieee1275-init-ppc64-Fix-a-comment.patch grub2-unsigned-2.12/debian/patches/Revert-kern-ieee1275-init-ppc64-Fix-a-comment.patch --- grub2-unsigned-2.12/debian/patches/Revert-kern-ieee1275-init-ppc64-Fix-a-comment.patch 1970-01-01 00:00:00.000000000 +0000 +++ grub2-unsigned-2.12/debian/patches/Revert-kern-ieee1275-init-ppc64-Fix-a-comment.patch 2024-04-04 10:03:45.000000000 +0000 @@ -0,0 +1,22 @@ +From: Mate Kukri +Date: Tue, 13 Feb 2024 16:23:04 +0000 +Subject: Revert "kern/ieee1275/init/ppc64: Fix a comment" + +This reverts commit 5f8e091b6a668f89de4f40b15b0712bafa053cbe. +--- + grub-core/kern/ieee1275/init.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c +index dc78357..db2aff6 100644 +--- a/grub-core/kern/ieee1275/init.c ++++ b/grub-core/kern/ieee1275/init.c +@@ -485,7 +485,7 @@ grub_regions_claim (grub_uint64_t addr, grub_uint64_t len, + /* We must not exceed the upper_mem_limit (assuming it's >= RMO_ADDR_MAX) */ + if (addr + len > upper_mem_limit) + { +- /* Take the bigger chunk from either below linux_rmo_save or above RMO_ADDR_MAX. */ ++ /* take the bigger chunk from either below linux_rmo_save or above upper_mem_limit */ + len = upper_mem_limit - addr; + if (orig_addr < linux_rmo_save && linux_rmo_save - orig_addr > len) + { diff -Nru grub2-unsigned-2.12/debian/patches/Revert-kern-ieee1275-init-ppc64-Introduce-a-request-for-r.patch grub2-unsigned-2.12/debian/patches/Revert-kern-ieee1275-init-ppc64-Introduce-a-request-for-r.patch --- grub2-unsigned-2.12/debian/patches/Revert-kern-ieee1275-init-ppc64-Introduce-a-request-for-r.patch 1970-01-01 00:00:00.000000000 +0000 +++ grub2-unsigned-2.12/debian/patches/Revert-kern-ieee1275-init-ppc64-Introduce-a-request-for-r.patch 2024-04-04 10:03:45.000000000 +0000 @@ -0,0 +1,164 @@ +From: Mate Kukri +Date: Tue, 13 Feb 2024 16:23:09 +0000 +Subject: Revert "kern/ieee1275/init/ppc64: Introduce a request for + regions_claim()" + +This reverts commit 0bb59fa9a3190e785be683bf1081287a78273544. +--- + grub-core/Makefile.am | 2 -- + grub-core/kern/ieee1275/init.c | 43 ++++++++++-------------------------------- + include/grub/ieee1275/alloc.h | 31 ------------------------------ + 3 files changed, 10 insertions(+), 66 deletions(-) + delete mode 100644 include/grub/ieee1275/alloc.h + +diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am +index f9d4aa2..4a14cc0 100644 +--- a/grub-core/Makefile.am ++++ b/grub-core/Makefile.am +@@ -155,7 +155,6 @@ endif + if COND_i386_ieee1275 + KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/ieee1275/ieee1275.h +-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/ieee1275/alloc.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/terminfo.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/extcmd.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/lib/arg.h +@@ -243,7 +242,6 @@ endif + + if COND_powerpc_ieee1275 + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/ieee1275/ieee1275.h +-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/ieee1275/alloc.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/terminfo.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/extcmd.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/lib/arg.h +diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c +index e995fbf..5a83ab5 100644 +--- a/grub-core/kern/ieee1275/init.c ++++ b/grub-core/kern/ieee1275/init.c +@@ -46,9 +46,6 @@ + #ifdef __sparc__ + #include + #endif +-#if defined(__powerpc__) || defined(__i386__) +-#include +-#endif + + /* The maximum heap size we're going to claim at boot. Not used by sparc. */ + #ifdef __i386__ +@@ -333,9 +330,9 @@ count_free (grub_uint64_t addr, grub_uint64_t len, grub_memory_type_t type, + + static int + regions_claim (grub_uint64_t addr, grub_uint64_t len, grub_memory_type_t type, +- void *data) ++ unsigned int flags, void *data) + { +- struct regions_claim_request *rcr = data; ++ grub_uint32_t total = *(grub_uint32_t *) data; + grub_uint64_t linux_rmo_save; + + if (type != GRUB_MEMORY_AVAILABLE) +@@ -515,11 +512,11 @@ regions_claim (grub_uint64_t addr, grub_uint64_t len, grub_memory_type_t type, + } + } + } +- if (rcr->flags & GRUB_MM_ADD_REGION_CONSECUTIVE && len < rcr->total) ++ if (flags & GRUB_MM_ADD_REGION_CONSECUTIVE && len < total) + return 0; + +- if (len > rcr->total) +- len = rcr->total; ++ if (len > total) ++ len = total; + + if (len) + { +@@ -529,12 +526,12 @@ regions_claim (grub_uint64_t addr, grub_uint64_t len, grub_memory_type_t type, + if (err) + return err; + grub_mm_init_region ((void *) (grub_addr_t) addr, len); +- rcr->total -= len; ++ total -= len; + } + +- *(grub_uint32_t *) data = rcr->total; ++ *(grub_uint32_t *) data = total; + +- if (rcr->total == 0) ++ if (total == 0) + return 1; + + return 0; +@@ -544,34 +541,14 @@ static int + heap_init (grub_uint64_t addr, grub_uint64_t len, grub_memory_type_t type, + void *data) + { +- struct regions_claim_request rcr = { +- .flags = GRUB_MM_ADD_REGION_NONE, +- .total = *(grub_uint32_t *) data, +- }; +- int ret; +- +- ret = regions_claim (addr, len, type, &rcr); +- +- *(grub_uint32_t *) data = rcr.total; +- +- return ret; ++ return regions_claim (addr, len, type, GRUB_MM_ADD_REGION_NONE, data); + } + + static int + region_claim (grub_uint64_t addr, grub_uint64_t len, grub_memory_type_t type, + void *data) + { +- struct regions_claim_request rcr = { +- .flags = GRUB_MM_ADD_REGION_CONSECUTIVE, +- .total = *(grub_uint32_t *) data, +- }; +- int ret; +- +- ret = regions_claim (addr, len, type, &rcr); +- +- *(grub_uint32_t *) data = rcr.total; +- +- return ret; ++ return regions_claim (addr, len, type, GRUB_MM_ADD_REGION_CONSECUTIVE, data); + } + + static grub_err_t +diff --git a/include/grub/ieee1275/alloc.h b/include/grub/ieee1275/alloc.h +deleted file mode 100644 +index 12fade5..0000000 +--- a/include/grub/ieee1275/alloc.h ++++ /dev/null +@@ -1,31 +0,0 @@ +-/* alloc.h - Memory allocation for PowerVM, KVM on Power, and i386 */ +-/* +- * GRUB -- GRand Unified Bootloader +- * Copyright (C) 2023 Free Software Foundation, Inc. +- * Copyright (C) 2023 IBM Corporation +- * +- * GRUB is free software: you can redistribute it and/or modify +- * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation, either version 3 of the License, or +- * (at your option) any later version. +- * +- * GRUB is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details. +- * +- * You should have received a copy of the GNU General Public License +- * along with GRUB. If not, see . +- */ +- +-#ifndef GRUB_IEEE1275_ALLOC_HEADER +-#define GRUB_IEEE1275_ALLOC_HEADER 1 +- +-#include +- +-struct regions_claim_request { +- unsigned int flags; /* GRUB_MM_ADD_REGION_(NONE|CONSECUTIVE) */ +- grub_uint32_t total; /* number of requested bytes */ +-}; +- +-#endif /* GRUB_IEEE1275_ALLOC_HEADER */ diff -Nru grub2-unsigned-2.12/debian/patches/Revert-kern-ieee1275-init-ppc64-Rename-regions_claim-to-g.patch grub2-unsigned-2.12/debian/patches/Revert-kern-ieee1275-init-ppc64-Rename-regions_claim-to-g.patch --- grub2-unsigned-2.12/debian/patches/Revert-kern-ieee1275-init-ppc64-Rename-regions_claim-to-g.patch 1970-01-01 00:00:00.000000000 +0000 +++ grub2-unsigned-2.12/debian/patches/Revert-kern-ieee1275-init-ppc64-Rename-regions_claim-to-g.patch 2024-04-04 10:03:45.000000000 +0000 @@ -0,0 +1,58 @@ +From: Mate Kukri +Date: Tue, 13 Feb 2024 16:23:07 +0000 +Subject: Revert "kern/ieee1275/init/ppc64: Rename regions_claim() to + grub_regions_claim()" + +This reverts commit 679691a13ef583a0342888c1fcca99f663a71c68. +--- + grub-core/kern/ieee1275/init.c | 10 +++++----- + include/grub/ieee1275/alloc.h | 3 --- + 2 files changed, 5 insertions(+), 8 deletions(-) + +diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c +index db2aff6..019532a 100644 +--- a/grub-core/kern/ieee1275/init.c ++++ b/grub-core/kern/ieee1275/init.c +@@ -331,9 +331,9 @@ count_free (grub_uint64_t addr, grub_uint64_t len, grub_memory_type_t type, + return 0; + } + +-int +-grub_regions_claim (grub_uint64_t addr, grub_uint64_t len, +- grub_memory_type_t type, void *data) ++static int ++regions_claim (grub_uint64_t addr, grub_uint64_t len, grub_memory_type_t type, ++ void *data) + { + struct regions_claim_request *rcr = data; + grub_uint64_t linux_rmo_save; +@@ -568,7 +568,7 @@ heap_init (grub_uint64_t addr, grub_uint64_t len, grub_memory_type_t type, + }; + int ret; + +- ret = grub_regions_claim (addr, len, type, &rcr); ++ ret = regions_claim (addr, len, type, &rcr); + + *(grub_uint32_t *) data = rcr.total; + +@@ -586,7 +586,7 @@ region_claim (grub_uint64_t addr, grub_uint64_t len, grub_memory_type_t type, + }; + int ret; + +- ret = grub_regions_claim (addr, len, type, &rcr); ++ ret = regions_claim (addr, len, type, &rcr); + + *(grub_uint32_t *) data = rcr.total; + +diff --git a/include/grub/ieee1275/alloc.h b/include/grub/ieee1275/alloc.h +index 67a7856..e314c98 100644 +--- a/include/grub/ieee1275/alloc.h ++++ b/include/grub/ieee1275/alloc.h +@@ -33,7 +33,4 @@ struct regions_claim_request { + grub_size_t align; /* alignment restrictions */ + }; + +-int EXPORT_FUNC(grub_regions_claim) (grub_uint64_t addr, grub_uint64_t len, +- grub_memory_type_t type, void *data); +- + #endif /* GRUB_IEEE1275_ALLOC_HEADER */ diff -Nru grub2-unsigned-2.12/debian/patches/Revert-kern-ieee1275-init-ppc64-Return-allocated-address-.patch grub2-unsigned-2.12/debian/patches/Revert-kern-ieee1275-init-ppc64-Return-allocated-address-.patch --- grub2-unsigned-2.12/debian/patches/Revert-kern-ieee1275-init-ppc64-Return-allocated-address-.patch 1970-01-01 00:00:00.000000000 +0000 +++ grub2-unsigned-2.12/debian/patches/Revert-kern-ieee1275-init-ppc64-Return-allocated-address-.patch 2024-04-04 10:03:45.000000000 +0000 @@ -0,0 +1,36 @@ +From: Mate Kukri +Date: Tue, 13 Feb 2024 16:23:08 +0000 +Subject: Revert "kern/ieee1275/init/ppc64: Return allocated address using + context" + +This reverts commit fe5d5e85711e765199853739e7e787621804778b. +--- + grub-core/kern/ieee1275/init.c | 2 -- + include/grub/ieee1275/alloc.h | 1 - + 2 files changed, 3 deletions(-) + +diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c +index 2d1b0f1..389a75d 100644 +--- a/grub-core/kern/ieee1275/init.c ++++ b/grub-core/kern/ieee1275/init.c +@@ -531,8 +531,6 @@ regions_claim (grub_uint64_t addr, grub_uint64_t len, grub_memory_type_t type, + if (rcr->init_region) + grub_mm_init_region ((void *) (grub_addr_t) addr, len); + rcr->total -= len; +- +- rcr->addr = addr; + } + + *(grub_uint32_t *) data = rcr->total; +diff --git a/include/grub/ieee1275/alloc.h b/include/grub/ieee1275/alloc.h +index f3065ff..523f51f 100644 +--- a/include/grub/ieee1275/alloc.h ++++ b/include/grub/ieee1275/alloc.h +@@ -29,7 +29,6 @@ struct regions_claim_request { + unsigned int flags; /* GRUB_MM_ADD_REGION_(NONE|CONSECUTIVE) */ + grub_uint32_t total; /* number of requested bytes */ + bool init_region; /* whether to add memory to the heap using grub_mm_init_region() */ +- grub_uint64_t addr; /* result address */ + }; + + #endif /* GRUB_IEEE1275_ALLOC_HEADER */ diff -Nru grub2-unsigned-2.12/debian/patches/Revert-loader-powerpc-ieee1275-Use-new-allocation-functio.patch grub2-unsigned-2.12/debian/patches/Revert-loader-powerpc-ieee1275-Use-new-allocation-functio.patch --- grub2-unsigned-2.12/debian/patches/Revert-loader-powerpc-ieee1275-Use-new-allocation-functio.patch 1970-01-01 00:00:00.000000000 +0000 +++ grub2-unsigned-2.12/debian/patches/Revert-loader-powerpc-ieee1275-Use-new-allocation-functio.patch 2024-04-04 10:03:45.000000000 +0000 @@ -0,0 +1,99 @@ +From: Mate Kukri +Date: Tue, 13 Feb 2024 16:23:06 +0000 +Subject: Revert "loader/powerpc/ieee1275: Use new allocation function for + kernel and initrd" + +This reverts commit 0ac3d938a318231b0302df3e955efe0bf5053717. +--- + grub-core/loader/powerpc/ieee1275/linux.c | 55 +++++-------------------------- + 1 file changed, 9 insertions(+), 46 deletions(-) + +diff --git a/grub-core/loader/powerpc/ieee1275/linux.c b/grub-core/loader/powerpc/ieee1275/linux.c +index 4864e5f..e6d0715 100644 +--- a/grub-core/loader/powerpc/ieee1275/linux.c ++++ b/grub-core/loader/powerpc/ieee1275/linux.c +@@ -30,7 +30,6 @@ + #include + #include + #include +-#include + + GRUB_MOD_LICENSE ("GPLv3+"); + +@@ -117,22 +116,6 @@ grub_linux_claimmap_iterate (grub_addr_t target, grub_size_t size, + return ctx.found_addr; + } + +-static grub_addr_t +-grub_linux_claimmap_iterate_restricted (grub_size_t size, grub_size_t align) +-{ +- struct regions_claim_request rcr = { +- .flags = GRUB_MM_ADD_REGION_CONSECUTIVE, +- .total = size, +- .init_region = false, +- .addr = (grub_uint64_t) -1, +- .align = align, +- }; +- +- grub_machine_mmap_iterate (grub_regions_claim, &rcr); +- +- return rcr.addr; +-} +- + static grub_err_t + grub_linux_boot (void) + { +@@ -244,18 +227,10 @@ grub_linux_load64 (grub_elf_t elf, const char *filename) + offset = entry - base_addr; + /* Linux's incorrectly contains a virtual address. */ + +- if (grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_POWER_VM) || +- grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_POWER_KVM)) +- { +- seg_addr = grub_linux_claimmap_iterate_restricted (linux_size, align); +- } +- else +- { +- /* On some systems, firmware occupies the memory we're trying to use. +- * Happily, Linux can be loaded anywhere (it relocates itself). Iterate +- * until we find an open area. */ +- seg_addr = grub_linux_claimmap_iterate (base_addr & ~ELF64_LOADMASK, linux_size, align); +- } ++ /* On some systems, firmware occupies the memory we're trying to use. ++ * Happily, Linux can be loaded anywhere (it relocates itself). Iterate ++ * until we find an open area. */ ++ seg_addr = grub_linux_claimmap_iterate (base_addr & ~ELF64_LOADMASK, linux_size, align); + if (seg_addr == (grub_addr_t) -1) + return grub_error (GRUB_ERR_OUT_OF_MEMORY, "couldn't claim memory"); + +@@ -364,25 +339,13 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), + + size = grub_get_initrd_size (&initrd_ctx); + ++ first_addr = linux_addr + linux_size; + +- if (grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_POWER_VM) || +- grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_POWER_KVM)) +- { +- addr = grub_linux_claimmap_iterate_restricted (size, 0x100000); +- } +- else +- { +- /* Attempt to claim at a series of addresses until successful in +- the same way that grub_rescue_cmd_linux does. */ +- first_addr = linux_addr + linux_size; +- addr = grub_linux_claimmap_iterate (first_addr, size, 0x100000); +- } +- ++ /* Attempt to claim at a series of addresses until successful in ++ the same way that grub_rescue_cmd_linux does. */ ++ addr = grub_linux_claimmap_iterate (first_addr, size, 0x100000); + if (addr == (grub_addr_t) -1) +- { +- grub_error (GRUB_ERR_OUT_OF_MEMORY, "out of memory"); +- goto fail; +- } ++ goto fail; + + grub_dprintf ("loader", "Loading initrd at 0x%x, size 0x%x\n", addr, size); + diff -Nru grub2-unsigned-2.12/debian/patches/grub-install-efi-title.patch grub2-unsigned-2.12/debian/patches/grub-install-efi-title.patch --- grub2-unsigned-2.12/debian/patches/grub-install-efi-title.patch 1970-01-01 00:00:00.000000000 +0000 +++ grub2-unsigned-2.12/debian/patches/grub-install-efi-title.patch 2024-04-04 10:03:45.000000000 +0000 @@ -0,0 +1,165 @@ +From: Mate Kukri +Date: Wed, 21 Feb 2024 15:42:32 +0000 +Subject: grub-install: Use `GRUB_DISTRIBUTOR` value as EFI boot option title + +- Allow entries to be called things like "Ubuntu". +- If there is no `GRUB_DISTRIBUTOR` assume it is "GRUB". +- When searching for a variable to re-use, allow matching against both + the old "efi_distributor" value and the new "efi_title" one. +- Dynamically generate `BOOT{ARCH}.CSV` with the option title +--- + grub-core/osdep/unix/efivar.c | 6 +++--- + grub-core/osdep/unix/platform.c | 6 ++++-- + include/grub/util/install.h | 6 ++++-- + util/grub-install.c | 31 +++++++++++++++++++++++-------- + 4 files changed, 34 insertions(+), 15 deletions(-) + +diff --git a/grub-core/osdep/unix/efivar.c b/grub-core/osdep/unix/efivar.c +index 19b6550..906f8ea 100644 +--- a/grub-core/osdep/unix/efivar.c ++++ b/grub-core/osdep/unix/efivar.c +@@ -540,7 +540,7 @@ devices_equal (const_efidp a, const_efidp b) + int + grub_install_efivar_register_efi (grub_device_t efidir_grub_dev, + const char *efidir, const char *efifile_path, +- const char *efi_distributor) ++ const char *efi_distributor, const char *efi_title) + { + const char *efidir_disk; + int efidir_part; +@@ -619,7 +619,7 @@ grub_install_efivar_register_efi (grub_device_t efidir_grub_dev, + if (entry->num < 0) + continue; + label = (const char *) efi_loadopt_desc (load_option, entry->data_size); +- if (strcasecmp (label, efi_distributor) != 0) ++ if (strcasecmp (label, efi_title) != 0 && strcasecmp (label, efi_distributor) != 0) + continue; + + path = efi_loadopt_path (load_option, entry->data_size); +@@ -671,7 +671,7 @@ grub_install_efivar_register_efi (grub_device_t efidir_grub_dev, + if (entry_num == -1) + entry_num = find_free_boot_num (entries); + entry = make_boot_variable (entry_num, efidir_disk, efidir_part, +- efifile_path, efi_distributor); ++ efifile_path, efi_title); + if (!entry) + goto err; + +diff --git a/grub-core/osdep/unix/platform.c b/grub-core/osdep/unix/platform.c +index 947cb7c..6ac822e 100644 +--- a/grub-core/osdep/unix/platform.c ++++ b/grub-core/osdep/unix/platform.c +@@ -78,11 +78,13 @@ get_ofpathname (const char *dev) + int + grub_install_register_efi (grub_device_t efidir_grub_dev, const char *efidir, + const char *efifile_path, +- const char *efi_distributor) ++ const char *efi_distributor, ++ const char *efi_title) + { + #ifdef HAVE_EFIVAR + return grub_install_efivar_register_efi (efidir_grub_dev, efidir, +- efifile_path, efi_distributor); ++ efifile_path, efi_distributor, ++ efi_title); + #else + grub_util_error ("%s", + _("GRUB was not built with efivar support; " +diff --git a/include/grub/util/install.h b/include/grub/util/install.h +index 92ff0bf..b865dd8 100644 +--- a/include/grub/util/install.h ++++ b/include/grub/util/install.h +@@ -230,11 +230,13 @@ grub_install_get_default_powerpc_machtype (void); + int grub_install_efivar_register_efi (grub_device_t efidir_grub_dev, + const char *efidir, + const char *efifile_path, +- const char *efi_distributor); ++ const char *efi_distributor, ++ const char *efi_title); + + int grub_install_register_efi (grub_device_t efidir_grub_dev, + const char *efidir, const char *efifile_path, +- const char *efi_distributor); ++ const char *efi_distributor, ++ const char *efi_title); + + void + grub_install_register_ieee1275 (int is_prep, const char *install_device, +diff --git a/util/grub-install.c b/util/grub-install.c +index 03fb195..fb92bef 100644 +--- a/util/grub-install.c ++++ b/util/grub-install.c +@@ -986,7 +986,7 @@ int + main (int argc, char *argv[]) + { + int is_efi = 0; +- const char *efi_distributor = NULL; ++ const char *efi_distributor = NULL, *efi_title = NULL; + const char *efi_suffix = NULL, *efi_suffix_upper = NULL; + char *efi_file = NULL; + char **grub_devices; +@@ -1290,6 +1290,13 @@ main (int argc, char *argv[]) + efi_distributor = "ubuntu"; + else if (strcmp (efi_distributor, "devuan") == 0) + efi_distributor = "debian"; ++ efi_title = config.grub_distributor; ++ if (!efi_title || efi_title[0] == '\0') ++ efi_title = "GRUB"; ++ else if (strcasecmp (efi_title, "kubuntu") == 0) ++ efi_title = "Ubuntu"; ++ else if (strcasecmp (efi_title, "devuan") == 0) ++ efi_title = "Debian"; + switch (platform) + { + case GRUB_INSTALL_PLATFORM_I386_EFI: +@@ -2153,7 +2160,7 @@ main (int argc, char *argv[]) + int ret; + ret = grub_install_register_efi ( + efidir_grub_dev, efidir, "\\System\\Library\\CoreServices", +- efi_distributor); ++ efi_distributor, efi_title); + if (ret) + grub_util_error (_("failed to register the EFI boot entry: %s"), + strerror (ret)); +@@ -2188,7 +2195,10 @@ main (int argc, char *argv[]) + if (grub_util_is_regular (shim_signed)) + { + char *chained_base, *chained_dst; +- char *mok_src, *mok_dst, *bootcsv_src, *bootcsv_dst; ++ char *mok_src, *mok_dst, *bootcsv_dst, *bootcsv_utf8; ++ grub_ssize_t bootcsv_utf16_len; ++ grub_uint16_t *bootcsv_utf16; ++ FILE *bootcsv_dst_f; + + /* Install grub as our chained bootloader */ + chained_base = xasprintf ("grub%s.efi", efi_suffix); +@@ -2222,11 +2232,15 @@ main (int argc, char *argv[]) + free (mok_dst); + + /* Also try to install boot.csv for fallback */ +- bootcsv_src = grub_util_path_concat (2, "/usr/lib/shim/", +- bootcsv); + bootcsv_dst = grub_util_path_concat (2, efidir, bootcsv); +- grub_install_copy_file (bootcsv_src, bootcsv_dst, 0); +- free (bootcsv_src); ++ bootcsv_utf8 = xasprintf("shim%s.efi,%s,,This is the boot entry for %s\n", ++ efi_suffix, efi_title, efi_title); ++ bootcsv_utf16_len = grub_utf8_to_utf16_alloc (bootcsv_utf8, &bootcsv_utf16, NULL); ++ bootcsv_dst_f = grub_util_fopen (bootcsv_dst, "wb"); ++ fwrite (bootcsv_utf16, bootcsv_utf16_len, sizeof *bootcsv_utf16, bootcsv_dst_f); ++ fclose (bootcsv_dst_f); ++ free (bootcsv_utf16); ++ free (bootcsv_utf8); + free (bootcsv_dst); + } + else +@@ -2274,7 +2288,8 @@ main (int argc, char *argv[]) + (part ? ",": ""), (part ? : "")); + grub_free (part); + ret = grub_install_register_efi (efidir_grub_dev, efidir, +- efifile_path, efi_distributor); ++ efifile_path, efi_distributor, ++ efi_title); + if (ret) + grub_util_error (_("failed to register the EFI boot entry: %s"), + strerror (ret)); diff -Nru grub2-unsigned-2.12/debian/patches/grub-sort-version.patch grub2-unsigned-2.12/debian/patches/grub-sort-version.patch --- grub2-unsigned-2.12/debian/patches/grub-sort-version.patch 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/patches/grub-sort-version.patch 2024-04-04 10:11:57.000000000 +0000 @@ -6,9 +6,24 @@ the easiest way to hook this in, although you might be able to write this as an awk script or something. --- + util/grub-mkconfig.in | 3 ++- util/grub-mkconfig_lib.in | 15 +-------------- - 1 file changed, 1 insertion(+), 14 deletions(-) + 2 files changed, 3 insertions(+), 15 deletions(-) +diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in +index 46b036b..0b1adf5 100644 +--- a/util/grub-mkconfig.in ++++ b/util/grub-mkconfig.in +@@ -270,7 +270,8 @@ export GRUB_DEFAULT \ + GRUB_RECORDFAIL_TIMEOUT \ + GRUB_RECOVERY_TITLE \ + GRUB_FORCE_PARTUUID \ +- GRUB_DISABLE_INITRD ++ GRUB_DISABLE_INITRD \ ++ GRUB_FLAVOUR_ORDER + + if test "x${grub_cfg}" != "x"; then + rm -f "${grub_cfg}.new" diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in index 121df9a..cabac83 100644 --- a/util/grub-mkconfig_lib.in diff -Nru grub2-unsigned-2.12/debian/patches/revert-term-ns8250-spcr.patch grub2-unsigned-2.12/debian/patches/revert-term-ns8250-spcr.patch --- grub2-unsigned-2.12/debian/patches/revert-term-ns8250-spcr.patch 1970-01-01 00:00:00.000000000 +0000 +++ grub2-unsigned-2.12/debian/patches/revert-term-ns8250-spcr.patch 2024-03-28 12:46:26.000000000 +0000 @@ -0,0 +1,195 @@ +From: Mate Kukri +Date: Wed, 7 Feb 2024 08:29:34 +0000 +Subject: Revert "term/ns8250: Use ACPI SPCR table when available to configure + serial" + +This reverts commit 7b192ec4cd7c4b3207db010202349dd283e72041. +--- + docs/grub.texi | 9 ----- + grub-core/Makefile.core.def | 1 - + grub-core/term/ns8250-spcr.c | 90 -------------------------------------------- + grub-core/term/serial.c | 15 +------- + include/grub/serial.h | 1 - + 5 files changed, 1 insertion(+), 115 deletions(-) + delete mode 100644 grub-core/term/ns8250-spcr.c + +diff --git a/docs/grub.texi b/docs/grub.texi +index b4825b7..990d8c7 100644 +--- a/docs/grub.texi ++++ b/docs/grub.texi +@@ -2730,10 +2730,6 @@ speed 9600bps. The serial unit 0 is usually called @samp{COM1}, so, if + you want to use COM2, you must specify @samp{--unit=1} instead. This + command accepts many other options, @pxref{serial} for more details. + +-Without argument or with @samp{--port=auto}, GRUB will attempt to use +-ACPI when available to auto-detect the default serial port and its +-configuration. +- + The commands @command{terminal_input} (@pxref{terminal_input}) and + @command{terminal_output} (@pxref{terminal_output}) choose which type of + terminal you want to use. In the case above, the terminal will be a +@@ -4257,11 +4253,6 @@ be in the range 5-8 and stop bits must be 1 or 2. Default is 8 data + bits and one stop bit. @var{parity} is one of @samp{no}, @samp{odd}, + @samp{even} and defaults to @samp{no}. + +-If passed no @var{unit} nor @var{port}, or if @var{port} is set to +-@samp{auto} then GRUB will attempt to use ACPI to automatically detect +-the system default serial port and its configuration. If this information +-is not available, it will default to @var{unit} 0. +- + The serial port is not used as a communication channel unless the + @command{terminal_input} or @command{terminal_output} command is used + (@pxref{terminal_input}, @pxref{terminal_output}). +diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def +index c3ad031..7b49f77 100644 +--- a/grub-core/Makefile.core.def ++++ b/grub-core/Makefile.core.def +@@ -2105,7 +2105,6 @@ module = { + name = serial; + common = term/serial.c; + x86 = term/ns8250.c; +- x86 = term/ns8250-spcr.c; + ieee1275 = term/ieee1275/serial.c; + mips_arc = term/arc/serial.c; + efi = term/efi/serial.c; +diff --git a/grub-core/term/ns8250-spcr.c b/grub-core/term/ns8250-spcr.c +deleted file mode 100644 +index d52b52c..0000000 +--- a/grub-core/term/ns8250-spcr.c ++++ /dev/null +@@ -1,90 +0,0 @@ +-/* +- * GRUB -- GRand Unified Bootloader +- * Copyright (C) 2022 Free Software Foundation, Inc. +- * +- * GRUB is free software: you can redistribute it and/or modify +- * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation, either version 3 of the License, or +- * (at your option) any later version. +- * +- * GRUB is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details. +- * +- * You should have received a copy of the GNU General Public License +- * along with GRUB. If not, see . +- */ +- +-#if !defined(GRUB_MACHINE_IEEE1275) && !defined(GRUB_MACHINE_QEMU) +- +-#include +-#include +-#include +-#include +-#include +-#include +- +-struct grub_serial_port * +-grub_ns8250_spcr_init (void) +-{ +- struct grub_acpi_spcr *spcr; +- struct grub_serial_config config; +- +- spcr = grub_acpi_find_table (GRUB_ACPI_SPCR_SIGNATURE); +- if (spcr == NULL) +- return NULL; +- if (spcr->hdr.revision < 2) +- grub_dprintf ("serial", "SPCR table revision %d < 2, continuing anyway\n", +- (int) spcr->hdr.revision); +- if (spcr->intf_type != GRUB_ACPI_SPCR_INTF_TYPE_16550 && +- spcr->intf_type != GRUB_ACPI_SPCR_INTF_TYPE_16550X) +- return NULL; +- /* For now, we only support byte accesses. */ +- if (spcr->base_addr.access_size != GRUB_ACPI_GENADDR_SIZE_BYTE && +- spcr->base_addr.access_size != GRUB_ACPI_GENADDR_SIZE_LGCY) +- return NULL; +- config.word_len = 8; +- config.parity = GRUB_SERIAL_PARITY_NONE; +- config.stop_bits = GRUB_SERIAL_STOP_BITS_1; +- config.base_clock = UART_DEFAULT_BASE_CLOCK; +- if (spcr->flow_control & GRUB_ACPI_SPCR_FC_RTSCTS) +- config.rtscts = 1; +- else +- config.rtscts = 0; +- switch (spcr->baud_rate) +- { +- case GRUB_ACPI_SPCR_BAUD_9600: +- config.speed = 9600; +- break; +- case GRUB_ACPI_SPCR_BAUD_19200: +- config.speed = 19200; +- break; +- case GRUB_ACPI_SPCR_BAUD_57600: +- config.speed = 57600; +- break; +- case GRUB_ACPI_SPCR_BAUD_115200: +- config.speed = 115200; +- break; +- case GRUB_ACPI_SPCR_BAUD_CURRENT: +- default: +- /* +- * We don't (yet) have a way to read the currently +- * configured speed in HW, so let's use a sane default. +- */ +- config.speed = 115200; +- break; +- }; +- switch (spcr->base_addr.space_id) +- { +- case GRUB_ACPI_GENADDR_MEM_SPACE: +- return grub_serial_ns8250_add_mmio (spcr->base_addr.addr, +- spcr->base_addr.access_size, &config); +- case GRUB_ACPI_GENADDR_IO_SPACE: +- return grub_serial_ns8250_add_port (spcr->base_addr.addr, &config); +- default: +- return NULL; +- }; +-} +- +-#endif +diff --git a/grub-core/term/serial.c b/grub-core/term/serial.c +index 8260dcb..c49c2e8 100644 +--- a/grub-core/term/serial.c ++++ b/grub-core/term/serial.c +@@ -209,19 +209,6 @@ grub_serial_find (const char *name) + if (port != NULL) + return port; + } +- +-#if (defined(__i386__) || defined(__x86_64__)) && !defined(GRUB_MACHINE_IEEE1275) && !defined(GRUB_MACHINE_QEMU) +- if (grub_strcmp (name, "auto") == 0) +- { +- /* Look for an SPCR if any. If not, default to com0. */ +- port = grub_ns8250_spcr_init (); +- if (port != NULL) +- return port; +- FOR_SERIAL_PORTS (port) +- if (grub_strcmp (port->name, "com0") == 0) +- return port; +- } +-#endif + #endif + + #ifdef GRUB_MACHINE_IEEE1275 +@@ -271,7 +258,7 @@ grub_cmd_serial (grub_extcmd_context_t ctxt, int argc, char **args) + name = args[0]; + + if (!name) +- name = "auto"; ++ name = "com0"; + + port = grub_serial_find (name); + if (!port) +diff --git a/include/grub/serial.h b/include/grub/serial.h +index d7e0635..2d930c9 100644 +--- a/include/grub/serial.h ++++ b/include/grub/serial.h +@@ -190,7 +190,6 @@ grub_serial_config_defaults (struct grub_serial_port *port) + + #if defined(__mips__) || defined (__i386__) || defined (__x86_64__) + void grub_ns8250_init (void); +-struct grub_serial_port *grub_ns8250_spcr_init (void); + struct grub_serial_port *grub_serial_ns8250_add_port (grub_port_t port, + struct grub_serial_config *config); + struct grub_serial_port *grub_serial_ns8250_add_mmio (grub_addr_t addr, diff -Nru grub2-unsigned-2.12/debian/patches/secure-boot/efi-use-peimage-shim.patch grub2-unsigned-2.12/debian/patches/secure-boot/efi-use-peimage-shim.patch --- grub2-unsigned-2.12/debian/patches/secure-boot/efi-use-peimage-shim.patch 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/patches/secure-boot/efi-use-peimage-shim.patch 2024-04-04 10:11:57.000000000 +0000 @@ -30,9 +30,9 @@ Signed-off-by: Julian Andres Klode --- grub-core/Makefile.core.def | 12 + - grub-core/loader/efi/peimage.c | 902 +++++++++++++++++++++++++++++++++++++++++ + grub-core/loader/efi/peimage.c | 824 +++++++++++++++++++++++++++++++++++++++++ include/grub/efi/peimage.h | 19 + - 3 files changed, 933 insertions(+) + 3 files changed, 855 insertions(+) create mode 100644 grub-core/loader/efi/peimage.c create mode 100644 include/grub/efi/peimage.h @@ -61,10 +61,10 @@ efi = loader/efi/fdt.c; diff --git a/grub-core/loader/efi/peimage.c b/grub-core/loader/efi/peimage.c new file mode 100644 -index 0000000..0387277 +index 0000000..d3a5e31 --- /dev/null +++ b/grub-core/loader/efi/peimage.c -@@ -0,0 +1,902 @@ +@@ -0,0 +1,824 @@ +/* peimage.c - load EFI PE binaries (for Secure Boot support) */ + +// SPDX-License-Identifier: GPL-3.0+ @@ -82,33 +82,39 @@ + +GRUB_MOD_LICENSE ("GPLv3+"); + -+ +static grub_dl_t my_mod; + +struct image_info +{ -+ grub_efi_loaded_image_t loaded_image; -+ -+ grub_efi_device_path_t *orig_file_path; -+ + void *data; + grub_efi_uint32_t data_size; ++ grub_efi_device_path_t *file_path; + grub_efi_uint16_t machine; + grub_efi_uint16_t num_sections; + struct grub_pe32_section_table *section; + struct grub_pe32_data_directory *reloc; + grub_uint64_t image_base; + grub_uint32_t section_alignment; ++ grub_uint32_t image_size; + grub_uint32_t header_size; + void *alloc_addr; + grub_uint32_t alloc_pages; -+ ++ void *image_addr; + grub_efi_status_t (__grub_efi_api *entry_point) ( -+ grub_efi_handle_t image_handle, grub_efi_system_table_t *system_table); ++ grub_efi_handle_t image_handle, grub_efi_system_table_t *system_table); ++}; + ++static struct ++{ + grub_jmp_buf jmp; ++ grub_efi_handle_t image_handle; + grub_efi_status_t exit_status; -+}; ++ grub_efi_status_t (__grub_efi_api *exit) (grub_efi_handle_t image_handle, ++ grub_efi_status_t exit_status, ++ grub_efi_uintn_t exit_data_size, ++ grub_efi_char16_t *exit_data); ++} started_image; ++ + +static grub_uint16_t machines[] = { +#if defined(__x86_64__) @@ -126,19 +132,6 @@ +#endif +}; + -+// Forward declare unload_image handler -+static grub_efi_status_t __grub_efi_api -+do_unload_image (grub_efi_handle_t image_handle); -+ -+// Original exit handler -+static grub_efi_status_t (__grub_efi_api *exit_orig) ( -+ grub_efi_handle_t image_handle, grub_efi_status_t exit_status, -+ grub_efi_uintn_t exit_data_size, grub_efi_char16_t *exit_data); -+ -+// Original unload_image handler -+static grub_efi_status_t (__grub_efi_api *unload_image_orig) ( -+ grub_efi_handle_t image_handle); -+ +/** + * check_machine_type() - check if the machine type matches the architecture + * @@ -221,7 +214,7 @@ + } + info->section_alignment = pe32_header->section_alignment; + info->image_base = pe32_header->image_base; -+ info->loaded_image.image_size = pe32_header->image_size; ++ info->image_size = pe32_header->image_size; + info->entry_point = (void *)(unsigned long)pe32_header->entry_addr; + info->header_size = pe32_header->header_size; + if (info->data_size < info->header_size) @@ -247,7 +240,7 @@ + } + info->section_alignment = pe64_header->section_alignment; + info->image_base = pe64_header->image_base; -+ info->loaded_image.image_size = pe64_header->image_size; ++ info->image_size = pe64_header->image_size; + info->entry_point = (void *)(unsigned long)pe64_header->entry_addr; + info->header_size = pe64_header->header_size; + if (info->data_size < info->header_size) @@ -306,8 +299,7 @@ + if (info->section_alignment > align_mask) + align_mask = info->section_alignment - 1; + -+ info->alloc_pages = GRUB_EFI_BYTES_TO_PAGES (info->loaded_image.image_size -+ + (align_mask & ~0xfffUL)); ++ info->alloc_pages = GRUB_EFI_BYTES_TO_PAGES (info->image_size + (align_mask & ~0xfffUL)); + + info->alloc_addr = grub_efi_allocate_pages_real ( + GRUB_EFI_MAX_USABLE_ADDRESS, info->alloc_pages, @@ -315,10 +307,10 @@ + if (!info->alloc_addr) + return GRUB_EFI_OUT_OF_RESOURCES; + -+ info->loaded_image.image_base ++ info->image_addr + = (void *)(((unsigned long)info->alloc_addr + align_mask) & ~align_mask); + -+ grub_memcpy (info->loaded_image.image_base, info->data, info->header_size); ++ grub_memcpy (info->image_addr, info->data, info->header_size); + for (section = &info->section[0]; + section < &info->section[info->num_sections]; ++section) + { @@ -334,25 +326,22 @@ + grub_error (GRUB_ERR_BAD_OS, "truncated image"); + return GRUB_EFI_LOAD_ERROR; + } -+ if (section->virtual_address + section->virtual_size -+ > info->loaded_image.image_size) ++ if (section->virtual_address + section->virtual_size > info->image_size) + { + grub_error (GRUB_ERR_BAD_OS, "section outside image"); + return GRUB_EFI_LOAD_ERROR; + } + -+ grub_memset ((void *)((unsigned long)info->loaded_image.image_base -+ + section->virtual_address), ++ grub_memset ((void *)((unsigned long)info->image_addr + section->virtual_address), + 0, section->virtual_size); + grub_memcpy ( -+ (void *)((unsigned long)info->loaded_image.image_base -+ + section->virtual_address), ++ (void *)((unsigned long)info->image_addr + section->virtual_address), + (void *)((unsigned long)info->data + section->raw_data_offset), + section->raw_data_size); + } + + info->entry_point = (void *)((unsigned long)info->entry_point -+ + (unsigned long)info->loaded_image.image_base); ++ + (unsigned long)info->image_addr); + + grub_dprintf ("linux", "sections loaded\n"); + @@ -560,7 +549,7 @@ + return GRUB_EFI_SUCCESS; + } + -+ if (info->reloc->rva + info->reloc->size > info->loaded_image.image_size) ++ if (info->reloc->rva + info->reloc->size > info->image_size) + { + grub_error (GRUB_ERR_BAD_OS, "relocation block outside image"); + return GRUB_EFI_LOAD_ERROR; @@ -570,10 +559,9 @@ + * The relocations are based on the difference between + * actual load address and the preferred base address. + */ -+ offset = (unsigned long)info->loaded_image.image_base - info->image_base; ++ offset = (unsigned long)info->image_addr - info->image_base; + -+ block = (void *)((unsigned long)info->loaded_image.image_base -+ + info->reloc->rva); ++ block = (void *)((unsigned long)info->image_addr + info->reloc->rva); + reloc_end = (void *)((unsigned long)block + info->reloc->size); + + for (; block < reloc_end; @@ -585,7 +573,7 @@ + + for (; reloc_entry < block_end; ++reloc_entry) + { -+ void *addr = (void *)((unsigned long)info->loaded_image.image_base ++ void *addr = (void *)((unsigned long)info->image_addr + + block->page_rva + (*reloc_entry & 0xfff)); + + reloc_type = *reloc_entry >> 12; @@ -687,254 +675,200 @@ +bad_reloc: + grub_error (GRUB_ERR_BAD_OS, "unsupported relocation type %d, rva 0x%08lx\n", + *reloc_entry >> 12, -+ (unsigned long)reloc_entry -+ - (unsigned long)info->loaded_image.image_base); ++ (unsigned long)reloc_entry - (unsigned long)info->image_addr); + return GRUB_EFI_LOAD_ERROR; +} + +/** -+ * exit_hook() - replacement for EFI_BOOT_SERVICES.Exit() ++ * efi_exit() - replacement for EFI_BOOT_SERVICES.Exit() + * + * This function is inserted into system table to trap invocations of + * EFI_BOOT_SERVICES.Exit(). If Exit() is called with our handle + * return to our start routine using a long jump. + * -+ * @image_handle: handle of the application as passed on entry -+ * @exit_status: the images exit code -+ * @exit_data_size: size of @exit_data -+ * @exit_data: null terminated string followed by optional data ++ * @image_handle: handle of the application as passed on entry ++ * @exit_status: the images exit code ++ * @exit_data_size: size of @exit_data ++ * @exit_data: null terminated string followed by optional data + */ +static grub_efi_status_t __grub_efi_api -+exit_hook (grub_efi_handle_t image_handle, grub_efi_status_t exit_status, -+ grub_efi_uintn_t exit_data_size, grub_efi_char16_t *exit_data) ++efi_exit (grub_efi_handle_t image_handle, grub_efi_status_t exit_status, ++ grub_efi_uintn_t exit_data_size, grub_efi_char16_t *exit_data) +{ -+ struct image_info *info; ++ grub_efi_system_table->boot_services->exit = started_image.exit; + + if (!image_handle) + return GRUB_EFI_INVALID_PARAMETER; + -+ info = grub_efi_open_protocol (image_handle, -+ &(grub_guid_t)GRUB_PEIMAGE_MARKER_GUID, -+ GRUB_EFI_OPEN_PROTOCOL_GET_PROTOCOL); -+ if (!info) ++ if (image_handle != started_image.image_handle) + { + grub_dprintf ("linux", "delegating Exit()\n"); -+ return exit_orig (image_handle, exit_status, exit_data_size, -+ (grub_efi_char16_t *)exit_data); ++ return started_image.exit (image_handle, exit_status, exit_data_size, ++ (grub_efi_char16_t *)exit_data); + } + -+ info->exit_status = exit_status; ++ started_image.exit_status = exit_status; + + if (exit_status != GRUB_EFI_SUCCESS) + { + grub_printf ("Application failed, r = %d\n", + (int)exit_status & 0x7fffffff); + if (exit_data_size && exit_data) -+ { ++ { + grub_printf ("exit message: "); + for (grub_efi_uintn_t pos = 0; + exit_data[pos] && pos < exit_data_size / 2; ++pos) + grub_printf ("%C", exit_data[pos]); + grub_printf ("\n"); -+ } ++ } + } + if (exit_data_size && exit_data) + { + /* exit data must be freed by the caller */ + grub_efi_system_table->boot_services->free_pool (exit_data); + } -+ grub_longjmp (info->jmp, 1); ++ grub_longjmp (started_image.jmp, 1); +} + ++static grub_efi_status_t __grub_efi_api ++do_unload_image (grub_efi_handle_t image_handle); ++ +/** -+ * unload_image_hook() - replacement for EFI_BOOT_SERVICES.UnloadImage() -+ * -+ * peimage only supports loading EFI Applications, which cannot be correctly -+ * unloaded while running. ++ * start_image() - our implementation of StartImage() + * -+ * Installing this hooks prevents that from happening. ++ * As we do not load the image via LoadImage() we need our own implementation ++ * of StartImage() to launch the PE-COFF image. + */ -+static grub_efi_status_t __grub_efi_api -+unload_image_hook (grub_efi_handle_t image_handle) ++static grub_efi_status_t ++start_image (struct image_info *info) +{ -+ if (grub_efi_open_protocol (image_handle, -+ &(grub_guid_t) GRUB_PEIMAGE_MARKER_GUID, -+ GRUB_EFI_OPEN_PROTOCOL_GET_PROTOCOL)) -+ return GRUB_EFI_UNSUPPORTED; ++ int ret; ++ grub_efi_status_t status; ++ grub_efi_loaded_image_t *loaded_image; ++ ++ /* ++ * NOTE: We cannot easily comply with the UEFI specification and provide the ++ * child its own handle, otherwise things can go horribly wrong if said custom ++ * handle is passed to the firmware by child images ++ */ ++ started_image.image_handle = grub_efi_image_handle; ++ ++ loaded_image = grub_efi_get_loaded_image (grub_efi_image_handle); ++ if (loaded_image) ++ { ++ loaded_image->image_base = info->image_addr; ++ loaded_image->image_size = info->image_size; ++ ++ // Pass just the file path portion to the loaded image ++ loaded_image->file_path = info->file_path; ++ while (loaded_image->file_path && ++ (loaded_image->file_path->type != GRUB_EFI_MEDIA_DEVICE_PATH_TYPE ++ || loaded_image->file_path->subtype != GRUB_EFI_FILE_PATH_DEVICE_PATH_SUBTYPE)) ++ loaded_image->file_path = GRUB_EFI_NEXT_DEVICE_PATH (loaded_image->file_path); ++ } ++ else ++ { ++ grub_dprintf ("linux", "Loaded image protocol missing\n"); ++ } ++ ++ ret = grub_setjmp (started_image.jmp); ++ if (ret) ++ { ++ do_unload_image(started_image.image_handle); ++ started_image.image_handle = NULL; ++ return started_image.exit_status; ++ } ++ ++ started_image.exit = grub_efi_system_table->boot_services->exit; ++ grub_efi_system_table->boot_services->exit = efi_exit; ++ ++ grub_dprintf ( ++ "linux", ++ "Executing image loaded at 0x%lx\nEntry point 0x%lx\nSize 0x%08x\n", ++ (unsigned long)info->image_addr, (unsigned long)info->entry_point, ++ info->image_size); + -+ return unload_image_orig(image_handle); ++ /* Invalidate the instruction cache */ ++ grub_arch_sync_caches (info->image_addr, info->image_size); ++ ++ status = info->entry_point (started_image.image_handle, grub_efi_system_table); ++ ++ grub_dprintf ("linux", "Application returned\n"); ++ ++ return efi_exit (started_image.image_handle, status, 0, NULL); +} + ++static struct image_info info; ++ ++/* TODO: move the creation of the load options here */ +static grub_efi_status_t __grub_efi_api +do_load_image (grub_efi_boolean_t boot_policy __attribute__ ((unused)), -+ grub_efi_handle_t parent_image_handle, -+ grub_efi_device_path_t *file_path, void *source_buffer, -+ grub_efi_uintn_t source_size, grub_efi_handle_t *image_handle) ++ grub_efi_handle_t parent_image_handle __attribute__ ((unused)), ++ grub_efi_device_path_t *file_path, ++ void *source_buffer, grub_efi_uintn_t source_size, ++ grub_efi_handle_t *image_handle) +{ -+ grub_efi_status_t status; -+ struct image_info *info; -+ -+ info = grub_efi_allocate_pages_real ( -+ GRUB_EFI_MAX_USABLE_ADDRESS, GRUB_EFI_BYTES_TO_PAGES (sizeof *info), -+ GRUB_EFI_ALLOCATE_MAX_ADDRESS, GRUB_EFI_LOADER_DATA); -+ if (!info) -+ return GRUB_EFI_OUT_OF_RESOURCES; -+ -+ grub_memset (info, 0, sizeof *info); ++ grub_efi_status_t ret = GRUB_EFI_SUCCESS; ++ if (info.data != NULL) ++ { ++ grub_error (GRUB_ERR_BAD_OS, "cannot load multiple images"); ++ return GRUB_EFI_LOAD_ERROR; ++ } + -+ info->data = source_buffer; -+ info->data_size = source_size; ++ grub_dl_ref (my_mod); + -+ // Save original device path -+ if (file_path) -+ info->orig_file_path = grub_efi_duplicate_device_path (file_path); -+ -+ // Split out file path -+ while (file_path -+ && (file_path->type != GRUB_EFI_MEDIA_DEVICE_PATH_TYPE -+ || file_path->subtype != GRUB_EFI_FILE_PATH_DEVICE_PATH_SUBTYPE)) -+ file_path = GRUB_EFI_NEXT_DEVICE_PATH (file_path); -+ if (file_path) -+ info->loaded_image.file_path = grub_efi_duplicate_device_path (file_path); -+ -+ // Process PE image -+ status = check_pe_header (info); -+ if (status != GRUB_EFI_SUCCESS) -+ goto err; ++ info = (struct image_info){ ++ .data = source_buffer, ++ .data_size = source_size, ++ .file_path = grub_efi_duplicate_device_path(file_path), ++ }; + -+ status = load_sections (info); -+ if (status != GRUB_EFI_SUCCESS) ++ ret = check_pe_header (&info); ++ if (ret != GRUB_EFI_SUCCESS) + goto err; + -+ status = relocate (info); -+ if (status != GRUB_EFI_SUCCESS) ++ ret = load_sections (&info); ++ if (ret != GRUB_EFI_SUCCESS) + goto err; + -+ // Setup EFI_LOADED_IMAGE_PROTOCOL -+ info->loaded_image.revision = GRUB_EFI_LOADED_IMAGE_REVISION; -+ info->loaded_image.parent_handle = parent_image_handle; -+ info->loaded_image.system_table = grub_efi_system_table; -+ info->loaded_image.image_code_type = GRUB_EFI_LOADER_CODE; -+ info->loaded_image.image_data_type = GRUB_EFI_LOADER_DATA; -+ -+ // Instruct EFI to create a new handle -+ *image_handle = NULL; -+ status -+ = grub_efi_system_table->boot_services -+ ->install_multiple_protocol_interfaces ( -+ image_handle, &(grub_guid_t)GRUB_PEIMAGE_MARKER_GUID, info, -+ &(grub_guid_t)GRUB_EFI_LOADED_IMAGE_GUID, &info->loaded_image, -+ &(grub_guid_t)GRUB_EFI_LOADED_IMAGE_DEVICE_PATH_PROTOCOL_GUID, -+ info->orig_file_path, NULL); -+ if (status != GRUB_EFI_SUCCESS) ++ ret = relocate (&info); ++ if (ret != GRUB_EFI_SUCCESS) + goto err; + -+ // Increment module refcount -+ grub_dl_ref (my_mod); -+ -+ return status; -+ ++ // We are hacking this up as we go along ++ *image_handle = grub_efi_image_handle; +err: -+ if (info->alloc_addr) -+ grub_efi_free_pages ((unsigned long)info->alloc_addr, info->alloc_pages); -+ if (info->loaded_image.file_path) -+ grub_free (info->loaded_image.file_path); -+ if (info->orig_file_path) -+ grub_free (info->orig_file_path); -+ grub_efi_free_pages ((unsigned long)info, -+ GRUB_EFI_BYTES_TO_PAGES (sizeof *info)); -+ return status; ++ return ret; +} + +static grub_efi_status_t __grub_efi_api -+do_start_image (grub_efi_handle_t image_handle, ++do_start_image (grub_efi_handle_t image_handle __attribute__ ((unused)), + grub_efi_uintn_t *exit_data_size __attribute__ ((unused)), + grub_efi_char16_t **exit_data __attribute__ ((unused))) +{ -+ grub_efi_status_t status; -+ struct image_info *info; -+ -+ info = grub_efi_open_protocol (image_handle, -+ &(grub_guid_t)GRUB_PEIMAGE_MARKER_GUID, -+ GRUB_EFI_OPEN_PROTOCOL_GET_PROTOCOL); -+ if (!info) ++ if (info.data == NULL) + { + grub_error (GRUB_ERR_BAD_OS, "image not loaded"); + return GRUB_EFI_LOAD_ERROR; + } -+ -+ if (grub_setjmp (info->jmp)) -+ { -+ status = info->exit_status; -+ do_unload_image (image_handle); -+ } -+ else -+ { -+ grub_dprintf ("linux", -+ "Executing image loaded at 0x%lx\n" -+ "Entry point 0x%lx\n" -+ "Size 0x%lx\n", -+ (unsigned long)info->loaded_image.image_base, -+ (unsigned long)info->entry_point, -+ (unsigned long)info->loaded_image.image_size); -+ -+ /* Invalidate the instruction cache */ -+ grub_arch_sync_caches (info->loaded_image.image_base, -+ info->loaded_image.image_size); -+ -+ status = info->entry_point (image_handle, grub_efi_system_table); -+ -+ grub_dprintf ("linux", "Application returned\n"); -+ -+ /* converge to the same exit path as if the image called -+ * boot_services->exit itself */ -+ exit_hook (image_handle, status, 0, NULL); -+ -+ /* image_handle is always valid above, thus exit_hook cannot -+ * return to here. if only GRUB had assert :( -+ grub_assert (false && "entered unreachable code"); -+ */ -+ } -+ -+ return status; ++ return start_image (&info); +} + +static grub_efi_status_t __grub_efi_api -+do_unload_image (grub_efi_handle_t image_handle) ++do_unload_image (grub_efi_handle_t image_handle __attribute__ ((unused))) +{ -+ grub_efi_status_t status; -+ struct image_info *info; -+ -+ info = grub_efi_open_protocol (image_handle, -+ &(grub_guid_t)GRUB_PEIMAGE_MARKER_GUID, -+ GRUB_EFI_OPEN_PROTOCOL_GET_PROTOCOL); -+ if (!info) ++ if (info.data == NULL) + { + grub_error (GRUB_ERR_BAD_OS, "image not loaded"); + return GRUB_EFI_LOAD_ERROR; + } -+ -+ status -+ = grub_efi_system_table->boot_services -+ ->uninstall_multiple_protocol_interfaces ( -+ image_handle, &(grub_guid_t)GRUB_PEIMAGE_MARKER_GUID, info, -+ &(grub_guid_t)GRUB_EFI_LOADED_IMAGE_GUID, &info->loaded_image, -+ &(grub_guid_t)GRUB_EFI_LOADED_IMAGE_DEVICE_PATH_PROTOCOL_GUID, -+ info->orig_file_path, NULL); -+ if (status != GRUB_EFI_SUCCESS) -+ return GRUB_EFI_LOAD_ERROR; -+ -+ if (info->alloc_addr) -+ grub_efi_free_pages ((unsigned long)info->alloc_addr, info->alloc_pages); -+ if (info->loaded_image.file_path) -+ grub_free (info->loaded_image.file_path); -+ if (info->orig_file_path) -+ grub_free (info->orig_file_path); -+ -+ grub_efi_free_pages ((unsigned long)info, -+ GRUB_EFI_BYTES_TO_PAGES (sizeof *info)); ++ if (info.alloc_addr) ++ grub_efi_free_pages ((unsigned long)info.alloc_addr, info.alloc_pages); ++ if (info.file_path) ++ grub_free(info.file_path); + + grub_dl_unref (my_mod); ++ info = (struct image_info){}; + + return GRUB_EFI_SUCCESS; +} @@ -949,22 +883,10 @@ +{ + grub_efi_register_loader (&peimage_loader); + my_mod = mod; -+ -+ // Hook exit handler -+ exit_orig = grub_efi_system_table->boot_services->exit; -+ grub_efi_system_table->boot_services->exit = exit_hook; -+ // Hook unload_image handler -+ unload_image_orig = grub_efi_system_table->boot_services->unload_image; -+ grub_efi_system_table->boot_services->unload_image = unload_image_hook; +} + +GRUB_MOD_FINI (peimage) +{ -+ // Restore exit handler -+ grub_efi_system_table->boot_services->exit = exit_orig; -+ // Restore unload_image handler -+ grub_efi_system_table->boot_services->unload_image = unload_image_orig; -+ + grub_efi_unregister_loader (&peimage_loader); +} diff --git a/include/grub/efi/peimage.h b/include/grub/efi/peimage.h diff -Nru grub2-unsigned-2.12/debian/patches/series grub2-unsigned-2.12/debian/patches/series --- grub2-unsigned-2.12/debian/patches/series 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/patches/series 2024-04-04 10:10:57.000000000 +0000 @@ -69,6 +69,7 @@ fdt-add-debug-output-to-devicetree-command.patch fdt-device-tree-fixup-protocol.patch extra_deps_lst.patch +revert-term-ns8250-spcr.patch ubuntu-install-signed.patch ubuntu-grub-install-extra-removable.patch ubuntu-zfs-enhance-support.patch @@ -99,3 +100,14 @@ ubuntu-verifiers-last.patch ubuntu-os-prober-auto.patch grub-sort-version.patch +Revert-kern-ieee1275-init-ppc64-Display-upper_mem_limit-w.patch +Revert-kern-ieee1275-init-ppc64-Fix-a-comment.patch +Revert-kern-ieee1275-ieee1275-Display-successful-memory-c.patch +Revert-loader-powerpc-ieee1275-Use-new-allocation-functio.patch +Revert-kern-ieee1275-cmain-ppc64-Introduce-flags-to-ident.patch +Revert-kern-ieee1275-init-ppc64-Rename-regions_claim-to-g.patch +Revert-kern-ieee1275-init-ppc64-Add-support-for-alignment.patch +Revert-kern-ieee1275-init-ppc64-Return-allocated-address-.patch +Revert-kern-ieee1275-init-ppc64-Decide-by-request-whether.patch +Revert-kern-ieee1275-init-ppc64-Introduce-a-request-for-r.patch +grub-install-efi-title.patch diff -Nru grub2-unsigned-2.12/debian/patches/suse-grub.texi-add-net_bootp6-document.patch grub2-unsigned-2.12/debian/patches/suse-grub.texi-add-net_bootp6-document.patch --- grub2-unsigned-2.12/debian/patches/suse-grub.texi-add-net_bootp6-document.patch 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/patches/suse-grub.texi-add-net_bootp6-document.patch 2024-04-04 10:11:57.000000000 +0000 @@ -13,10 +13,10 @@ 1 file changed, 17 insertions(+) diff --git a/docs/grub.texi b/docs/grub.texi -index 584f6dc..4e6fb8d 100644 +index c2682be..c332de3 100644 --- a/docs/grub.texi +++ b/docs/grub.texi -@@ -5982,6 +5982,7 @@ Note: The command is not allowed when lockdown is enforced (@pxref{Lockdown}). +@@ -5973,6 +5973,7 @@ Note: The command is not allowed when lockdown is enforced (@pxref{Lockdown}). * net_add_dns:: Add a DNS server * net_add_route:: Add routing entry * net_bootp:: Perform a bootp/DHCP autoconfiguration @@ -24,7 +24,7 @@ * net_del_addr:: Remove IP address from interface * net_del_dns:: Remove a DNS server * net_del_route:: Remove a route entry -@@ -6107,6 +6108,22 @@ Sets environment variable @samp{net_}@var{}@samp{_boot_file} +@@ -6098,6 +6099,22 @@ Sets environment variable @samp{net_}@var{}@samp{_boot_file} @end deffn diff -Nru grub2-unsigned-2.12/debian/patches/ubuntu-fix-lzma-decompressor-objcopy.patch grub2-unsigned-2.12/debian/patches/ubuntu-fix-lzma-decompressor-objcopy.patch --- grub2-unsigned-2.12/debian/patches/ubuntu-fix-lzma-decompressor-objcopy.patch 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/patches/ubuntu-fix-lzma-decompressor-objcopy.patch 2024-04-04 10:11:57.000000000 +0000 @@ -15,7 +15,7 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index c3ad031..3d98edf 100644 +index 7b49f77..ae5c558 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -569,7 +569,7 @@ image = { diff -Nru grub2-unsigned-2.12/debian/patches/ubuntu-support-initrd-less-boot.patch grub2-unsigned-2.12/debian/patches/ubuntu-support-initrd-less-boot.patch --- grub2-unsigned-2.12/debian/patches/ubuntu-support-initrd-less-boot.patch 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/patches/ubuntu-support-initrd-less-boot.patch 2024-04-04 10:11:57.000000000 +0000 @@ -16,7 +16,7 @@ 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/docs/grub.texi b/docs/grub.texi -index b4825b7..584f6dc 100644 +index 990d8c7..c2682be 100644 --- a/docs/grub.texi +++ b/docs/grub.texi @@ -1615,6 +1615,19 @@ This option sets the English text of the string that will be displayed in diff -Nru grub2-unsigned-2.12/debian/po/ar.po grub2-unsigned-2.12/debian/po/ar.po --- grub2-unsigned-2.12/debian/po/ar.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/ar.po 2024-04-04 10:03:45.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: grub.ar\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2010-07-16 02:38+0300\n" "Last-Translator: Ossama M. Khayat \n" "Language-Team: Arabic \n" @@ -306,6 +306,12 @@ "بشكل عام، يجب عليك إنهاء التحويل إلى GRUB 2 إلا إن كانت سجلات الإقلاع هذه قد " "أنشأها تثبيت GRUB 2 لنظام تشغيل آخر." +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -451,13 +457,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "سطر أوامر KFreeBSD:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 #, fuzzy #| msgid "" #| "The following kFreeBSD command line was extracted from /etc/default/grub " @@ -474,13 +480,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "سطر أوامر KFreeBSD الافتراضي:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -490,19 +496,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -510,13 +516,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/ast.po grub2-unsigned-2.12/debian/po/ast.po --- grub2-unsigned-2.12/debian/po/ast.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/ast.po 2024-04-04 10:03:45.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: grub2\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2012-01-27 11:10+0100\n" "Last-Translator: Mikel González \n" "Language-Team: Asturian \n" @@ -298,6 +298,12 @@ "d'arranque fueren creaos por una instalación de GRUB 2 en dalgún otru " "sistema operativu." +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -446,13 +452,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "Linia comandos kFreeBSD:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -464,13 +470,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "Llínia comandos por defeutu kFreeBSD:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -480,19 +486,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -500,13 +506,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/be.po grub2-unsigned-2.12/debian/po/be.po --- grub2-unsigned-2.12/debian/po/be.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/be.po 2024-04-04 10:03:45.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: be\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2017-01-23 11:22+0300\n" "Last-Translator: Viktar Siarheichyk \n" "Language-Team: Debian l10n team for Belarusian \n" "Language-Team: Български \n" @@ -302,6 +302,12 @@ "секторите за начално зареждане са създадени от GRUB 2 или от друга " "операционна система." +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -474,13 +480,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "Команден ред за kFreeBSD:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -492,13 +498,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "Параметри на Линукс по подразбиране:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -508,19 +514,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -528,13 +534,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/ca.po grub2-unsigned-2.12/debian/po/ca.po --- grub2-unsigned-2.12/debian/po/ca.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/ca.po 2024-04-04 10:03:45.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: grub2 2.02~beta3-4\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2017-01-23 17:31+0100\n" "Last-Translator: Innocent De Marchi \n" "Language-Team: Catalan \n" @@ -306,6 +306,12 @@ "aquests registres d'arrencada els haja creat una instaŀlació del GRUB 2 des " "d'un altre sistema operatiu." +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -481,13 +487,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "Línia d'ordres de kFreeBSD:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -500,13 +506,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "Línia d'ordres de kFreeBSD per defecte:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -516,19 +522,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -536,13 +542,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/cs.po grub2-unsigned-2.12/debian/po/cs.po --- grub2-unsigned-2.12/debian/po/cs.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/cs.po 2024-04-04 10:03:45.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: grub2\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2017-01-22 11:18+0100\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -294,6 +294,12 @@ "Obvykle byste měli konverzi na GRUB 2 dokončit, s výjimkou situace, kdy tyto " "zaváděcí záznamy vytvořila instalace nějakého jiného operačního systému." +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -466,13 +472,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "Parametry pro kFreeBSD:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -485,13 +491,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "Výchozí parametry pro kFreeBSD:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -501,19 +507,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -521,13 +527,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/cy.po grub2-unsigned-2.12/debian/po/cy.po --- grub2-unsigned-2.12/debian/po/cy.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/cy.po 2024-04-04 10:03:45.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: grub2\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2023-04-25 00:08+0100\n" "Last-Translator: Dafydd Tomos \n" "Language-Team: Welsh\n" @@ -305,6 +305,12 @@ "ymgychwyn hyn wedi eu creu gan sefydliad GRUB 2 gan ryw system weithredu " "arall." +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -487,13 +493,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "llinell orchymyn kFreeBSD:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -505,13 +511,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "llinell orchymyn ddiofyn kFreeBSD:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -521,19 +527,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -541,13 +547,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/da.po grub2-unsigned-2.12/debian/po/da.po --- grub2-unsigned-2.12/debian/po/da.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/da.po 2024-04-04 10:03:45.000000000 +0000 @@ -20,7 +20,7 @@ msgstr "" "Project-Id-Version: grub2\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2017-01-23 11:30+01:00\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" @@ -312,6 +312,12 @@ "opstartsposter blev oprettet af en GRUB 2-installation på et andet " "operativsystem." +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -485,13 +491,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "Kommandolinje for kFreeBSD:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -503,13 +509,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "Standardkommandolinje i kFreeBSD:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -519,19 +525,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -539,13 +545,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/de.po grub2-unsigned-2.12/debian/po/de.po --- grub2-unsigned-2.12/debian/po/de.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/de.po 2024-04-04 10:03:45.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: 2.02 2.06-13\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2023-04-25 19:48+0200\n" "Last-Translator: Helge Kreutzmann \n" "Language-Team: German \n" @@ -310,6 +310,12 @@ "denn, diese GRUB-2-Boot-Sektoren wurden von einem anderen Betriebssystem " "installiert." +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -500,13 +506,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "Befehlszeile für kFreeBSD:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -519,13 +525,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "Standard-Befehlszeile für kFreeBSD:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -535,19 +541,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -555,13 +561,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/dz.po grub2-unsigned-2.12/debian/po/dz.po --- grub2-unsigned-2.12/debian/po/dz.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/dz.po 2024-04-04 10:03:45.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: grub2\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2001-12-31 19:57-0500\n" "Last-Translator: Dawa \n" "Language-Team: Dzongkha \n" @@ -292,6 +292,12 @@ "GRUB 2 གཞི་བཙུགས་ཀྱིས་ བཀོད་སྤྱོད་རིམ་ལུགས་ གཞན་གཅིག་གུ་ བུཊི་དྲན་ཐོ་འདི་ཚུ་ གསར་བསྐྲུན་མ་འབདཝ་" "ལས་ GRUB 2 ལུ་ གཞི་བསྒྱུར་འབད་ཚར་དགོ།" +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -440,13 +446,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "kFreeBSD བརྡ་བཀོད་གྲལ་ཐིག་:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -458,13 +464,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "kFreeBSD སྔོན་སྒྲིག་བརྡ་བཀོད་གྲལ་ཐིག་:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -474,19 +480,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -494,13 +500,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/el.po grub2-unsigned-2.12/debian/po/el.po --- grub2-unsigned-2.12/debian/po/el.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/el.po 2024-04-04 10:03:45.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2023-05-12 13:50+0300\n" "Last-Translator: galaxico \n" "Language-Team: debian-l10n-greek@lists.debian.org\n" @@ -312,6 +312,12 @@ "αν αυτά τα αρχεία εκκίνησης έχουν δημιουργηθεί από μια εγκατάσταση του GRUB " "2 σε ένα άλλο λειτουργικό σύστημα." +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -502,13 +508,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "Γραμμή εντολών kFreeBSD:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -521,13 +527,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "Προκαθορισμένη γραμμή εντολών kFreeBSD:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -538,19 +544,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -558,13 +564,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/eo.po grub2-unsigned-2.12/debian/po/eo.po --- grub2-unsigned-2.12/debian/po/eo.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/eo.po 2024-04-04 10:03:45.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: grub2 2.02-18\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2023-05-10 19:17-0300\n" "Last-Translator: Felipe Castro \n" "Language-Team: Esperanto \n" @@ -296,6 +296,12 @@ "ekŝarg-registroj estu kreitaj de sistemo kun GRUB 2 instalita, en alia " "operaciuma sistemo." +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -476,13 +482,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "Ordon-linio de kFreeBSD:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -495,13 +501,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "Implicita komand-linio de kFreeBSD:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -511,19 +517,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -531,13 +537,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/es.po grub2-unsigned-2.12/debian/po/es.po --- grub2-unsigned-2.12/debian/po/es.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/es.po 2024-04-04 10:03:45.000000000 +0000 @@ -36,7 +36,7 @@ msgstr "" "Project-Id-Version: grub2 1.99-5\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2017-01-28 17:07+0100\n" "Last-Translator: Manuel \"Venturi\" Porras Peralta \n" @@ -337,6 +337,12 @@ "Debería terminar la conversión a GRUB 2 a menos que estos registros de " "inicio los crease una instalación de GRUB 2 en algún otro sistema operativo." +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -514,13 +520,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "Línea de órdenes de kFreeBSD:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -533,13 +539,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "Línea de órdenes predeterminada de kFreeBSD:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -549,19 +555,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -569,13 +575,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/eu.po grub2-unsigned-2.12/debian/po/eu.po --- grub2-unsigned-2.12/debian/po/eu.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/eu.po 2024-04-04 10:03:45.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: grub2_2.02~beta2-18\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2017-01-20 15:48+0100\n" "Last-Translator: Iñaki Larrañaga Murgoitio \n" "Language-Team: Basque \n" @@ -303,6 +303,12 @@ "sistema eragile batzuetako GRUB 2 bertsioaren instalazioan ez badira sortuak " "izan." +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -474,13 +480,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "KFreeBSD-ko komando-lerroa:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -492,13 +498,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "KFreeBSD-ko komando-lerro lehenetsia:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -508,19 +514,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -528,13 +534,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/fa.po grub2-unsigned-2.12/debian/po/fa.po --- grub2-unsigned-2.12/debian/po/fa.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/fa.po 2024-04-04 10:03:45.000000000 +0000 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: fa\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: \n" "Last-Translator: Behrad Eslamifar \n" "Language-Team: debian-l10n-persian \n" @@ -293,6 +293,12 @@ "شما باید معمولاً به ارتباط GRUB2 پایان دهید، مگر آنکه این رکورد های بوت ساخته " "شده توسط GRUB2 مربوط به سیستم عامل های دیگر باشد." +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -442,13 +448,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "خط فرمان kFreeBSD:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -460,13 +466,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "خط فرمان پیش فرض kFreeBSD:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -476,19 +482,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -496,13 +502,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/fi.po grub2-unsigned-2.12/debian/po/fi.po --- grub2-unsigned-2.12/debian/po/fi.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/fi.po 2024-04-04 10:03:45.000000000 +0000 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: grub2\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2014-12-27 18:53+0200\n" "Last-Translator: Timo Jyrinki \n" "Language-Team: Finnish \n" @@ -300,6 +300,12 @@ "käynnistystietoja luotu johonkin toiseen käyttöjärjestelmään asennetulla " "GRUB 2:lla." +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -468,13 +474,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "kFreeBSD:n komentorivi:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -487,13 +493,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "kFreeBSD:n oletuskomentorivi:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -503,19 +509,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -523,13 +529,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/fr.po grub2-unsigned-2.12/debian/po/fr.po --- grub2-unsigned-2.12/debian/po/fr.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/fr.po 2024-04-04 10:03:45.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2023-04-26 19:30+0200\n" "Last-Translator: Baptiste Jammet \n" "Language-Team: French \n" @@ -315,6 +315,12 @@ "GRUB 2 à moins que ces secteurs d'amorçage n'aient été créés par une " "installation de GRUB 2 d'un autre système d'exploitation." +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -504,13 +510,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "Ligne de commande de kFreeBSD :" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -523,13 +529,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "Ligne de commande par défaut de kFreeBSD :" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -539,19 +545,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -559,13 +565,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/gl.po grub2-unsigned-2.12/debian/po/gl.po --- grub2-unsigned-2.12/debian/po/gl.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/gl.po 2024-04-04 10:03:45.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: grub2_1.98+20100804-2_gl\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2012-06-13 16:13+0200\n" "Last-Translator: Jorge Barreiro \n" "Language-Team: Galician \n" @@ -307,6 +307,12 @@ "de inicio fosen creatos por unha instalación de GRUB 2 en outro sistema " "operativo." +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -457,13 +463,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "Liña de comando de kFreeBSD:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -476,13 +482,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "Liña de comando por defecto para kFreeBSD:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -492,19 +498,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -512,13 +518,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/gu.po grub2-unsigned-2.12/debian/po/gu.po --- grub2-unsigned-2.12/debian/po/gu.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/gu.po 2024-04-04 10:03:45.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: grub-gu\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2012-03-04 09:56+0530\n" "Last-Translator: Kartik Mistry \n" "Language-Team: Gujarati \n" @@ -285,6 +285,12 @@ "તમે સામાન્ય રીતે GRUB 2 માં રુપાંતર કરી લીધું છે સિવાય કે આ બૂટ રેકોર્ડ GRUB 2 સ્થાપન વડે " "કોઈ બીજી ઓપરેટિંગ સિસ્ટમમાં બનાવવામાં આવ્યા હોય." +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -432,13 +438,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "kFreeBSD આદેશ:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -450,13 +456,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "kFreeBSD મૂળભૂત આદેશ:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -466,19 +472,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -486,13 +492,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/he.po grub2-unsigned-2.12/debian/po/he.po --- grub2-unsigned-2.12/debian/po/he.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/he.po 2024-04-04 10:03:45.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: grub_debian_po_he\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2014-12-17 18:35+0200\n" "Last-Translator: Omer Zak\n" "Language-Team: Hebrew \n" @@ -286,6 +286,12 @@ "בדרך כלל עליך לסיים את ההמרה ל-GRUB 2 אלא אם רשומות אתחול אלה נוצרו על ידי " "התקנת GRUB 2 במערכת הפעלה אחרת." +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -449,13 +455,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "שורת הפקודה של kFreeBSD:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -467,13 +473,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "ברירת מחדל לשורת הפקודה של kFreeBSD:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -483,19 +489,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -503,13 +509,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/hr.po grub2-unsigned-2.12/debian/po/hr.po --- grub2-unsigned-2.12/debian/po/hr.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/hr.po 2024-04-04 10:03:45.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: grub2 1.97-2\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2023-04-25 13:07+0200\n" "Last-Translator: Tomislav Krznar \n" "Language-Team: hrvatski \n" @@ -300,6 +300,12 @@ "boot zapisi napravljeni instalacijom GRUB 2 na nekom drugom operacijskom " "sustavu." +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -481,13 +487,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "kFreeBSD naredbeni redak:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -499,13 +505,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "Pretpostavljeni kFreeBSD naredbeni redak:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -515,19 +521,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -535,13 +541,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/hu.po grub2-unsigned-2.12/debian/po/hu.po --- grub2-unsigned-2.12/debian/po/hu.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/hu.po 2024-04-04 10:03:45.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: grub2\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2013-05-18 15:44+0200\n" "Last-Translator: Dr. Nagy Elemér Károly \n" "Language-Team: Hungarian \n" @@ -301,6 +301,12 @@ "rendszerbetöltő rekordok egy másik operációs rendszeren futó GRUB 2 " "telepítéssel készültek." +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -451,13 +457,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "kFreeBSD parancssor:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -469,13 +475,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "Az alapértelmezett kFreeBSD parancssor:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -485,19 +491,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -505,13 +511,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/id.po grub2-unsigned-2.12/debian/po/id.po --- grub2-unsigned-2.12/debian/po/id.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/id.po 2024-04-04 10:03:45.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: grub2\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2022-03-15 17:45+0700\n" "Last-Translator: Andika Triwidada \n" "Language-Team: Debian Indonesian Translation Team \n" "Language-Team: Icelandic \n" @@ -300,6 +300,12 @@ "Almennt ættirðu að ljúka umbreytingu í GRUB 2 nema ef þessar ræsifærslur " "hafi verið útbúnar af GRUB 2 uppsetningu í einhverju öðru stýrikerfi." +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -467,13 +473,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "kFreeBSD skipanalína:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -485,13 +491,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "Sjálfgefin kFreeBSD skipanalína:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -501,19 +507,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -521,13 +527,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/it.po grub2-unsigned-2.12/debian/po/it.po --- grub2-unsigned-2.12/debian/po/it.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/it.po 2024-04-04 10:03:45.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: grub2 2.02~beta3-4 italian debconf templates\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2023-04-29 21:20+0200\n" "Last-Translator: Luca Monducci \n" "Language-Team: Italian \n" @@ -299,6 +299,12 @@ "siano stati creati da un'altra installazione di GRUB 2 su un altro sistema " "operativo." +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -482,13 +488,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "Riga di comando kFreeBSD:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -501,13 +507,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "Riga di comando kFreeBSD predefinita:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -517,19 +523,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -537,13 +543,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/ja.po grub2-unsigned-2.12/debian/po/ja.po --- grub2-unsigned-2.12/debian/po/ja.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/ja.po 2024-04-04 10:03:45.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: grub2 1.99-5\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2016-03-03 09:57+0900\n" "Last-Translator: Takuma Yamada \n" "Language-Team: Japanese \n" @@ -300,6 +300,12 @@ "他の OS 上での GRUB 2 のインストールによって作成されていたブートレコードを除" "き、GRUB 2 へのコンバートはほぼ完了しました。" +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -466,13 +472,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "kFreeBSD コマンドライン:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -484,13 +490,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "kFreeBSD デフォルトコマンドライン:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -500,19 +506,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -520,13 +526,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/ka.po grub2-unsigned-2.12/debian/po/ka.po --- grub2-unsigned-2.12/debian/po/ka.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/ka.po 2024-04-04 10:03:45.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2009-08-30 18:05+0400\n" "Last-Translator: Aiet Kolkhi \n" "Language-Team: Georgian \n" @@ -269,6 +269,12 @@ "records were created by a GRUB 2 installation on some other operating system." msgstr "" +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -402,13 +408,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "kFreeBSD ბრძანების სტრიქონი:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 #, fuzzy #| msgid "" #| "The following kFreeBSD command line was extracted from /etc/default/grub " @@ -425,13 +431,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "kFreeBSD-ის სტანდარტული ბრძანების სტრიქონი:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -441,19 +447,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -461,13 +467,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/kk.po grub2-unsigned-2.12/debian/po/kk.po --- grub2-unsigned-2.12/debian/po/kk.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/kk.po 2024-04-04 10:03:45.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: master\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2023-04-25 21:51+0600\n" "Last-Translator: Baurzhan Muftakhidinov \n" "Language-Team: Kazakh \n" @@ -293,6 +293,12 @@ "GRUB 2 дейін жаңартуды аяқтауыңыз керек, егер осы жүктелу жазбалары басқа " "жүйеде орнатылған GRUB 2 көмегімен жасалмаған болса." +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -474,13 +480,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "kFreeBSD командалық жолы:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -492,13 +498,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "kFreeBSD бастапқы командалық жолы:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -508,19 +514,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -528,13 +534,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/km.po grub2-unsigned-2.12/debian/po/km.po --- grub2-unsigned-2.12/debian/po/km.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/km.po 2024-04-04 10:03:45.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: grub_debian_po\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2012-04-05 15:38+0700\n" "Last-Translator: Khoem Sokhem \n" "Language-Team: Khmer \n" @@ -285,6 +285,12 @@ "ជា​ទូទៅ អ្នក​គួរ​តែ​បញ្ចប់​ការ​បម្លែង​ទៅ GRUB 2 លុះត្រា​តែ​ផ្នែក​ចាប់ផ្ដើម​ត្រូវ​បាន​បង្កើត​ដោយ​ការ​ដំឡើង " "GRUB 2 នៅ​លើ​ប្រព័ន្ធ​ប្រតិបត្តិការ​ផ្សេង ។" +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -432,13 +438,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "ពាក្យ​បញ្ជា kFreeBSD ៖" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -449,13 +455,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "ពាក្យ​បញ្ជា​លំនាំដើម​របស់ kFreeBSD ៖" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -465,19 +471,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -485,13 +491,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/ko.po grub2-unsigned-2.12/debian/po/ko.po --- grub2-unsigned-2.12/debian/po/ko.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/ko.po 2024-04-04 10:03:45.000000000 +0000 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: grub_debian\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2023-04-26 18:55+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: Korean \n" @@ -287,6 +287,12 @@ "일반적인 경우 GRUB 2 전환을 마쳐야 합니다. 예외는 부트레코드의 GRUB 2를 다른 " "운영체제에서 설치한 경우입니다." +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -461,13 +467,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "kFreeBSD 명령어:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -479,13 +485,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "kFreeBSD 기본 명령어:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -495,19 +501,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -515,13 +521,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/lt.po grub2-unsigned-2.12/debian/po/lt.po --- grub2-unsigned-2.12/debian/po/lt.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/lt.po 2024-04-04 10:03:45.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2017-01-20 09:03+0300\n" "Last-Translator: Rimas Kudelis \n" "Language-Team: Lithuanian \n" @@ -299,6 +299,12 @@ "Paprastai derėtų užbaigti migraciją į „GRUB 2“, nebent šiuos paleidimo " "įrašus sukūrė „GRUB 2“ versija, įdiegta su kokia nors kita operacine sistema." +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -474,13 +480,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "„kFreeBSD“ komandos eilutė:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -493,13 +499,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "Numatytoji „kFreeBSD“ komandos eilutė:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -509,19 +515,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -529,13 +535,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/lv.po grub2-unsigned-2.12/debian/po/lv.po --- grub2-unsigned-2.12/debian/po/lv.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/lv.po 2024-04-04 10:03:45.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2023-04-30 22:01+0300\n" "Last-Translator: Rūdolfs Mazurs \n" "Language-Team: Latvian \n" @@ -297,6 +297,12 @@ "Jums vajadzētu pabeigt pāreju uz GRUB 2, izņemot, ja šos palaišanas " "ierakstus izveidoja GRUB 2 instalācija no kādas citas operētājsistēmas." +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -478,13 +484,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "kFreeBSD komandrinda:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -496,13 +502,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "kFreeBSD noklusējuma komandrinda:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -512,19 +518,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -532,13 +538,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/mr.po grub2-unsigned-2.12/debian/po/mr.po --- grub2-unsigned-2.12/debian/po/mr.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/mr.po 2024-04-04 10:03:45.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2014-12-24 20:56+0530\n" "Last-Translator: localuser \n" "Language-Team: C-DAC/Sampada\n" @@ -287,6 +287,12 @@ "या आरंभ नोंदी अन्य कोणत्यातरी प्रचालन प्रणालीवर ग्रब 2 अधिष्ठापनेने निर्माण केलेल्या " "नसल्यास तुम्ही सामान्यतः ग्रब 2 मघ्ये परिवर्तन पूर्ण केले पाहिजे." +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -451,13 +457,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "केफ्रीबीएसडी आदेश ओळ:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -469,13 +475,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "केफ्रीबीएसडी मूलनिर्धारीत आदेश ओळ:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -485,19 +491,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -505,13 +511,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/nb.po grub2-unsigned-2.12/debian/po/nb.po --- grub2-unsigned-2.12/debian/po/nb.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/nb.po 2024-04-04 10:03:45.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: grub2\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2023-04-25 08:34+0200\n" "Last-Translator: Petter Reinholdtsen \n" "Language-Team: Norwegian Bokmål \n" @@ -302,6 +302,12 @@ "oppstartspostene ble opprettet av en GRUB 2-installasjon på et annet " "operativsystem." +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -483,13 +489,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "Kommandolinje i kFreeBSD:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -501,13 +507,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "Standardkommandolinje i kFreeBSD:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -517,19 +523,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -537,13 +543,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/nl.po grub2-unsigned-2.12/debian/po/nl.po --- grub2-unsigned-2.12/debian/po/nl.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/nl.po 2024-04-04 10:03:45.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: grub2 2.06-13\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2023-04-26 21:05+0200\n" "Last-Translator: Frans Spiesschaert \n" "Language-Team: Debian Dutch l10n Team \n" @@ -310,6 +310,12 @@ "opstart-images gemaakt zijn bij het installeren van GRUB 2 met een ander " "besturingssysteem." +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -499,13 +505,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "kFreeBSD-commandoregel:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -518,13 +524,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "Standaard kFreeBSD-commandoregel:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -534,19 +540,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -554,13 +560,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/pl.po grub2-unsigned-2.12/debian/po/pl.po --- grub2-unsigned-2.12/debian/po/pl.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/pl.po 2024-04-04 10:03:45.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2017-01-20 14:11+0100\n" "Last-Translator: Łukasz Dulny \n" "Language-Team: Polish \n" @@ -307,6 +307,12 @@ "Można zakończyć przejście na GRUB-a 2, chyba że te wpisy rozruchowe zostały " "stworzone przez GRUB-a 2 zainstalowanego w jakimś innym systemie operacyjnym." +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -481,13 +487,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "Wiersz poleceń do kFreeBSD:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -500,13 +506,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "Domyślny wiersz poleceń do kFreeBSD:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -516,19 +522,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -536,13 +542,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/pt.po grub2-unsigned-2.12/debian/po/pt.po --- grub2-unsigned-2.12/debian/po/pt.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/pt.po 2024-04-04 10:03:45.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: grub2 2.02-beta3-5\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2017-06-04 12:30+0000\n" "Last-Translator: Rui Branco - DebianPT \n" "Language-Team: Portuguese \n" @@ -306,6 +306,12 @@ "registos de arranque tenham sido criados por uma instalação do GRUB 2 noutro " "sistema operativo." +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -482,13 +488,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "linha de comandos kFreeBSD:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -501,13 +507,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "Linha de comandos padrão do kFreeBSD:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -517,19 +523,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -537,13 +543,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/pt_BR.po grub2-unsigned-2.12/debian/po/pt_BR.po --- grub2-unsigned-2.12/debian/po/pt_BR.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/pt_BR.po 2024-04-04 10:03:45.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: grub2 2.02~beta3-4\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2023-04-24 21:29-0300\n" "Last-Translator: Adriano Rafael Gomes \n" "Language-Team: Brazilian Portuguese \n" "Language-Team: Romanian \n" @@ -314,6 +314,12 @@ "care acele înregistrări de pornire au fost create de o instalare GRUB 2 a " "altui sistem de operare." +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -502,13 +508,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "Linia de comandă kFreeBSD:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -521,13 +527,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "Linia de comandă implicită kFreeBSD:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -537,19 +543,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -557,13 +563,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/ru.po grub2-unsigned-2.12/debian/po/ru.po --- grub2-unsigned-2.12/debian/po/ru.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/ru.po 2024-04-04 10:03:45.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: grub2 2.06-13\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2023-04-30 06:47+0300\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" @@ -302,6 +302,12 @@ "Обычно, вам нужно завершить переход к GRUB 2, если нет загрузочных записей, " "созданных установкой GRUB 2 в какой-то другой операционной системе." +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -479,13 +485,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "Командная строка kFreeBSD:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -498,13 +504,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "Командная строка kFreeBSD по умолчанию:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -514,19 +520,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -534,13 +540,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/si.po grub2-unsigned-2.12/debian/po/si.po --- grub2-unsigned-2.12/debian/po/si.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/si.po 2024-04-04 10:03:45.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2011-09-29 08:35+0530\n" "Last-Translator: Danishka Navin \n" "Language-Team: Sinhala \n" @@ -283,6 +283,12 @@ "GRUB 2 ස්ථාපනය මගින් වෙනත් මෙහෙයුම් පද්ධතියක් මත මෙම ආරම්භක වාර්ථා නිර්මාණය කර නොමැති නම්, " "ඔබ සාමාන්‍යෙන් GRUB 2 වෙත හැරවීම අවසන් කල යුතුයි." +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -430,13 +436,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "kFreeBSD විධාන රේඛාව:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -448,13 +454,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "kFreeBSD පෙරනිමි විධාන රේඛාව:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -464,19 +470,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -484,13 +490,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/sk.po grub2-unsigned-2.12/debian/po/sk.po --- grub2-unsigned-2.12/debian/po/sk.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/sk.po 2024-04-04 10:03:45.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: grub2 1.99-5\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2011-07-19 07:49+0200\n" "Last-Translator: Slavko \n" "Language-Team: Slovak \n" @@ -299,6 +299,12 @@ "Mali by ste dokončiť konverziu na GRUB 2, ibaže boli tieto zavádzacie " "záznamy vytvorené inštaláciou GRUB 2 iného operačného systému." +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -447,13 +453,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "Príkazový riadok kFreeBSD:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -465,13 +471,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "Predvolený príkazový riadok kFreeBSD:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -481,19 +487,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -501,13 +507,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/sl.po grub2-unsigned-2.12/debian/po/sl.po --- grub2-unsigned-2.12/debian/po/sl.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/sl.po 2024-04-04 10:03:45.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: grub2\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2017-01-20 08:53+0100\n" "Last-Translator: Vanja Cvelbar \n" "Language-Team: Slovenian \n" @@ -299,6 +299,12 @@ "zagonski zapisi ustvarjeni pri nameščanju GRUB 2 na drugem operacijskem " "sistemu." +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -470,13 +476,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "Ukazna vrstica kFreeBSD:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -489,13 +495,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "Privzeta ukazna vrstica kFreeBSD:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -505,19 +511,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -525,13 +531,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/sq.po grub2-unsigned-2.12/debian/po/sq.po --- grub2-unsigned-2.12/debian/po/sq.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/sq.po 2024-04-04 10:03:45.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2017-09-04 18:50+0200\n" "Last-Translator: Silva Arapi \n" "Language-Team: Albanian \n" @@ -301,6 +301,12 @@ "kur këto rekorde të ndezjes janë krijuar nga instalimi i GRUB 2 në ndonjë " "sistem shfrytëzimi tjetër. " +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -448,13 +454,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "Linja komanduese kFreeBSD" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -467,13 +473,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "Linja komanduese fillestare kFreeBSD:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -483,19 +489,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -503,13 +509,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/sr.po grub2-unsigned-2.12/debian/po/sr.po --- grub2-unsigned-2.12/debian/po/sr.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/sr.po 2024-04-04 10:03:45.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: grub2 1.98+2010804-2\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2012-10-23 23:33+0100\n" "Last-Translator: Karolina Kalic \n" "Language-Team: Serbian\n" @@ -298,6 +298,12 @@ "Требали бисте да забршите конверзију на GRUB 2, осим ако су ови покретачки " "подаци креирани од GRUB 2 инсталације на неком другом оперативном систему." +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -446,13 +452,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "kFreeBSD командна линија:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -464,13 +470,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "kFreeBSD подразумевајућа командна линија:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -480,19 +486,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -500,13 +506,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/sr@latin.po grub2-unsigned-2.12/debian/po/sr@latin.po --- grub2-unsigned-2.12/debian/po/sr@latin.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/sr@latin.po 2024-04-04 10:03:45.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: grub2 1.98+2010804-2\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2012-10-23 23:33+0100\n" "Last-Translator: Karolina Kalic \n" "Language-Team: Serbian\n" @@ -298,6 +298,12 @@ "Trebali biste da zabršite konverziju na GRUB 2, osim ako su ovi pokretački " "podaci kreirani od GRUB 2 instalacije na nekom drugom operativnom sistemu." +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -446,13 +452,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "kFreeBSD komandna linija:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -464,13 +470,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "kFreeBSD podrazumevajuća komandna linija:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -480,19 +486,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -500,13 +506,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/sv.po grub2-unsigned-2.12/debian/po/sv.po --- grub2-unsigned-2.12/debian/po/sv.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/sv.po 2024-04-04 10:03:45.000000000 +0000 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: grub2_sv\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2023-04-25 15:27+0200\n" "Last-Translator: Luna Jernberg \n" "Language-Team: Swedish \n" @@ -304,6 +304,12 @@ "Det generella rådet är att avsluta konverteringen till GRUB 2 om dessa filer " "inte skapats av en GRUB 2-installation på ett annat operativsystem." +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -485,13 +491,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "kFreeBSD kommandorad:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -503,13 +509,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "kFreeBSD standardkommandorad" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -519,19 +525,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -539,13 +545,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/ta.po grub2-unsigned-2.12/debian/po/ta.po --- grub2-unsigned-2.12/debian/po/ta.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/ta.po 2024-04-04 10:03:45.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: ta\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2012-02-16 10:15+0530\n" "Last-Translator: Dr.T.Vasudevan \n" "Language-Team: Tamil \n" @@ -291,6 +291,12 @@ "இந்த பூட் பதிவுகள் வேறு ஒரு இயங்கு தளத்தை நிறுவும் போது க்ரப் 2 ஆல் " "உருவாக்கப்பட்டிருந்தால் ஒழிய நீங்கள் பொதுவாக க்ரப் 2 மாற்றத்தை முடிக்க வேண்டும்." +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -438,13 +444,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "கேப்ரீபிஎஸ்டி கட்டளை வரி:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -456,13 +462,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "கேப்ரீபிஎஸ்டி முன்னிருப்பு கட்டளை வரி:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -472,19 +478,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -492,13 +498,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/templates.pot grub2-unsigned-2.12/debian/po/templates.pot --- grub2-unsigned-2.12/debian/po/templates.pot 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/templates.pot 2024-04-04 10:03:45.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: grub2\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -247,6 +247,12 @@ "records were created by a GRUB 2 installation on some other operating system." msgstr "" +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -370,13 +376,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -385,13 +391,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -399,19 +405,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -419,13 +425,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/th.po grub2-unsigned-2.12/debian/po/th.po --- grub2-unsigned-2.12/debian/po/th.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/th.po 2024-04-04 10:03:45.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: grub\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2017-01-20 14:46+0700\n" "Last-Translator: Theppitak Karoonboonyanan \n" "Language-Team: Thai \n" @@ -284,6 +284,12 @@ "โดยทั่วไปแล้ว คุณควรจะจบขั้นตอนสุดท้ายของการแปลงไปเป็น GRUB 2 นี้ " "นอกเสียจากว่าบูตเรคอร์ดเหล่านี้จะถูกสร้างโดย GRUB 2 ที่ติดตั้งในระบบปฏิบัติการอื่น" +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -451,13 +457,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "พารามิเตอร์สำหรับบูต kFreeBSD:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -469,13 +475,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "พารามิเตอร์สำหรับบูต kFreeBSD แบบปกติ:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -483,19 +489,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -503,13 +509,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/tr.po grub2-unsigned-2.12/debian/po/tr.po --- grub2-unsigned-2.12/debian/po/tr.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/tr.po 2024-04-04 10:03:45.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: grub2\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2023-04-30 15:12+0300\n" "Last-Translator: Atila KOÇ \n" "Language-Team: Debian L10n Turkish \n" @@ -303,6 +303,12 @@ "tarafından oluşturulmamışsa,\n" " GRUB 2 kurulumunu tamamlamanız gerekmektedir." +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -487,13 +493,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "kFreeBSD komut satırı:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -506,13 +512,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "Öntanımlı kFreeBSD komut satırı:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -522,19 +528,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -542,13 +548,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/ug.po grub2-unsigned-2.12/debian/po/ug.po --- grub2-unsigned-2.12/debian/po/ug.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/ug.po 2024-04-04 10:03:45.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: grub_debian\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2017-01-26 21:24-0500\n" "Last-Translator: Abduqadir Abliz \n" "Language-Team: Uyghur Computer Science Association \n" @@ -302,6 +302,12 @@ "خاتىرىسى باشقا مەشغۇلات سىستېمىسىغا ئورنىتىلغان GRUB 2 قۇرغان بولسا بۇ باشقا " "گەپ." +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -478,13 +484,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "kFreeBSD بۇيرۇق قۇرى:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -496,13 +502,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "kFreeBSD كۆڭۈلدىكى بۇيرۇق قۇرى:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -512,19 +518,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -532,13 +538,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/uk.po grub2-unsigned-2.12/debian/po/uk.po --- grub2-unsigned-2.12/debian/po/uk.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/uk.po 2024-04-04 10:03:45.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2017-01-23 16:36+0200\n" "Last-Translator: Yatsenko Alexandr \n" "Language-Team: Ukrainian \n" @@ -299,6 +299,12 @@ "Ви маєте повністю завершити перехід на GRUB 2, якщо ці завантажувальні " "записи було створено GRUB 2 іншої операційної системи." +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -471,13 +477,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "Рядок параметрів ядра kFreeBSD:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -490,13 +496,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "Типовий рядок параметрів ядра kFreeBSD:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -506,19 +512,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -526,13 +532,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/vi.po grub2-unsigned-2.12/debian/po/vi.po --- grub2-unsigned-2.12/debian/po/vi.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/vi.po 2024-04-04 10:03:45.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: grub2\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2017-01-21 08:26+0700\n" "Last-Translator: Trần Ngọc Quân \n" "Language-Team: Vietnamese \n" @@ -300,6 +300,12 @@ "Nói chung bạn nên kết thúc chuyển đổi sang GRUB2 nếu các mục ghi khởi động " "này không được tạo bởi một bản cài đặt GRUB2 trên một hệ điều hành khác." +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -472,13 +478,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "Dòng lệnh kFreeBSD:" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -490,13 +496,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "Dòng lệnh kFreeBSD mặc định:" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -506,19 +512,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -526,13 +532,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/zh_CN.po grub2-unsigned-2.12/debian/po/zh_CN.po --- grub2-unsigned-2.12/debian/po/zh_CN.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/zh_CN.po 2024-04-04 10:03:45.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: grub2-po-debconf master\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2011-05-28 17:29+0800\n" "Last-Translator: YunQiang Su \n" "Language-Team: Chinese (simplified) \n" @@ -279,6 +279,12 @@ "您通常应该完成到 GRUB 2 的转换，除非这些引导记录是由安装到其它操作系统上的 " "GRUB 2 创建的。" +#. Type: boolean +#. Description +#: ../grub-pc.templates.in:15001 ../templates.in:11001 +msgid "Choose installation target based on the device containing /boot?" +msgstr "" + #. Type: string #. Description #: ../templates.in:1001 @@ -422,13 +428,13 @@ #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "kFreeBSD command line:" msgstr "kFreeBSD 参数：" #. Type: string #. Description -#: ../templates.in:11001 +#: ../templates.in:12001 msgid "" "The following kFreeBSD command line was extracted from /etc/default/grub or " "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is " @@ -440,13 +446,13 @@ #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "kFreeBSD default command line:" msgstr "kFreeBSD 默认命令行：" #. Type: string #. Description -#: ../templates.in:12001 +#: ../templates.in:13001 msgid "" "The following string will be used as kFreeBSD parameters for the default " "menu entry but not for the recovery mode." @@ -454,19 +460,19 @@ #. Type: title #. Description -#: ../templates.in:13001 +#: ../templates.in:14001 msgid "unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "Your system has UEFI Secure Boot enabled in firmware, and the following " "kernels present on your system are unsigned:" @@ -474,13 +480,13 @@ #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid " ${unsigned_versions}" msgstr "" #. Type: note #. Description -#: ../templates.in:14001 +#: ../templates.in:15001 msgid "" "These kernels cannot be verified under Secure Boot. To ensure your system " "remains bootable, GRUB will not be upgraded on your disk until these kernels " diff -Nru grub2-unsigned-2.12/debian/po/zh_TW.po grub2-unsigned-2.12/debian/po/zh_TW.po --- grub2-unsigned-2.12/debian/po/zh_TW.po 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/po/zh_TW.po 2024-04-04 10:03:45.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: grub2\n" "Report-Msgid-Bugs-To: grub2@packages.debian.org\n" -"POT-Creation-Date: 2024-01-29 10:53+0000\n" +"POT-Creation-Date: 2024-02-21 16:42+0000\n" "PO-Revision-Date: 2014-12-17 17:08-0800\n" "Last-Translator: Vincent Chen \n" "Language-Team: Debian-user in Chinese [Big5] /dev/null 2>&1 && systemd-detect-virt --quiet --container } +get_cloud_style_installation() +{ + db_get $1/cloud_style_installation + $RET +} no_extra_removable_arg() { @@ -584,6 +589,9 @@ elif running_in_container; then # Skip grub-install in containers. : + elif get_cloud_style_installation "grub-pc"; then + basedev=$(grub-probe -t device /boot/ | sed -Ee 's/[0-9]+$//' -e 's/([0-9])p$/\1/') + grub-install --target=i386-pc "$basedev" elif test -e /boot/grub/core.img || \ test -e /boot/grub/@FIRST_CPU_PLATFORM@/core.img || \ test "$UPGRADE_FROM_GRUB_LEGACY" || test "$wubi_device"; then @@ -743,16 +751,16 @@ db_fset grub-pc/install_devices_empty seen false fi else - db_get grub-pc/install_devices_empty - if [ "$RET" = true ]; then - break - else - echo "You must correct your GRUB install devices before proceeding:" >&2 - echo >&2 - echo " DEBIAN_FRONTEND=dialog dpkg --configure grub-pc" >&2 - echo " dpkg --configure -a" >&2 - exit 1 # noninteractive - fi + # UBUNTU: Here we know that noniteractive frontend is used and + # install_devices are empty and install_devices_empty is false. + # This is hit in images where initial configuration was + # avoided due to 'running_in_container', but further + # noninteractive upgrades/reinstallations are made. + # We don't want to error out in such cases, instead continue + # for now, but still prompt on the next interactive run. + # (Prompoting might never have to happen e.g. if a + # service configures install_devices on first boot). + break fi else break diff -Nru grub2-unsigned-2.12/debian/rules grub2-unsigned-2.12/debian/rules --- grub2-unsigned-2.12/debian/rules 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/rules 2024-04-04 10:11:57.000000000 +0000 @@ -206,6 +206,7 @@ # rebuild grub, need a programmatic way to get the vendor, as it's used by build-efi-images # to create the monolithic Grub image and thus is needed to create the partitions on the EFI # media. Add it to the control file user metadata: XB-Efi-Vendor: $vendor +DPKG_VENDOR ?= $(shell dpkg-vendor --query vendor) SB_EFI_VENDOR ?= $(shell dpkg-vendor --query vendor | tr '[:upper:]' '[:lower:]') %: @@ -252,6 +253,9 @@ touch $@ debian/stamps/build-grub-common: debian/stamps/build-grub-$(COMMON_PLATFORM) +ifeq ($(with_check), yes) + pytest -q debian/test_grub_sort_version.py +endif touch $@ debian/stamps/configure-grub-none debian/stamps/configure-grub-pc debian/stamps/configure-grub-ieee1275 debian/stamps/configure-grub-coreboot debian/stamps/configure-grub-emu debian/stamps/configure-grub-uboot debian/stamps/configure-grub-yeeloong: @@ -416,6 +420,7 @@ if [ -e debian/$(1) ]; then \ debian/platform-subst \ PACKAGE="$(2)" \ + DPKG_VENDOR="$(DPKG_VENDOR)" \ DEFAULT_CMDLINE="$(DEFAULT_CMDLINE)" \ DEFAULT_TIMEOUT="$(DEFAULT_TIMEOUT)" \ DEFAULT_HIDDEN_TIMEOUT_BOOL="$(DEFAULT_HIDDEN_TIMEOUT_BOOL)" \ @@ -596,6 +601,7 @@ endif ifneq (,$(filter grub2-common,$(BUILD_PACKAGES))) sed -i \ + -e "s/@DPKG_VENDOR@/$(DPKG_VENDOR)/g" \ -e "s/@DEFAULT_CMDLINE@/$(DEFAULT_CMDLINE)/g" \ -e "s/@DEFAULT_TIMEOUT@/$(DEFAULT_TIMEOUT)/g" \ debian/grub2-common/usr/share/grub/default/grub diff -Nru grub2-unsigned-2.12/debian/sbat.ubuntu.csv.in grub2-unsigned-2.12/debian/sbat.ubuntu.csv.in --- grub2-unsigned-2.12/debian/sbat.ubuntu.csv.in 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/sbat.ubuntu.csv.in 2024-04-04 10:11:57.000000000 +0000 @@ -1,4 +1,4 @@ sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md grub,4,Free Software Foundation,grub,@UPSTREAM_VERSION@,https://www.gnu.org/software/grub/ -grub.ubuntu,1,Ubuntu,grub2,@DEB_VERSION@,https://www.ubuntu.com/ -grub.peimage,1,Canonical,grub2,@DEB_VERSION@,https://salsa.debian.org/grub-team/grub/-/blob/master/debian/patches/secure-boot/efi-use-peimage-shim.patch +grub.ubuntu,2,Ubuntu,grub2,@DEB_VERSION@,https://www.ubuntu.com/ +grub.peimage,2,Canonical,grub2,@DEB_VERSION@,https://salsa.debian.org/grub-team/grub/-/blob/master/debian/patches/secure-boot/efi-use-peimage-shim.patch diff -Nru grub2-unsigned-2.12/debian/templates.in grub2-unsigned-2.12/debian/templates.in --- grub2-unsigned-2.12/debian/templates.in 2024-01-29 11:06:12.000000000 +0000 +++ grub2-unsigned-2.12/debian/templates.in 2024-04-04 10:03:45.000000000 +0000 @@ -102,6 +102,11 @@ loader, then you should continue anyway. Otherwise, you should install GRUB somewhere. +Template: grub-efi/cloud_style_installation +Type: boolean +Default: false +_Description: Choose installation target based on the device containing /boot? + # still unused Template: grub2/kfreebsd_cmdline Type: string diff -Nru grub2-unsigned-2.12/debian/test_grub_sort_version.py grub2-unsigned-2.12/debian/test_grub_sort_version.py --- grub2-unsigned-2.12/debian/test_grub_sort_version.py 1970-01-01 00:00:00.000000000 +0000 +++ grub2-unsigned-2.12/debian/test_grub_sort_version.py 2024-04-04 10:11:57.000000000 +0000 @@ -0,0 +1,72 @@ +import os +import pytest +import subprocess + +GRUB_SORT_VERSION = "debian/grub-sort-version" + +def assert_grub_sort_version(input, output, flavour_order=""): + env = os.environ.copy() + env["LC_ALL"] = "C" + env["GRUB_FLAVOUR_ORDER"] = flavour_order + # Assert the output is as expected + result = subprocess.run([GRUB_SORT_VERSION], env=env, + input=input, encoding="utf-8", capture_output=True) + assert result.returncode == 0 + print(result.stdout) + assert result.stdout == output + # Then do the same in reverse mode too + result = subprocess.run([GRUB_SORT_VERSION, "-r"], env=env, + input=input, encoding="utf-8", capture_output=True) + assert result.returncode == 0 + assert result.stdout == "\n".join(output.rstrip().split("\n")[::-1]) + "\n" + +def test_empty_line(): + INPUT = """/boot/vmlinuz-6.5.0-10-generic 2 +/boot/vmlinuz-6.5.0-9-generic 2 + 2 +""" + + OUTPUT = """ 2 +/boot/vmlinuz-6.5.0-9-generic 2 +/boot/vmlinuz-6.5.0-10-generic 2 +""" + + assert_grub_sort_version(INPUT, OUTPUT) + +def test_custom_kernels(): + INPUT = """/boot/vmlinuz-6.6.0 2 +/boot/vmlinuz-6.5.0-10-generic 2 +/boot/vmlinuz-6.5.0-9-generic 2 +/boot/vmlinuz-6.5.9 2 +/boot/vmlinuz-6.5.8 2 +""" + + OUTPUT = """/boot/vmlinuz-6.5.0-9-generic 2 +/boot/vmlinuz-6.5.0-10-generic 2 +/boot/vmlinuz-6.5.8 2 +/boot/vmlinuz-6.5.9 2 +/boot/vmlinuz-6.6.0 2 +""" + + assert_grub_sort_version(INPUT, OUTPUT) + +def test_flavour_order(): + INPUT = """/boot/vmlinuz-6.5.0-10-generic 2 +/boot/vmlinuz-6.5.0-9-generic 2 +/boot/vmlinuz-6.5.0-9-aaa 2 +/boot/vmlinuz-6.5.0-9-aaa 1 +/boot/vmlinuz-6.5.8 2 +/boot/vmlinuz-6.5.9 2 +/boot/vmlinuz-6.6.0 2 +""" + + OUTPUT = """/boot/vmlinuz-6.5.8 2 +/boot/vmlinuz-6.5.9 2 +/boot/vmlinuz-6.6.0 2 +/boot/vmlinuz-6.5.0-9-aaa 1 +/boot/vmlinuz-6.5.0-9-aaa 2 +/boot/vmlinuz-6.5.0-9-generic 2 +/boot/vmlinuz-6.5.0-10-generic 2 +""" + + assert_grub_sort_version(INPUT, OUTPUT, flavour_order="generic aaa")