Hello community, here is the log from the commit of package lilo checked in at Fri Nov 28 15:32:44 CET 2008. -------- --- arch/i386/lilo/lilo.changes 2008-11-20 15:21:24.000000000 +0100 +++ lilo/lilo.changes 2008-11-28 14:16:44.000000000 +0100 @@ -1,0 +2,13 @@ +Fri Nov 28 14:16:11 CET 2008 - olh@suse.de + +- skip config file handling on PS3 because kboot.conf is used + +------------------------------------------------------------------- +Tue Nov 25 15:23:26 CET 2008 - olh@suse.de + +- update can_yaboot_read to handle bind mounts + they return the same major:minor number as the underlying + filesystem and overwrite the previous valid filesystem entry + which incorrectly forces booting from a FAT filesystem + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lilo.spec ++++++ --- /var/tmp/diff_new_pack.uB9470/_old 2008-11-28 15:31:19.000000000 +0100 +++ /var/tmp/diff_new_pack.uB9470/_new 2008-11-28 15:31:19.000000000 +0100 @@ -56,7 +56,7 @@ %endif %endif Version: 22.8 -Release: 38 +Release: 39 Source0: lilo-ppc-%{version}.tar.bz2 Source1: http://penguinppc.org/projects/yaboot/yaboot-%{yaboot_vers}.tar.bz2 Source86: lilo-%{version}.src.tar.bz2 @@ -227,6 +227,13 @@ %endif %doc %{_mandir}/*/* %changelog +* Fri Nov 28 2008 olh@suse.de +- skip config file handling on PS3 because kboot.conf is used +* Tue Nov 25 2008 olh@suse.de +- update can_yaboot_read to handle bind mounts + they return the same major:minor number as the underlying + filesystem and overwrite the previous valid filesystem entry + which incorrectly forces booting from a FAT filesystem * Wed Nov 19 2008 olh@suse.de - remove addnote again, it will be chrp-addnote in util-linux * Wed Nov 19 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.new new/lilo-ppc-22.8/lilo.new --- old/lilo-ppc-22.8/lilo.new 2008-11-05 13:54:13.000000000 +0100 +++ new/lilo-ppc-22.8/lilo.new 2008-11-28 14:16:44.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/bash # vim: syntax=sh ts=4 -# $Id: lilo.new 1170 2008-11-05 12:54:13Z olh $ +# $Id: lilo.new 1182 2008-11-28 13:16:44Z olh $ # # a simple lilo to store the boot loader and the kernel images # in bash2 ... Think different [tm] @@ -347,6 +347,7 @@ # readable by yaboot function can_yaboot_read () { local path="$1" + local num # check for invalid path [ -e "$path" ] || return 1; @@ -357,16 +358,24 @@ local device mount type opts while read device mount type opts; do + : device $device + : mount $mount + : type $type + : opts $opts if [ "${device:0:1}" = "/" ]; then local -i dn=$(( `stat -L --format="0x%D" $mount` )) (( dn == 0 )) && continue; + [[ "$type" == @(anon_inodefs|autofs|bdev|cgroup|cpuset|debugfs|devpts|fuse|fusectl|hugetlbfs|inotifyfs|mqueue|pipefs|proc|rootfs|rpc_pipefs|securityfs|sockfs|sysfs|tmpfs|usbfs) ]] && continue + : dn $dn gets type $type _filesystem[$dn]="$type"; fi done < /proc/mounts _filesystem[0]="invalid" fi - local fs=${_filesystem[$(( ` stat -L --format="0x%D" $path` ))]} + num=`$STAT_CMD -L --format="0x%D" $path` + : num $(( $num )) + local fs=${_filesystem[$(( $num ))]} # check for a file system yaboot can handle [[ "$fs" == @(ext2|ext3|msdos|vfat|reiserfs|iso9660|xfs) ]] || return 1; @@ -1055,8 +1064,13 @@ echo "$MACHINE" exit 0 fi +case "$MACHINE" in + ps3) ;; + *) parse_config_file check_config_file + ;; +esac if [ "$boot_once" ]; then setup_boot_once "$boot_once" ++++++ yaboot-22.8-r1174.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