From d443be08bc729849d31b661c60b1e07cd747ccd995a7d5c5433bc293a8a66feb Mon Sep 17 00:00:00 2001 From: Shawn Dunn Date: Fri, 21 Feb 2014 15:14:53 +0000 Subject: [PATCH] Accepting request 223392 from home:trenn:branches:Base:System - Fix syntax error -> missing then - Correct path, it is /usr/bin/grub2-emu OBS-URL: https://build.opensuse.org/request/show/223392 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=104 --- dracut.changes | 6 ++++++ s390_add-user-space-grub-rule.patch | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dracut.changes b/dracut.changes index 25b7b8c..491d82d 100644 --- a/dracut.changes +++ b/dracut.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 21 14:56:20 UTC 2014 - trenn@suse.de + +- Fix syntax error -> missing then +- Correct path, it is /usr/bin/grub2-emu + ------------------------------------------------------------------- Mon Feb 17 18:51:58 UTC 2014 - trenn@suse.de diff --git a/s390_add-user-space-grub-rule.patch b/s390_add-user-space-grub-rule.patch index 15db127..d0ff99f 100644 --- a/s390_add-user-space-grub-rule.patch +++ b/s390_add-user-space-grub-rule.patch @@ -17,7 +17,7 @@ Index: dracut-036/modules.d/95grub2/module-setup.sh +# called by dracut +install() { + inst_hook cmdline 30 "$moddir/s390-grub2.sh" -+ inst_multiple grub-emu kexec ++ inst_multiple grub2-emu kexec +} + Index: dracut-036/modules.d/95grub2/s390-grub2.sh @@ -29,7 +29,7 @@ Index: dracut-036/modules.d/95grub2/s390-grub2.sh +# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- +# ex: ts=8 sw=4 sts=4 et filetype=sh +if getargbool 0 initgrub ; then -+ if [ -e /usr/bin/grub-emu ] -+ /boot/grub2/grub-emu ++ if [ -e /usr/bin/grub2-emu ]; then ++ /usr/bin/grub2-emu + fi +fi