diff --git a/grub.macros b/grub.macros index 0fdd725f5b2bd86c26e6ab5fd98e2437611bad61..c6aa398f46f68a72913750b6b70010fcb5cda0ab 100644 --- a/grub.macros +++ b/grub.macros @@ -360,7 +360,6 @@ PYTHON=python3 ./autogen.sh \ --target=%{1} \\\ --with-grubdir=%{name} \\\ --program-transform-name=s,grub,%{name}, \\\ - --disable-grub-mount \\\ --disable-werror || ( cat config.log ; exit 1 ) \ git add . \ git commit -m "After efi configure" \ @@ -449,7 +448,6 @@ cd grub-%{1}-%{tarversion} \ --target=%{_target_platform} \\\ --with-grubdir=%{name} \\\ --program-transform-name=s,grub,%{name}, \\\ - --disable-grub-mount \\\ --disable-werror || ( cat config.log ; exit 1 ) \ git add . \ git commit -m "After legacy configure" \ diff --git a/grub2.spec b/grub2.spec index 352bdb866039393879359649cc124ba5cf5558ca..8e270a3010b69ed3af794fafa9ed35a81f445084 100644 --- a/grub2.spec +++ b/grub2.spec @@ -8,7 +8,7 @@ Name: grub2 Epoch: 1 Version: 2.04 -Release: 16 +Release: 17 Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -30,7 +30,7 @@ Source12: installkernel.in BuildRequires: gcc efi-srpm-macros flex bison binutils python3 ncurses-devel xz-devel BuildRequires: freetype-devel libusb-devel bzip2-devel rpm-devel rpm-libs BuildRequires: autoconf automake autogen device-mapper-devel freetype-devel git -BuildRequires: texinfo gettext-devel dejavu-sans-fonts help2man systemd +BuildRequires: texinfo gettext-devel dejavu-sans-fonts help2man systemd fuse-devel %ifarch %{golang_arches} BuildRequires: pesign >= 0.99-8 @@ -221,6 +221,7 @@ cat << EOF > grub2.conf # these have execstack, and break under selinux -b /usr/bin/grub2-script-check -b /usr/bin/grub2-mkrelpath +-b /usr/bin/grub2-mount -b /usr/bin/grub2-fstest -b /usr/sbin/grub2-bios-setup -b /usr/sbin/grub2-probe @@ -402,6 +403,7 @@ rm -r /boot/grub2.tmp/ || : %{_sbindir}/%{name}-set-default %{_bindir}/%{name}-editenv %{_bindir}/%{name}-mkpasswd-pbkdf2 +%{_bindir}/%{name}-mount %files tools-extra %defattr(-,root,root) @@ -449,6 +451,14 @@ rm -r /boot/grub2.tmp/ || : %{_datadir}/man/man* %changelog +* Tue May 25 2021 yanan - 2.04-17 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:add grub2-mount to grub2-tools-minimal subpackage + the dependency om dmsetup is deleted from os-prober,and the grub2-mount command is required. + so add this command. + * Tue Mar 30 2021 zhangqiumiao - 2.04-16 - Type:bugfix - ID:NA