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

Accepting request 349625 from Base:System

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/349625
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grub2?expand=0&rev=129
This commit is contained in:
Dominique Leuenberger 2015-12-20 09:51:36 +00:00 committed by Git OBS Bridge
commit b07b60b9a7
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}" set suse_cddev="${suse_cddev_content}"
fi fi
hdcfg_list="/boot/grub2/grub.cfg \ set hdcfg_list="\
/boot/grub2/grub.cfg \
/@/boot/grub2/grub.cfg \ /@/boot/grub2/grub.cfg \
/@/.snapshots/1/snapshot/boot/grub2/grub.cfg \ /@/.snapshots/1/snapshot/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 \ set hdlst_list="\
/grub/menu.lst" /boot/grub/menu.lst \
/grub/menu.lst\
"
for c in ${hdcfg_list}; do for c in ${hdcfg_list}; do
if search -s hddev -f "${c}"; then if search -s hddev -f "${c}"; then
menuentry "${hddev} Boot From Hard Disk ($c)" { menuentry "${hddev} Boot From Hard Disk (${c})" "${hddev}" "${c}" {
set root="${hddev}" set root="${2}"
configfile "${c}" set cfg="${3}"
configfile "${cfg}"
} }
break break
fi fi
@ -62,9 +67,10 @@ done
for c in ${hdlst_list}; do for c in ${hdlst_list}; do
if search -s hddev -f "${c}"; then if search -s hddev -f "${c}"; then
menuentry "${hddev} Boot From Hard Disk (${c})" { menuentry "${hddev} Boot From Hard Disk (${c})" "${hddev}" "${c}" {
set root="${hddev}" set root="${2}"
legacy_configfile "${c}" set cfg="${3}"
legacy_configfile "${cfg}"
} }
break break
fi 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 Wed Dec 16 05:04:37 UTC 2015 - arvidjaar@gmail.com