rpm/grub2
SHA256
1
0
Fork 0
forked from pool/grub2
Code Pull Requests Activity

Accepting request 349473 from home:olh:branches:Base:System

Browse Source 
- grub2-xen-pv-firmware.cfg: fix hd boot (boo#926795)

v2: args for menuentry

Please backport to dists where grub2-xen-pv-firmware.cfg/grub2-xen.cfg exists

OBS-URL: https://build.opensuse.org/request/show/349473
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=196
This commit is contained in:
Andrei Borzenkov 2015-12-19 08:41:39 +00:00 committed by Git OBS Bridge
parent a92ea02ca4
commit f43b54606a
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
grub2-xen-pv-firmware.cfg
View File

@ -41,20 +41,25 @@ if [ -n "${suse_cddev_content}" -a -n "${suse_cddev_product}" -a "${suse_cddev_c
set suse_cddev="${suse_cddev_content}"
fi
hdcfg_list="/boot/grub2/grub.cfg \
set hdcfg_list="\
/boot/grub2/grub.cfg \
/@/boot/grub2/grub.cfg \
/@/.snapshots/1/snapshot/boot/grub2/grub.cfg \
/.snapshots/1/snapshot/boot/grub2/grub.cfg \
/grub2/grub.cfg"
/grub2/grub.cfg\
"
hdlst_list="/boot/grub/menu.lst \
/grub/menu.lst"
set hdlst_list="\
/boot/grub/menu.lst \
/grub/menu.lst\
"
for c in ${hdcfg_list}; do
if search -s hddev -f "${c}"; then
menuentry "${hddev} Boot From Hard Disk ($c)" {
set root="${hddev}"
configfile "${c}"
menuentry "${hddev} Boot From Hard Disk (${c})" "${hddev}" "${c}" {
set root="${2}"
set cfg="${3}"
configfile "${cfg}"
}
break
fi
@ -62,9 +67,10 @@ done
for c in ${hdlst_list}; do
if search -s hddev -f "${c}"; then
menuentry "${hddev} Boot From Hard Disk (${c})" {
set root="${hddev}"
legacy_configfile "${c}"
menuentry "${hddev} Boot From Hard Disk (${c})" "${hddev}" "${c}" {
set root="${2}"
set cfg="${3}"
legacy_configfile "${cfg}"
}
break
fi

5
grub2.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Dec 17 11:04:06 UTC 2015 - olaf@aepfle.de
- grub2-xen-pv-firmware.cfg: fix hd boot (boo#926795)
-------------------------------------------------------------------
Wed Dec 16 05:04:37 UTC 2015 - arvidjaar@gmail.com