SHA256
1
0
forked from pool/grub2

Accepting request 703735 from home:rwill:branches:Base:System

- Check/refresh zipl-kernel before hibernate on s390x.  (bsc#940457)
  (Getting rid of hardcoded 'vmlinuz', which failed on PPC as well.)
- Try to refresh zipl-kernel on failed kexec.  (bsc#1127293)
- Fully support "previous" zipl-kernel,
  with 'mem=1G' being available on dedicated entries.  (bsc#928131)

OBS-URL: https://build.opensuse.org/request/show/703735
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=333
This commit is contained in:
2019-05-20 06:03:38 +00:00
committed by Git OBS Bridge
parent 591f180452
commit df62b2deb2
6 changed files with 464 additions and 94 deletions

View File

@@ -941,6 +941,8 @@ install -m 755 -d $R%{dracutgrubmoddir}
for f in module-setup.sh grub2.sh; do
mv $R%{_datadir}/%{name}/%{grubarch}/dracut-$f $R%{dracutgrubmoddir}/$f
done
mv $R%{_datadir}/%{name}/%{grubarch}/dracut-zipl-refresh \
$R%{_datadir}/%{name}/zipl-refresh
rm -f $R%{_sysconfdir}/grub.d/30_os-prober
perl -ni -e '
@@ -1149,6 +1151,7 @@ fi
%config(noreplace) %{_sysconfdir}/default/zipl2grub.conf.in
%{dracutlibdir}
%{_sbindir}/%{name}-zipl-setup
%{_datadir}/%{name}/zipl-refresh
%endif
%{_sbindir}/%{name}-install
%{_sbindir}/%{name}-mkconfig