From 0e75e4b5f513586383d62cec4b21e0a17a5d24a0 Mon Sep 17 00:00:00 2001 From: Davide Cavalca Date: Jun 10 2021 16:28:25 +0000 Subject: Enable grub2-mount --- diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros index 98ad11a..b94cbd3 100644 --- a/SOURCES/grub.macros +++ b/SOURCES/grub.macros @@ -343,7 +343,6 @@ PYTHON=python3 ./autogen.sh \ --target=%{1} \\\ --with-grubdir=%{name} \\\ --program-transform-name=s,grub,%{name}, \\\ - --disable-grub-mount \\\ --with-debug-timestamps \\\ --enable-boot-time \\\ --disable-werror || ( cat config.log ; exit 1 ) \ diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec index 7913939..87996a9 100644 --- a/SPECS/grub2.spec +++ b/SPECS/grub2.spec @@ -39,6 +39,7 @@ BuildRequires: gcc efi-srpm-macros BuildRequires: flex bison binutils python3-devel BuildRequires: ncurses-devel xz-devel bzip2-devel BuildRequires: freetype-devel libusb-devel +BuildRequires: fuse-devel BuildRequires: rpm-devel BuildRequires: rpm-devel rpm-libs BuildRequires: autoconf automake autogen device-mapper-devel @@ -222,6 +223,7 @@ cat << EOF > ${RPM_BUILD_ROOT}%{_sysconfdir}/prelink.conf.d/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 @@ -376,6 +378,7 @@ fi %{_sbindir}/%{name}-set*password %{_bindir}/%{name}-editenv %{_bindir}/%{name}-mkpasswd-pbkdf2 +%{_bindir}/%{name}-mount %{_datadir}/man/man3/%{name}-get-kernel-settings* %{_datadir}/man/man8/%{name}-set-default*