- Added 95grub2 module for s390x

OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=99

dracut.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Feb 13 21:38:38 UTC 2014 - jjolly@suse.com
+
+- Added 95grub2 module for s390x
+
 -------------------------------------------------------------------
 Thu Feb 13 14:10:16 UTC 2014 - pwieczorkiewicz@suse.com
 

dracut.spec

@@ -17,6 +17,7 @@
 
 
 %define dracutlibdir %{_libexecdir}/dracut
+
 Name:           dracut
 Version:        036
 Release:        0
@@ -40,6 +41,7 @@ Patch14:        suse_grub_manpage.patch
 Patch15:        replace_dhclient_with_wickedd_dhcp_supplicants.patch
 Patch16:        fix-iscsi-firmware.patch
 Patch17:        remove-iscsiuio.patch
+Patch18:        s390_add-user-space-grub-rule.patch
 BuildRequires:  asciidoc
 BuildRequires:  bash
 BuildRequires:  docbook-xsl-stylesheets
@@ -62,6 +64,9 @@ Requires:       systemd-sysvinit
 Requires:       udev > 166
 Requires:       util-linux >= 2.21
 Requires:       xz
+%ifarch s390x
+Requires:       grub2
+%endif
 Recommends:     binutils
 Recommends:     logrotate
 Obsoletes:      mkinitrd < 2.8.2
@@ -115,6 +120,7 @@ This package contains tools to assemble the local initrd and host configuration.
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
 
 %build
 %configure\
@@ -174,6 +180,8 @@ install -m 0644 dracut.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/dracut
 install -D -m 0755 %{SOURCE4} %{buildroot}/sbin/purge-kernels
 install -m 644 %{SOURCE5} %{buildroot}/%{_unitdir}/purge-kernels.service
 
+chmod 755 %{buildroot}/%{dracutlibdir}/modules.d/95grub2/*
+
 %pre
 %service_add_pre purge-kernels.service
 
@@ -259,6 +267,7 @@ install -m 644 %{SOURCE5} %{buildroot}/%{_unitdir}/purge-kernels.service
 %{dracutlibdir}/modules.d/95dasd_mod
 %{dracutlibdir}/modules.d/95dasd_rules
 %{dracutlibdir}/modules.d/95fstab-sys
+%{dracutlibdir}/modules.d/95grub2
 %{dracutlibdir}/modules.d/95zfcp
 %{dracutlibdir}/modules.d/95zfcp_rules
 %{dracutlibdir}/modules.d/95terminfo

s390_add-user-space-grub-rule.patch

@@ -0,0 +1,35 @@
+Index: dracut-036/modules.d/95grub2/module-setup.sh
+===================================================================
+--- /dev/null
++++ dracut-036/modules.d/95grub2/module-setup.sh
+@@ -0,0 +1,17 @@
++#!/bin/bash
++# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
++# ex: ts=8 sw=4 sts=4 et filetype=sh
++
++# called by dracut
++check() {
++    local _arch=$(uname -m)
++    [ "$_arch" = "s390" -o "$_arch" = "s390x" ] || return 1
++    return 0
++}
++
++# called by dracut
++install() {
++    inst_hook cmdline 30 "$moddir/s390-grub2.sh"
++    inst_multiple grub-emu kexec
++}
++
+Index: dracut-036/modules.d/95grub2/s390-grub2.sh
+===================================================================
+--- /dev/null
++++ dracut-036/modules.d/95grub2/s390-grub2.sh
+@@ -0,0 +1,8 @@
++#!/bin/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
++  fi
++fi