diff options
| author |   Peter Levine <plevine457@gmail.com> | 2021-12-20 19:32:20 -0500 |
|---|---|---|
| committer |   Ben Kohler <bkohler@gentoo.org> | 2021-12-22 06:33:49 -0600 |
| commit | 0615caff91ed90c3489a5107b95383cd025037af (patch) | |
| tree | d39bfdb8411713afa8586a77c01c9bbe3db5d959 /sys-boot | |
| parent | sys-boot/os-prober: switch btrfs patch from openSUSE to Fedora (diff) | |
| download | gentoo-0615caff91ed90c3489a5107b95383cd025037af.tar.gz gentoo-0615caff91ed90c3489a5107b95383cd025037af.tar.bz2 gentoo-0615caff91ed90c3489a5107b95383cd025037af.zip | |
sys-boot/os-prober: add subsequent whitespace commit
Add a whitespace adjustment commit to
os-prober-1.79-handle-multiple-initrd-paths.patch, to bring the patch
inline with upstream HEAD.
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Peter Levine <plevine457@gmail.com>
Signed-off-by: Ben Kohler <bkohler@gentoo.org>
Diffstat (limited to 'sys-boot')
| -rw-r--r-- | sys-boot/os-prober/files/os-prober-1.79-handle-multiple-initrd-paths.patch | 17 |
1 files changed, 9 insertions, 8 deletions
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 index 0b477c17c362..ceab85a92727 100644 --- 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 @@ -2,14 +2,15 @@ Backport handling of multiple initrd paths, like those needed by Manjaro installations. Note, it still requires resolution of https://savannah.gnu.org/bugs/index.php?47681 on grub's end. -Commit: https://salsa.debian.org/installer-team/os-prober/-/commit/53b920e106f13acf87ef8a275161e20f94feeb8a +Commits: https://salsa.debian.org/installer-team/os-prober/-/commit/7641c2da0c81f78c5f2ee2a66a1c21350cab03fc + https://salsa.debian.org/installer-team/os-prober/-/commit/53b920e106f13acf87ef8a275161e20f94feeb8a --- a/linux-boot-probes/mounted/common/40grub2 +++ b/linux-boot-probes/mounted/common/40grub2 -@@ -78,11 +78,21 @@ - fi - ;; - initrd) +@@ -78,11 +78,21 @@ parse_grub_menu () { + fi + ;; + initrd) - initrd="$(echo "$2" | sed 's/(.*)//')" - # Initrd same. - if [ "$partition" != "$bootpart" ]; then @@ -30,6 +31,6 @@ Commit: https://salsa.debian.org/installer-team/os-prober/-/commit/53b920e106f13 + initrd="$initrd $initrd_path" + fi + done - ;; - "}") - entry_result + ;; + "}") + entry_result |