[PATCH 1/2] cryptodisk: Fix translatable message

[PATCH 1/2] cryptodisk: Fix translatable message

[Vladimir Serbinenko]

Fixes bug #64408.
Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
---
 grub-core/disk/cryptodisk.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c
index f98acade6..5e1eb2743 100644
--- a/grub-core/disk/cryptodisk.c
+++ b/grub-core/disk/cryptodisk.c
@@ -1359,9 +1359,9 @@ grub_cmd_cryptomount (grub_extcmd_context_t ctxt, int argc, char **args)
 
       if (keyfile_offset > keyfile->size)
 	return grub_error (GRUB_ERR_OUT_OF_RANGE,
-			   N_("Keyfile offset, %llu, is greater than"
-			      "keyfile size, %" PRIuGRUB_UINT64_T),
-			   keyfile_offset, keyfile->size);
+			   N_("Keyfile offset, %llu, is greater than "
+			      "keyfile size, %llu"),
+			   keyfile_offset, (unsigned long long) keyfile->size);
 
       if (grub_file_seek (keyfile, (grub_off_t) keyfile_offset) == (grub_off_t) -1)
 	return grub_errno;
-- 
2.39.2


_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel

[PATCH 2/2] emu/linux: Fix determination of program name

[Vladimir Serbinenko]

Current code works only if package matches binary name transformation rules.
It's often true but is no waz guaranteed

Fixes bug #64410

Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
---
 grub-core/loader/emu/linux.c | 3 ++-
 include/grub/emu/misc.h      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/grub-core/loader/emu/linux.c b/grub-core/loader/emu/linux.c
index 7de3f7f86..2a55b8387 100644
--- a/grub-core/loader/emu/linux.c
+++ b/grub-core/loader/emu/linux.c
@@ -68,7 +68,8 @@ grub_linux_boot (void)
     }
 
   if (kexecute < 1)
-    grub_fatal (N_("use '"PACKAGE"-emu --kexec' to force a system restart"));
+    grub_fatal (N_("use '%s %s' to force a system restart"),
+		program_name, "--kexec");
 
   grub_dprintf ("linux", "Performing 'systemctl kexec' (%s) ",
 		(kexecute==1) ? "do-or-die" : "just-in-case");
diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h
index 01056954b..fa959ebe7 100644
--- a/include/grub/emu/misc.h
+++ b/include/grub/emu/misc.h
@@ -31,7 +31,7 @@
 #include <grub/util/misc.h>
 
 extern int verbosity;
-extern const char *program_name;
+extern const char *EXPORT_VAR(program_name);
 
 void grub_init_all (void);
 void grub_fini_all (void);
-- 
2.39.2


_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel

Re: [PATCH 2/2] emu/linux: Fix determination of program name

[Daniel Kiper]

On Mon, Jun 17, 2024 at 03:56:31PM +0300, Vladimir Serbinenko wrote:
> Current code works only if package matches binary name transformation rules.
> It's often true but is no waz guaranteed
>
> Fixes bug #64410
>
> Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>

Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>

Daniel

_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel

Re: [PATCH 1/2] cryptodisk: Fix translatable message

[Daniel Kiper]

On Mon, Jun 17, 2024 at 03:56:30PM +0300, Vladimir Serbinenko wrote:
> Fixes bug #64408.
> Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>

Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>

Daniel

_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel