Hello community,
here is the log from the commit of package lilo
checked in at Tue Apr 3 21:41:10 CEST 2007.
--------
--- arch/ppc/lilo/lilo.changes 2007-03-25 21:47:25.000000000 +0200
+++ /mounts/work_src_done/STABLE/lilo/lilo.changes 2007-04-03 15:58:53.000000000 +0200
@@ -1,0 +2,31 @@
+Tue Apr 3 15:57:32 CEST 2007 - olh@suse.de
+
+- do not use ls -s to get the filesize, use wc -c instead
+ ls reports not enough blocks for a sparse file
+
+-------------------------------------------------------------------
+Tue Apr 3 14:03:41 CEST 2007 - olh@suse.de
+
+- fix path pattern in is_on_iscsi
+
+-------------------------------------------------------------------
+Tue Apr 3 13:11:03 CEST 2007 - olh@suse.de
+
+- fix logic error in is_on_iscsi() (260223)
+
+-------------------------------------------------------------------
+Tue Apr 3 08:48:18 CEST 2007 - olh@suse.de
+
+- handle empty gateway in iscsi path (260089 - LTC33555)
+
+-------------------------------------------------------------------
+Tue Apr 3 08:46:41 CEST 2007 - olh@suse.de
+
+- parted --version output changed with 1.8
+
+-------------------------------------------------------------------
+Wed Mar 28 14:22:54 CEST 2007 - olh@suse.de
+
+- remove obsolete SLOF warning from lilo
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lilo.spec ++++++
--- /var/tmp/diff_new_pack.lh7912/_old 2007-04-03 21:40:48.000000000 +0200
+++ /var/tmp/diff_new_pack.lh7912/_new 2007-04-03 21:40:48.000000000 +0200
@@ -24,7 +24,7 @@
Requires: binutils
Requires: parted
Version: 10.1.22
-Release: 19
+Release: 22
Source0: lilo-%{version}.tar.bz2
Source1: http://penguinppc.org/projects/yaboot/yaboot-%{yaboot_vers}.tar.bz2
# $Id: lilo.spec 870 2006-11-07 12:31:45Z olh $
@@ -157,6 +157,19 @@
%doc %{_mandir}/*/*
%changelog
+* Tue Apr 03 2007 - olh@suse.de
+- do not use ls -s to get the filesize, use wc -c instead
+ ls reports not enough blocks for a sparse file
+* Tue Apr 03 2007 - olh@suse.de
+- fix path pattern in is_on_iscsi
+* Tue Apr 03 2007 - olh@suse.de
+- fix logic error in is_on_iscsi() (260223)
+* Tue Apr 03 2007 - olh@suse.de
+- handle empty gateway in iscsi path (260089 - LTC33555)
+* Tue Apr 03 2007 - olh@suse.de
+- parted --version output changed with 1.8
+* Wed Mar 28 2007 - olh@suse.de
+- remove obsolete SLOF warning from lilo
* Sun Mar 25 2007 - olh@suse.de
- use a zImage instead of yaboot with root on iscsi (246077 - LTC32118)
* Tue Mar 20 2007 - olh@suse.de
++++++ lilo-10.1.22.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-10.1.22/lilo.new new/lilo-10.1.22/lilo.new
--- old/lilo-10.1.22/lilo.new 2007-03-25 21:47:25.000000000 +0200
+++ new/lilo-10.1.22/lilo.new 2007-04-03 15:58:53.000000000 +0200
@@ -1,5 +1,5 @@
#! /bin/bash
-# $Id: lilo.new 949 2007-03-25 19:47:25Z olh $
+# $Id: lilo.new 955 2007-04-03 13:58:53Z olh $
#
# a simple lilo to store the boot loader and the kernel images
# in bash2 ... Think different [tm]
@@ -47,8 +47,17 @@
FDISK=/sbin/fdisk
PARTED="/usr/sbin/parted -s"
-PVERSION=$($PARTED --version) # e.g 'GNU Parted 1.6.22'
-PVERSION=${PVERSION#GNU Parted}
+# the parted kids keep the userinterface stable:
+#-
+# GNU Parted 1.6.25.1
+#-
+# GNU Parted 1.7.1
+#-
+# parted (GNU parted) 1.8.6
+# Copyright (C) 2007 Free Software Foundation, Inc.
+# more useless blurb
+#-
+PVERSION=$($PARTED --version | sed -n '/^GNU Parted /s@GNU Parted @@p;/^parted (GNU parted) /s@parted (GNU parted) @@p')
read a b c d e f <<< "${PVERSION//./ }"
PVERSION=$(( a*1000000 + b*1000 + c )) # e.g. 1006022
STAT_CMD=/usr/bin/stat
@@ -209,11 +218,11 @@
path=`get_of_path "$1"`
path="${path#*:}"
case "$path" in
- :iscsi,*)
- return 1
+ iscsi,*)
+ return 0
;;
esac
- return 0
+ return 1
}
# convert a number of 512 byte sectors in a format that parted accepts and the
@@ -336,11 +345,13 @@
function fsize() { # get file size in blocks
- local s f r
+ local s r
if [ -z "$1" ]; then
echo 0
else
- read s f r < <(ls -Ls --block-size=512 $1)
+ # can not use ls -s because the zimage is a sparse file
+ read s r < <( wc -c < $1 )
+ s=$(( ( $s / 512 ) + 1 ))
echo $s
fi
}
@@ -789,17 +800,6 @@
mkdir -p $TEMP
trap "clean_environment" EXIT INT
-if test -f /proc/device-tree/openprom/model ; then
- if grep -q IBM,SLOF /proc/device-tree/openprom/model ; then
- warning "Outdated SLOF releases had no working CLAIM implementation." \
- "Booting CD1/suseboot/inst64 via the network was the only way to boot SuSE Linux." \
- "" \
- " THIS WAS A FIRMWARE BUG! " \
- "" \
- "Update your SLOF firmware to a release from 2007 or later."
- fi
-fi
-
#
# here we go
#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-10.1.22/show_of_path.sh new/lilo-10.1.22/show_of_path.sh
--- old/lilo-10.1.22/show_of_path.sh 2007-03-19 09:59:55.000000000 +0100
+++ new/lilo-10.1.22/show_of_path.sh 2007-04-03 08:49:19.000000000 +0200
@@ -2,7 +2,7 @@
# vim: syntax=off
# set -ex
#
-# $Id: show_of_path.sh 946 2007-03-19 08:59:55Z olh $
+# $Id: show_of_path.sh 952 2007-04-03 06:49:19Z olh $
# find a OF bootpath on Apple PowerMacintosh Newworld machines
# Copyright (C) 2000, 2004 Olaf Hering
participants (1)
-
root@Hilbert.suse.de