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
This commit is contained in:
Shawn Dunn 2014-02-21 15:14:53 +00:00 committed by Git OBS Bridge
parent 41bd5806b6
commit d443be08bc
2 changed files with 9 additions and 3 deletions

View File

@ -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 Mon Feb 17 18:51:58 UTC 2014 - trenn@suse.de

View File

@ -17,7 +17,7 @@ Index: dracut-036/modules.d/95grub2/module-setup.sh
+# called by dracut +# called by dracut
+install() { +install() {
+ inst_hook cmdline 30 "$moddir/s390-grub2.sh" + 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 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; -*- +# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh +# ex: ts=8 sw=4 sts=4 et filetype=sh
+if getargbool 0 initgrub ; then +if getargbool 0 initgrub ; then
+ if [ -e /usr/bin/grub-emu ] + if [ -e /usr/bin/grub2-emu ]; then
+ /boot/grub2/grub-emu + /usr/bin/grub2-emu
+ fi + fi
+fi +fi