forked from pool/grub2
Accepting request 135095 from devel:openSUSE:Factory
- add 20_memtest86+ (bnc#780622) (forwarded request 135094 from arvidjaar) OBS-URL: https://build.opensuse.org/request/show/135095 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grub2?expand=0&rev=44
This commit is contained in:
Stephan Kulow
committed by
Git OBS Bridge
Git OBS Bridge
parent
e89fa67c56
commit
2068a32a67
104
grub2.spec
104
grub2.spec
@@ -78,6 +78,7 @@ Source4: grub2.rpmlintrc
|
||||
# rsync -Lrtvz translationproject.org::tp/latest/grub/ po
|
||||
Source5: translations-20120622.tar.xz
|
||||
Source6: grub2-once
|
||||
Source7: 20_memtest86+
|
||||
Source1000: PATCH_POLICY
|
||||
Patch0: grub2-correct-font-path.patch
|
||||
Patch1: rename-grub-info-file-to-grub2.patch
|
||||
@@ -254,6 +255,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
|
||||
# Script that makes part of grub.cfg persist across updates
|
||||
install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/grub.d/
|
||||
|
||||
# Script to generate memtest86+ menu entry
|
||||
install -m 755 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/grub.d/
|
||||
|
||||
# Ghost config file
|
||||
install -d $RPM_BUILD_ROOT/boot/%{name}
|
||||
touch $RPM_BUILD_ROOT/boot/%{name}/grub.cfg
|
||||
@@ -272,39 +276,93 @@ install -m 755 -D %{SOURCE6} $RPM_BUILD_ROOT%{_sbindir}/grub2-once
|
||||
/sbin/install-info %{_infodir}/grub-dev.info %{_infodir}/dir || :
|
||||
/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
|
||||
|
||||
mkdir -p /boot/%{name}/ 2>/dev/null || true
|
||||
# Determine the partition with /boot
|
||||
BOOT_PARTITION=$(df -h /boot |(read; awk '{print $1; exit}'))
|
||||
# Generate core.img, but don't let it be installed in boot sector
|
||||
%{name}-install --grub-setup=/bin/true $BOOT_PARTITION || true
|
||||
exec >/dev/null 2>&1
|
||||
# Remove stale menu.lst entries
|
||||
/sbin/update-bootloader --remove --image /boot/%{name}/core.img --name="GNU GRUB 2" || true
|
||||
# Add core.img as multiboot kernel to GRUB Legacy menu
|
||||
/sbin/update-bootloader --add --image /boot/%{name}/core.img --name="GNU GRUB 2" || true
|
||||
/sbin/update-bootloader --refresh || true
|
||||
# To check by current loader settings
|
||||
if [ -f %{_sysconfdir}/sysconfig/bootloader ]; then
|
||||
. %{_sysconfdir}/sysconfig/bootloader
|
||||
fi
|
||||
|
||||
# If the grub is the current loader, we'll handle the grub2 testing entry
|
||||
if [ "x${LOADER_TYPE}" = "xgrub" ]; then
|
||||
|
||||
exec >/dev/null 2>&1
|
||||
|
||||
# check if entry for grub2's core.img exists in the config
|
||||
# if yes, we will correct obsoleted path and update grub2 stuff and config to make it work
|
||||
# if no, do nothing
|
||||
if [ -f /boot/grub/menu.lst ]; then
|
||||
|
||||
# If grub config contains obsolete core.img path, remove and use the new one
|
||||
if /usr/bin/grep -l "^\s*kernel\s*.*/boot/%{name}/core.img" /boot/grub/menu.lst; then
|
||||
/sbin/update-bootloader --remove --image /boot/%{name}/core.img || true
|
||||
/sbin/update-bootloader --add --image /boot/%{name}/i386-pc/core.img --name "GNU GRUB 2" || true
|
||||
fi
|
||||
|
||||
# Install grub2 stuff and config to make the grub2 testing entry to work with updated version
|
||||
if /usr/bin/grep -l "^\s*kernel\s*.*/boot/%{name}/i386-pc/core.img" /boot/grub/menu.lst; then
|
||||
# Determine the partition with /boot
|
||||
BOOT_PARTITION=$(df -h /boot |(read; awk '{print $1; exit}'))
|
||||
# Generate core.img, but don't let it be installed in boot sector
|
||||
%{name}-install --grub-setup=/bin/true $BOOT_PARTITION || true
|
||||
# Create a working grub2 config, otherwise that entry is un-bootable
|
||||
/usr/sbin/grub2-mkconfig -o /boot/%{name}/grub.cfg
|
||||
fi
|
||||
fi
|
||||
|
||||
elif [ "x${LOADER_TYPE}" = "xgrub2" ]; then
|
||||
|
||||
# It's enought to call update-bootloader --refesh to install grub2 and update it's config
|
||||
/sbin/update-bootloader --refresh || true
|
||||
fi
|
||||
|
||||
%ifarch %{efi}
|
||||
|
||||
%post efi
|
||||
/sbin/install-info %{_infodir}/grub-dev.info %{_infodir}/dir || :
|
||||
/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
|
||||
|
||||
# To check by current loader settings
|
||||
if [ -f %{_sysconfdir}/sysconfig/bootloader ]; then
|
||||
. %{_sysconfdir}/etc/sysconfig/bootloader
|
||||
fi
|
||||
if [ "x${LOADER_TYPE}" = "xgrub2-efi" ]; then
|
||||
|
||||
# It's enought to call update-bootloader --refesh to install grub2 and update it's config
|
||||
/sbin/update-bootloader --refresh || true
|
||||
fi
|
||||
%endif
|
||||
|
||||
%preun
|
||||
if [ $1 = 0 ]; then
|
||||
/sbin/install-info --delete %{_infodir}/grub-dev.info %{_infodir}/dir || :
|
||||
/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
|
||||
exec >/dev/null
|
||||
if [ -e /boot/%{name}/core.img ] ; then
|
||||
/sbin/update-bootloader --remove --image /boot/%{name}/core.img --name="GNU GRUB 2" || :
|
||||
/sbin/update-bootloader --refresh || :
|
||||
fi
|
||||
# Cleanup installed files
|
||||
rm -f /boot/%{name}/*.mod
|
||||
rm -f /boot/%{name}/*.img
|
||||
rm -f /boot/%{name}/*.lst
|
||||
rm -f /boot/%{name}/device.map
|
||||
/sbin/install-info --delete %{_infodir}/grub-dev.info %{_infodir}/dir || :
|
||||
/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
|
||||
|
||||
# To check by current loader settings
|
||||
if [ -f %{_sysconfdir}/sysconfig/bootloader ]; then
|
||||
. %{_sysconfdir}/sysconfig/bootloader
|
||||
fi
|
||||
|
||||
if [ "x${LOADER_TYPE}" = "xgrub" ]; then
|
||||
|
||||
exec >/dev/null 2>&1
|
||||
|
||||
if [ -f /boot/grub/menu.lst ]; then
|
||||
|
||||
# Remove grub2 testing entry in menu.lst if has any
|
||||
for i in /boot/%{name}/core.img /boot/%{name}/i386-pc/core.img; do
|
||||
if /usr/bin/grep -l "^\s*kernel\s*.*$i" /boot/grub/menu.lst; then
|
||||
/sbin/update-bootloader --remove --image "$i" || true
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
# Cleanup config, to not confuse some tools determining bootloader in use
|
||||
rm -f /boot/%{name}/grub.cfg
|
||||
|
||||
# Cleanup installed files
|
||||
# Unless grub2 provides grub2-uninstall, we don't remove any file because
|
||||
# we have no idea what's been installed. (And a blind remove is dangerous
|
||||
# to remove user's or other package's file accidently ..)
|
||||
fi
|
||||
fi
|
||||
|
||||
%ifarch %{efi}
|
||||
|
||||
Reference in New Issue
Block a user