Hello community, here is the log from the commit of package grub for openSUSE:Factory checked in at 2014-03-10 06:52:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grub (Old) and /work/SRC/openSUSE:Factory/.grub.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub" Changes: -------- --- /work/SRC/openSUSE:Factory/grub/grub.changes 2014-01-07 17:19:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.grub.new/grub.changes 2014-03-10 06:52:25.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Mar 4 16:03:11 UTC 2014 - [email protected] + +- %post changes from 2013-10-16 broke kiwi image creation. + Always copy over the boot stages even if we're not sure + yet whether they are needed (bnc#863293). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grub.spec ++++++ --- /var/tmp/diff_new_pack.atyFTG/_old 2014-03-10 06:52:26.000000000 +0100 +++ /var/tmp/diff_new_pack.atyFTG/_new 2014-03-10 06:52:26.000000000 +0100 @@ -200,6 +200,14 @@ %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz %install_info --info-dir=%{_infodir} %{_infodir}/multiboot.info.gz +# bnc#863293: make kiwi happy +# copy especially stage2 over, because it will be modified in-place ! +cp -p /usr/lib/grub/*stage1* /boot/grub/. 2>/dev/null || true +# Avoid fragmentation on reiserfs. +dd if=/usr/lib/grub/stage2 of=/boot/grub/stage2.new bs=256k 2>/dev/null +# should anything go wrong the system will remain bootable : +mv --backup=simple --suffix=.old /boot/grub/stage2{.new,} + if [ -e /etc/sysconfig/bootloader ] ; then source /etc/sysconfig/bootloader else @@ -214,16 +222,6 @@ echo "grub postinstall: grub is not the active boot loader" exit 0 fi - -# should anything go wrong the system will remain bootable : -if [ -e /boot/grub/stage2 ] ; then - mv /boot/grub/stage2{,.old} -fi -# copy especially stage2 over, because it will be modified in-place ! -cp -p /usr/lib/grub/*stage1* /boot/grub 2>/dev/null || true -# Avoid fragmentation on reiserfs. -dd if=/usr/lib/grub/stage2 of=/boot/grub/stage2 bs=256k -# bnc#682337 -- Dr. Schroeder's special ointment: if [ -x /bin/fsync ]; then fsync /boot/grub/stage2 fsync /boot/grub -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
