pool/systemd
SHA256
2
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

previous added patch was for v257, update it to apply cleanly on v256

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1563
This commit is contained in:
Franck Bui 2024-12-03 15:35:18 +00:00 committed by Git OBS Bridge
parent 941f6c37db
commit d44491fc0f
1 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
5005-Revert-boot-Make-initrd_prepare-semantically-equival.patch
View File

@ -1,19 +1,21 @@
From 6d370166c42d6bd0d6907acc75ce6f09ade1e629 Mon Sep 17 00:00:00 2001
From 2679d38fd571efd4073b8ee472e967b0add4c4b8 Mon Sep 17 00:00:00 2001
From: Franck Bui <fbui@suse.com>
Date: Mon, 2 Dec 2024 09:45:27 +0100
Date: Tue, 3 Dec 2024 16:32:42 +0100
Subject: [PATCH 1/1] Revert "boot: Make initrd_prepare() semantically
equivalent to combine_initrds()"
This reverts commit f8fa4222c9ac3e74e91c64e25e9532c99559cf99.
---
src/boot/boot.c | 56 ++++++++++++++-----------------------------------
1 file changed, 16 insertions(+), 40 deletions(-)
diff --git a/src/boot/boot.c b/src/boot/boot.c
index 129d6f8f5d..2d84b6c320 100644
--- a/src/boot/boot.c
+++ b/src/boot/boot.c
@@ -13,7 +13,6 @@
[fbui: adjust context]
---
src/boot/efi/boot.c | 69 +++++++++++----------------------------------
1 file changed, 16 insertions(+), 53 deletions(-)
diff --git a/src/boot/efi/boot.c b/src/boot/efi/boot.c
index 8d08fe01f7..f94b59db59 100644
--- a/src/boot/efi/boot.c
+++ b/src/boot/efi/boot.c
@@ -11,7 +11,6 @@
#include "initrd.h"
#include "linux.h"
#include "measure.h"
@ -21,7 +23,7 @@ index 129d6f8f5d..2d84b6c320 100644
#include "part-discovery.h"
#include "pe.h"
#include "proto/block-io.h"
@@ -2422,18 +2421,18 @@ static EFI_STATUS initrd_prepare(
@@ -2249,18 +2248,18 @@ static EFI_STATUS initrd_prepare(
EFI_FILE *root,
const BootEntry *entry,
char16_t **ret_options,
@ -43,7 +45,7 @@ index 129d6f8f5d..2d84b6c320 100644
*ret_initrd_size = 0;
return EFI_SUCCESS;
}
@@ -2447,6 +2446,7 @@ static EFI_STATUS initrd_prepare(
@@ -2274,6 +2273,7 @@ static EFI_STATUS initrd_prepare(
EFI_STATUS err;
size_t size = 0;
@ -51,7 +53,7 @@ index 129d6f8f5d..2d84b6c320 100644
STRV_FOREACH(i, entry->initrd) {
_cleanup_free_ char16_t *o = options;
@@ -2465,54 +2465,30 @@ static EFI_STATUS initrd_prepare(
@@ -2292,67 +2292,30 @@ static EFI_STATUS initrd_prepare(
if (err != EFI_SUCCESS)
return err;
@ -59,7 +61,20 @@ index 129d6f8f5d..2d84b6c320 100644
- return EFI_OUT_OF_RESOURCES;
- }
-
- _cleanup_pages_ Pages pages = xmalloc_initrd_pages(size);
-#if defined(__i386__) || defined(__x86_64__)
- _cleanup_pages_ Pages pages = xmalloc_pages(
- AllocateMaxAddress,
- EfiLoaderData,
- EFI_SIZE_TO_PAGES(size),
- UINT32_MAX /* Below 4G boundary. */);
-#else
- _cleanup_pages_ Pages pages = xmalloc_pages(
- AllocateAnyPages,
- EfiLoaderData,
- EFI_SIZE_TO_PAGES(size),
- 0 /* Ignored. */);
-#endif
-
- uint8_t *p = PHYSICAL_ADDRESS_TO_POINTER(pages.addr);
-
- STRV_FOREACH(i, entry->initrd) {
@ -115,7 +130,7 @@ index 129d6f8f5d..2d84b6c320 100644
*ret_initrd_size = size;
return EFI_SUCCESS;
}
@@ -2542,9 +2518,9 @@ static EFI_STATUS image_start(
@@ -2382,9 +2345,9 @@ static EFI_STATUS image_start(
return log_error_status(err, "Error making file device path: %m");
size_t initrd_size = 0;
@ -127,7 +142,7 @@ index 129d6f8f5d..2d84b6c320 100644
if (err != EFI_SUCCESS)
return log_error_status(err, "Error preparing initrd: %m");
@@ -2562,7 +2538,7 @@ static EFI_STATUS image_start(
@@ -2402,7 +2365,7 @@ static EFI_STATUS image_start(
}
_cleanup_(cleanup_initrd) EFI_HANDLE initrd_handle = NULL;