Accepting request 149277 from home:arvidjaar:bnc:799457

- fix os-prober-1.49-fix-grub2.cfg-parsing.patch (bnc#799457)
  * initrd was missing
  * entries sometimes were not emitted

OBS-URL: https://build.opensuse.org/request/show/149277
OBS-URL: https://build.opensuse.org/package/show/Base:System/os-prober?expand=0&rev=14
This commit is contained in:
Andrei Borzenkov 2013-01-20 06:27:35 +00:00 committed by Git OBS Bridge
parent 2decebc005
commit fad4a64f9a
2 changed files with 12 additions and 10 deletions

View File

@ -85,7 +85,7 @@ Index: os-prober/linux-boot-probes/mounted/common/40grub2
# Hack alert: sed off any (hdn,n) but
# assume the kernel is on the same
# partition.
@@ -73,14 +83,17 @@ parse_grub_menu () {
@@ -73,7 +83,13 @@ parse_grub_menu () {
kernel="/boot$kernel"
fi
;;
@ -94,18 +94,13 @@ Index: os-prober/linux-boot-probes/mounted/common/40grub2
+ # And here we do NOT want to strip off
+ # existing quting, which will be transferred
+ # verbatim in new grub.cfg
+ set -f
+ set -- $line
+ set +f
initrd="$(echo "$2" | sed 's/(.*)//')"
# Initrd same.
if [ "$partition" != "$bootpart" ]; then
initrd="/boot$initrd"
fi
;;
- "}")
+ "}*")
entry_result
;;
esac
@@ -89,11 +102,20 @@ parse_grub_menu () {
@@ -89,11 +105,20 @@ parse_grub_menu () {
entry_result
}

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sat Jan 19 13:41:59 UTC 2013 - arvidjaar@gmail.com
- fix os-prober-1.49-fix-grub2.cfg-parsing.patch (bnc#799457)
* initrd was missing
* entries sometimes were not emitted
-------------------------------------------------------------------
Wed Jan 16 18:09:08 UTC 2013 - arvidjaar@gmail.com