]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #25222 from medhefgo/stub-cmdline
authorLuca Boccassi <bluca@debian.org>
Mon, 28 Nov 2022 14:49:17 +0000 (15:49 +0100)
committerGitHub <noreply@github.com>
Mon, 28 Nov 2022 14:49:17 +0000 (15:49 +0100)
stub: Fix cmdline handling

1  2 
src/boot/efi/boot.c
src/boot/efi/stub.c

Simple merge
index 6ece3cf7334cb0c4aaf7ac3927d01de3ad9e83f1,7c42a16c7017f194a4a618409b4d8754e770c944..023f8ae25586c87824c1921d4afbea788a94240a
@@@ -140,12 -184,10 +187,11 @@@ EFI_STATUS efi_main(EFI_HANDLE image, E
          EFI_PHYSICAL_ADDRESS linux_base, initrd_base, dt_base;
          _cleanup_(devicetree_cleanup) struct devicetree_state dt_state = {};
          EFI_LOADED_IMAGE_PROTOCOL *loaded_image;
-         UINTN addrs[_UNIFIED_SECTION_MAX] = {}, szs[_UNIFIED_SECTION_MAX] = {};
-         char *cmdline = NULL;
-         _cleanup_free_ char *cmdline_owned = NULL;
+         size_t addrs[_UNIFIED_SECTION_MAX] = {}, szs[_UNIFIED_SECTION_MAX] = {};
+         _cleanup_free_ char16_t *cmdline = NULL;
          int sections_measured = -1, parameters_measured = -1;
          bool sysext_measured = false, m;
 +        uint64_t loader_features = 0;
          EFI_STATUS err;
  
          InitializeLib(image, sys_table);