| 1 |
commit: 0615caff91ed90c3489a5107b95383cd025037af |
| 2 |
Author: Peter Levine <plevine457 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Dec 21 00:32:20 2021 +0000 |
| 4 |
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 22 12:33:49 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0615caff |
| 7 |
|
| 8 |
sys-boot/os-prober: add subsequent whitespace commit |
| 9 |
|
| 10 |
Add a whitespace adjustment commit to |
| 11 |
os-prober-1.79-handle-multiple-initrd-paths.patch, to bring the patch |
| 12 |
inline with upstream HEAD. |
| 13 |
|
| 14 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 15 |
Signed-off-by: Peter Levine <plevine457 <AT> gmail.com> |
| 16 |
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org> |
| 17 |
|
| 18 |
.../os-prober-1.79-handle-multiple-initrd-paths.patch | 17 +++++++++-------- |
| 19 |
1 file changed, 9 insertions(+), 8 deletions(-) |
| 20 |
|
| 21 |
diff --git a/sys-boot/os-prober/files/os-prober-1.79-handle-multiple-initrd-paths.patch b/sys-boot/os-prober/files/os-prober-1.79-handle-multiple-initrd-paths.patch |
| 22 |
index 0b477c17c362..ceab85a92727 100644 |
| 23 |
--- a/sys-boot/os-prober/files/os-prober-1.79-handle-multiple-initrd-paths.patch |
| 24 |
+++ b/sys-boot/os-prober/files/os-prober-1.79-handle-multiple-initrd-paths.patch |
| 25 |
@@ -2,14 +2,15 @@ Backport handling of multiple initrd paths, like those needed by Manjaro |
| 26 |
installations. Note, it still requires resolution of |
| 27 |
https://savannah.gnu.org/bugs/index.php?47681 on grub's end. |
| 28 |
|
| 29 |
-Commit: https://salsa.debian.org/installer-team/os-prober/-/commit/53b920e106f13acf87ef8a275161e20f94feeb8a |
| 30 |
+Commits: https://salsa.debian.org/installer-team/os-prober/-/commit/7641c2da0c81f78c5f2ee2a66a1c21350cab03fc |
| 31 |
+ https://salsa.debian.org/installer-team/os-prober/-/commit/53b920e106f13acf87ef8a275161e20f94feeb8a |
| 32 |
|
| 33 |
--- a/linux-boot-probes/mounted/common/40grub2 |
| 34 |
+++ b/linux-boot-probes/mounted/common/40grub2 |
| 35 |
-@@ -78,11 +78,21 @@ |
| 36 |
- fi |
| 37 |
- ;; |
| 38 |
- initrd) |
| 39 |
+@@ -78,11 +78,21 @@ parse_grub_menu () { |
| 40 |
+ fi |
| 41 |
+ ;; |
| 42 |
+ initrd) |
| 43 |
- initrd="$(echo "$2" | sed 's/(.*)//')" |
| 44 |
- # Initrd same. |
| 45 |
- if [ "$partition" != "$bootpart" ]; then |
| 46 |
@@ -30,6 +31,6 @@ Commit: https://salsa.debian.org/installer-team/os-prober/-/commit/53b920e106f13 |
| 47 |
+ initrd="$initrd $initrd_path" |
| 48 |
+ fi |
| 49 |
+ done |
| 50 |
- ;; |
| 51 |
- "}") |
| 52 |
- entry_result |
| 53 |
+ ;; |
| 54 |
+ "}") |
| 55 |
+ entry_result |
Archives