Accepting request 261982 from Base:System

1

OBS-URL: https://build.opensuse.org/request/show/261982
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grub2?expand=0&rev=104
This commit is contained in:
Dominique Leuenberger 2014-11-24 10:14:33 +00:00 committed by Git OBS Bridge
parent 82928bcff7
commit c49cf023f4
2 changed files with 6 additions and 1 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Nov 14 16:06:00 UTC 2014 - Led <ledest@gmail.com>
- fix bashism in post script
-------------------------------------------------------------------
Thu Oct 30 15:18:16 CET 2014 - jdelvare@suse.de

View File

@ -674,7 +674,7 @@ if [ "x${LOADER_TYPE}" = "xgrub" ]; then
# Install grub2 stuff and config to make the grub2 testing entry to work with updated version
if /usr/bin/grep -l "^\s*kernel\s*.*/boot/%{name}/i386-pc/core.img" /boot/grub/menu.lst; then
# Determine the partition with /boot
BOOT_PARTITION=$(df -h /boot |(read; awk '{print $1; exit}'))
BOOT_PARTITION=$(df -h /boot | sed -n '2s/[[:blank:]].*//p')
# Generate core.img, but don't let it be installed in boot sector
%{name}-install --no-bootsector $BOOT_PARTITION || true
# Create a working grub2 config, otherwise that entry is un-bootable