commit grub2 for openSUSE:Factory
Hello community, here is the log from the commit of package grub2 for openSUSE:Factory checked in at Thu Oct 28 15:16:28 CEST 2010. -------- --- grub2/grub2.changes 2010-10-25 14:39:27.000000000 +0200 +++ grub2/grub2.changes 2010-10-27 16:59:34.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Oct 27 16:57:13 CEST 2010 - jslaby@suse.de + +- fix vanishing of /boot/grub2/* if /boot/grub/device.map + doesn't exist + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grub2.spec ++++++ --- /var/tmp/diff_new_pack.vrQ1zS/_old 2010-10-28 15:16:07.000000000 +0200 +++ /var/tmp/diff_new_pack.vrQ1zS/_new 2010-10-28 15:16:07.000000000 +0200 @@ -34,7 +34,7 @@ %define _target_platform i386-%{_vendor}-%{_target_os}%{?_gnu} %endif Version: 1.98 -Release: 8 +Release: 9 Summary: Bootloader with support for Linux, Multiboot and more Group: System/Boot License: GPLv3+ @@ -111,20 +111,23 @@ %find_lang grub %post -exec >/dev/null 2>&1 +mkdir -p /boot/%{name}/ 2>/dev/null || true # Create device.map or reuse one from GRUB Legacy -if [ -e /boot/grub/device.map ] ; then +if [ ! -e /boot/%{name}/device.map ] ; then cp -u /boot/grub/device.map /boot/%{name}/device.map 2>/dev/null || %{name}-mkdevicemap +fi +if [ -e /boot/%{name}/device.map ]; 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 + %{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" + /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" - /sbin/update-bootloader --refresh + /sbin/update-bootloader --add --image /boot/%{name}/core.img --name="GNU GRUB 2" || true + /sbin/update-bootloader --refresh || true fi %preun ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de