Hello community,
here is the log from the commit of package lilo
checked in at Tue Nov 6 22:40:15 CET 2007.
--------
--- arch/ppc/lilo/lilo.changes 2007-09-14 10:12:50.000000000 +0200
+++ /mounts/work_src_done/STABLE/lilo/lilo.changes 2007-11-06 15:08:15.000000000 +0100
@@ -1,0 +2,12 @@
+Tue Nov 6 15:07:01 CET 2007 - olh@suse.de
+
+- Fixed issue with SAS devices on different topologies and non-zero
+ luns (338642 - LTC39882)
+
+-------------------------------------------------------------------
+Tue Nov 6 14:26:57 CET 2007 - olh@suse.de
+
+- format the hfs boot partition if the size is less than 1MB (338300)
+ remove old vmlinux.00N files
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lilo.spec ++++++
--- /var/tmp/diff_new_pack.S29366/_old 2007-11-06 22:37:50.000000000 +0100
+++ /var/tmp/diff_new_pack.S29366/_new 2007-11-06 22:37:50.000000000 +0100
@@ -24,7 +24,7 @@
Requires: binutils
Requires: parted
Version: 10.1.22
-Release: 71
+Release: 78
Source0: lilo-%{version}.tar.bz2
Source1: http://penguinppc.org/projects/yaboot/yaboot-%{yaboot_vers}.tar.bz2
# $Id: lilo.spec 985 2007-07-26 10:53:09Z olh $
@@ -153,8 +153,13 @@
%attr(755,root,root) %config /sbin/lilo
%doc %{_docdir}/lilo
%doc %{_mandir}/*/*
-
%changelog
+* Tue Nov 06 2007 - olh@suse.de
+- Fixed issue with SAS devices on different topologies and non-zero
+ luns (338642 - LTC39882)
+* Tue Nov 06 2007 - olh@suse.de
+- format the hfs boot partition if the size is less than 1MB (338300)
+ remove old vmlinux.00N files
* Fri Sep 14 2007 - olh@suse.de
- change the link address of yaboot and the chrp zImage from 64k
to 256k to fix the boot binary with SLOF on Cell
++++++ 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-09-11 11:56:43.000000000 +0200
+++ new/lilo-10.1.22/lilo.new 2007-11-06 14:29:50.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/bash
# vim: syntax=sh ts=4
-# $Id: lilo.new 1023 2007-09-11 09:56:43Z olh $
+# $Id: lilo.new 1025 2007-11-06 13:29:50Z olh $
#
# a simple lilo to store the boot loader and the kernel images
# in bash2 ... Think different [tm]
@@ -58,6 +58,8 @@
declare -a OPTION_BOOT_DISK_DEVICE_NODE
# OPTION_BOOT_PARTITION_NUMBER is the partition number
declare -a OPTION_BOOT_PARTITION_NUMBER
+# OPTION_BOOT_PARTITION_SYSFS_PATH is the partition number
+declare -a OPTION_BOOT_PARTITION_SYSFS_PATH
# OPTION_CLONE contains a space separated list of additional boot partitions
OPTION_CLONE=
# OPTION_BOOTFOLDER contains the MacOS folder with the bootstuff
@@ -480,6 +482,10 @@
echo "$direntry_kernel_disk_name"
return 0
;;
+ sysfspath)
+ echo "${direntry_sysfspath%/dev}"
+ return 0
+ ;;
esac
echo >&2 "'$querytype' not handled for '$direntry'"
return 1
@@ -854,6 +860,7 @@
OPTION_BOOT_DISK_DEVICE_NAME[$i]="`collect_path_info disk_name ${OPTION_BOOT[$i]}`"
OPTION_BOOT_DISK_DEVICE_NODE[$i]="/dev/${OPTION_BOOT_DISK_DEVICE_NAME[$i]}"
OPTION_BOOT_PARTITION_NUMBER[$i]="`collect_path_info partition_number ${OPTION_BOOT[$i]}`"
+ OPTION_BOOT_PARTITION_SYSFS_PATH[$i]="`collect_path_info sysfspath ${OPTION_BOOT[$i]}`"
}
function check_config_file () {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-10.1.22/lilo-pmac.lib new/lilo-10.1.22/lilo-pmac.lib
--- old/lilo-10.1.22/lilo-pmac.lib 2007-08-23 15:41:11.000000000 +0200
+++ new/lilo-10.1.22/lilo-pmac.lib 2007-11-06 14:29:50.000000000 +0100
@@ -1,4 +1,4 @@
-# $Id: lilo-pmac.lib 1018 2007-08-23 13:41:11Z olh $
+# $Id: lilo-pmac.lib 1025 2007-11-06 13:29:50Z olh $
# vim: syntax=sh ts=4
#
# library for PowerMac routings
@@ -87,6 +87,8 @@
local other
local other_disk other_partition
local FILE_PATH
+ local hfs_boot_partition_size
+ declare -i hfs_boot_partition_size
other="${CONFIG_IMAGE_OTHER[*]}"
other="${other%% *}"
@@ -297,19 +299,33 @@
echo "</CHRP-BOOT>"
} > $TEMP/os-chooser
- # umount the boot = partition, or exit if that fails
- if [ "$(/dev/null
+ rm -f $HOME/.hcwd
+
+ if test -f $OPTION_BOOT_PARTITION_SYSFS_PATH/size
+ then
+ read hfs_boot_partition_size < $OPTION_BOOT_PARTITION_SYSFS_PATH/size
+ if test $(( $hfs_boot_partition_size * 512 )) -lt $(( 1 * 1024 * 1024 ))
+ then
+ echo " Making new HFS filesystem on $OPTION_BOOT"
+ hformat -l "SuSE Linux boot partition" $OPTION_BOOT || exit 1
+ fi
fi
- humount $OPTION_BOOT 2>/dev/null
- humount $OPTION_BOOT 2>/dev/null
-
- hmount $OPTION_BOOT || {
+
+ if ! hmount $OPTION_BOOT > $TEMP/hmount.txt 2>&1
+ then
+ cat $TEMP/hmount.txt
echo "Mounting of $OPTION_BOOT failed, trying again after formatting"
- hformat -l "Linux boot partition" $OPTION_BOOT
- hmount $OPTION_BOOT || exit 1
- }
+ hformat -l "SuSE Linux boot partition" $OPTION_BOOT || exit 1
+ hmount $OPTION_BOOT > $TEMP/hmount.txt 2>&1 || exit 1
+ fi
+ cat $TEMP/hmount.txt
+ if grep -Eq ' \(locked\)$' $TEMP/hmount.txt
+ then
+ echo "$OPTION_BOOT is read-only"
+ humount
+ exit 1
+ fi
HFS_BOOTFOLDER="${OPTION_BOOTFOLDER:-$DEFAULT_BOOTFOLDER}"
hmkdir $HFS_BOOTFOLDER 2>/dev/null
@@ -318,6 +334,12 @@
# yaboot looks for yaboot.cnf, yaboot.conf, /etc/yaboot.conf
# force yaboot.conf
hdel :yaboot.cnf 2>/dev/null
+ hdel :initrd.def 2>/dev/null
+ for i in `seq 1 9`
+ do
+ hdel vmlinux.`printf %03d $i` &>/dev/null
+ hdel initrd.`printf %03d $i` &>/dev/null
+ done
hcopy $TEMP/yaboot.conf :yaboot.conf
hcopy /lib/lilo/pmac/yaboot :yaboot
hcopy /lib/lilo/pmac/Finder.bin :Finder
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-08-23 11:53:18.000000000 +0200
+++ new/lilo-10.1.22/show_of_path.sh 2007-11-06 15:08:15.000000000 +0100
@@ -2,7 +2,7 @@
# vim: syntax=off ts=4
# set -ex
#
-# $Id: show_of_path.sh 1017 2007-08-23 09:53:18Z olh $
+# $Id: show_of_path.sh 1026 2007-11-06 14:08:15Z olh $
# find a OF bootpath on Apple PowerMacintosh Newworld machines
# Copyright (C) 2000, 2004 Olaf Hering