Hello community,
here is the log from the commit of package grub2 for openSUSE:Factory checked
in at 2017-01-19 10:38:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
and /work/SRC/openSUSE:Factory/.grub2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub2"
Changes:
--------
--- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2017-01-09
11:52:41.544002808 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2017-01-19
10:38:18.691957412 +0100
@@ -1,0 +2,12 @@
+Mon Jan 16 10:15:52 UTC 2017 - matwey.korni...@gmail.com
+
+- Add serial module to efi image.
+ Serial terminal is still useful even with EFI Secure Boot
+
+-------------------------------------------------------------------
+Wed Jan 11 06:58:56 UTC 2017 - mch...@suse.com
+
+- Support %posttrans with marcos provided by update-bootloader-rpm-macros
+ package (bsc#997317)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ grub2.spec ++++++
--- /var/tmp/diff_new_pack.GY3lj3/_old 2017-01-19 10:38:21.163608779 +0100
+++ /var/tmp/diff_new_pack.GY3lj3/_new 2017-01-19 10:38:21.167608215 +0100
@@ -57,6 +57,9 @@
BuildRequires: systemd-rpm-macros
%define has_systemd 1
%endif
+%if 0%{?suse_version} > 1320
+BuildRequires: update-bootloader-rpm-macros
+%endif
# Modules code is dynamically loaded and collected from a _fixed_ path.
%define _libdir %{_exec_prefix}/lib
@@ -298,8 +301,12 @@
Group: System/Boot
Requires: %{name} = %{version}-%{release}
Requires(post): %{name} = %{version}-%{release}
+%if 0%{?update_bootloader_requires:1}
+%update_bootloader_requires
+%else
Requires: perl-Bootloader
Requires(post): perl-Bootloader
+%endif
%ifarch s390x
# required utilities by grub2-s390x-04-grub2-install.patch
# use 'showconsole' to determine console device. (bnc#876743)
@@ -337,8 +344,12 @@
%endif
Requires: %{name} = %{version}-%{release}
Requires(post): %{name} = %{version}-%{release}
+%if 0%{?update_bootloader_requires:1}
+%update_bootloader_requires
+%else
Requires: perl-Bootloader >= 0.706
Requires(post): perl-Bootloader >= 0.706
+%endif
Provides: %{name}-efi = %{version}-%{release}
Obsoletes: %{name}-efi < %{version}-%{release}
@@ -566,7 +577,7 @@
CD_MODULES="${CD_MODULES} linux"
%endif
-GRUB_MODULES="${CD_MODULES} ${FS_MODULES} ${PXE_MODULES} ${CRYPTO_MODULES}
mdraid09 mdraid1x lvm"
+GRUB_MODULES="${CD_MODULES} ${FS_MODULES} ${PXE_MODULES} ${CRYPTO_MODULES}
mdraid09 mdraid1x lvm serial"
./grub-mkimage -O %{grubefiarch} -o grub.efi --prefix= \
-d grub-core ${GRUB_MODULES}
#./grub-mkimage -O %{grubefiarch} -o grub.efi -d grub-core part_gpt hfsplus
fat \
@@ -765,6 +776,9 @@
%if ! 0%{?only_efi:1}
%post %{grubarch}
+%if 0%{?update_bootloader_check_type_reinit_post:1}
+%update_bootloader_check_type_reinit_post grub2
+%else
# To check by current loader settings
if [ -f %{_sysconfdir}/sysconfig/bootloader ]; then
. %{_sysconfdir}/sysconfig/bootloader
@@ -808,10 +822,17 @@
fi
%endif
+%posttrans %{grubarch}
+%{?update_bootloader_posttrans}
+
+%endif
+
%ifarch %{efi}
%post %{grubefiarch}
-
+%if 0%{?update_bootloader_check_type_reinit_post:1}
+%update_bootloader_check_type_reinit_post grub2-efi
+%else
# To check by current loader settings
if [ -f %{_sysconfdir}/sysconfig/bootloader ]; then
. %{_sysconfdir}/sysconfig/bootloader
@@ -842,13 +863,21 @@
exit 0
%endif
+%posttrans %{grubefiarch}
+%{?update_bootloader_posttrans}
+
+%endif
+
%preun
%service_del_preun grub2-once.service
if [ $1 = 0 ]; then
/sbin/install-info --delete %{_infodir}/grub-dev.info %{_infodir}/dir || :
/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
-%if ! 0%{?only_efi:1}
+# We did not add core.img to grub1 menu.lst in new update-bootloader macro as
what
+# the old %post ever did, then the %preun counterpart which removed the added
core.img
+# entry from old %post can be skipped entirely if having new macro in use.
+%if ! 0%{?update_bootloader_posttrans:1}%{?only_efi:1}
# To check by current loader settings
if [ -f %{_sysconfdir}/sysconfig/bootloader ]; then
. %{_sysconfdir}/sysconfig/bootloader
