From c49cf023f491e0a5c4c945832c1943834c5420a9f2c3925764ef32187e28a0f5 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 24 Nov 2014 10:14:33 +0000 Subject: [PATCH] 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 --- grub2.changes | 5 +++++ grub2.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/grub2.changes b/grub2.changes index 3e9405e..a7f1131 100644 --- a/grub2.changes +++ b/grub2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Nov 14 16:06:00 UTC 2014 - Led + +- fix bashism in post script + ------------------------------------------------------------------- Thu Oct 30 15:18:16 CET 2014 - jdelvare@suse.de diff --git a/grub2.spec b/grub2.spec index 0b1b10d..589549b 100644 --- a/grub2.spec +++ b/grub2.spec @@ -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