Hello community, here is the log from the commit of package lilo checked in at Mon Sep 29 17:58:14 CEST 2008. -------- --- arch/i386/lilo/lilo.changes 2008-09-26 08:47:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/lilo/lilo.changes 2008-09-29 17:17:07.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Sep 29 17:15:53 CEST 2008 - olh@suse.de + +- do not force zImage if root is on iscsi (bnc#417539) + yaboot can handle iscsi now + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lilo.spec ++++++ --- /var/tmp/diff_new_pack.a15305/_old 2008-09-29 17:57:54.000000000 +0200 +++ /var/tmp/diff_new_pack.a15305/_new 2008-09-29 17:57:54.000000000 +0200 @@ -50,7 +50,7 @@ BuildRequires: gcc-32bit glibc-devel-32bit libgcc42-32bit libmudflap42-32bit %endif Version: 22.8 -Release: 25 +Release: 26 Source0: lilo-ppc-%{version}.tar.bz2 Source1: http://penguinppc.org/projects/yaboot/yaboot-%{yaboot_vers}.tar.bz2 Source86: lilo-%{version}.src.tar.bz2 @@ -212,6 +212,9 @@ %endif %doc %{_mandir}/*/* %changelog +* Mon Sep 29 2008 olh@suse.de +- do not force zImage if root is on iscsi (bnc#417539) + yaboot can handle iscsi now * Fri Sep 26 2008 olh@suse.de - scan all partitions if booted from iscsi (bnc#417539) * Thu Sep 25 2008 olh@suse.de ++++++ lilo-ppc-22.8.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-ppc-22.8/lilo-chrp.lib new/lilo-ppc-22.8/lilo-chrp.lib --- old/lilo-ppc-22.8/lilo-chrp.lib 2008-03-20 16:15:33.000000000 +0100 +++ new/lilo-ppc-22.8/lilo-chrp.lib 2008-09-29 17:17:07.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: lilo-chrp.lib 1063 2008-03-20 15:15:33Z olh $ +# $Id: lilo-chrp.lib 1131 2008-09-29 15:17:07Z olh $ # vim: syntax=sh ts=4 # # library for CHRP routines @@ -101,6 +101,8 @@ if is_on_iscsi $OPTION_BOOT ; then echo "boot device $OPTION_BOOT is on iscsi" iscsi_bootdevice=1 + # FIXME + iscsi_bootdevice=0 fi # check whether the boot partition is under device mapper control an throw @@ -147,6 +149,8 @@ if [ "${CONFIG_IMAGE_LABEL[$i]}" = "$OPTION_DEFAULT" ] && is_on_iscsi "$image" ; then zimage_nr=$i iscsi_bootdevice=1 + # FIXME + iscsi_bootdevice=0 # if the boot device points to iscsi, force zImage elif (( iscsi_bootdevice == 1 )) ; then if [ "${CONFIG_IMAGE_LABEL[$i]}" = "$OPTION_DEFAULT" ]; then ++++++ yaboot-22.8-r1129.tar.bz2 ++++++ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org