Hello community,
here is the log from the commit of package lilo
checked in at Thu May 25 00:46:40 CEST 2006.
--------
--- arch/ppc/lilo/lilo.changes 2006-05-22 10:05:00.000000000 +0200
+++ lilo/lilo.changes 2006-05-24 17:13:08.000000000 +0200
@@ -1,0 +2,7 @@
+Wed May 24 16:31:04 CEST 2006 - jplack@suse.de
+
+- do enhance detection for sub-architecture (#177314)
+- handle global initrd option correctly with full OF path (#177481)
+- bump version to 10.1.13
+
+-------------------------------------------------------------------
Old:
----
lilo-10.1.12.tar.bz2
yaboot-10.1.12-r716.tar.bz2
New:
----
lilo-10.1.13.tar.bz2
yaboot-10.1.13-r716.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lilo.spec ++++++
--- /var/tmp/diff_new_pack.7ni8Wt/_old 2006-05-25 00:45:03.000000000 +0200
+++ /var/tmp/diff_new_pack.7ni8Wt/_new 2006-05-25 00:45:03.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package lilo (Version 10.1.12)
+# spec file for package lilo (Version 10.1.13)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,7 +11,7 @@
# norootforbuild
Name: lilo
-%define yaboot_vers 10.1.12-r716
+%define yaboot_vers 10.1.13-r716
Group: System/Boot
License: BSD, Other License(s), see package
Summary: The Linux Loader, a Boot Menu
@@ -22,7 +22,7 @@
Requires: gawk sed coreutils
Requires: powerpc-utils
Requires: binutils
-Version: 10.1.12
+Version: 10.1.13
Release: 1
Source0: lilo-%{version}.tar.bz2
Source1: http://penguinppc.org/projects/yaboot/yaboot-%{yaboot_vers}.tar.bz2
@@ -160,6 +160,10 @@
%doc %{_mandir}/*/*
%changelog -n lilo
+* Wed May 24 2006 - jplack@suse.de
+- do enhance detection for sub-architecture (#177314)
+- handle global initrd option correctly with full OF path (#177481)
+- bump version to 10.1.13
* Mon May 22 2006 - olh@suse.de
- add a man page for show_of_path.sh
* Wed May 17 2006 - olh@suse.de
++++++ lilo-10.1.12.tar.bz2 -> lilo-10.1.13.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-10.1.12/lilo-chrp.lib new/lilo-10.1.13/lilo-chrp.lib
--- old/lilo-10.1.12/lilo-chrp.lib 2006-05-01 11:34:03.000000000 +0200
+++ new/lilo-10.1.13/lilo-chrp.lib 2006-05-24 13:45:53.000000000 +0200
@@ -1,5 +1,5 @@
#! /bin/bash
-# $Id: lilo-chrp.lib 706 2006-05-01 09:34:03Z olh $
+# $Id: lilo-chrp.lib 719 2006-05-24 11:45:53Z jplack $
# vim: syntax=sh
#
# library for CHRP routines
@@ -270,6 +270,29 @@
unset CONFIG_IMAGE_INITRD[$i]
fi
done # for (( i=1; i<=CONFIG_IMAGE_COUNT ...
+ #
+ # same for global initrd option
+ if [ "$OPTION_INITRD" ]; then
+ if [ -f "$OPTION_INITRD" ]; then
+ local path_image=$(get_of_path $OPTION_INITRD)
+ # check whether the initrd file lies on a file system that is
+ # readable by yaboot
+ if [ "$OPTION_FORCEFAT" != "yes" ] \
+ && [ "$path_image" ] \
+ && can_yaboot_read "$OPTION_INITRD";
+ then
+ OPTION_INITRD="${path_image}"
+ else
+ # image file needs to be copied to the boot device which has to
+ # be a FAT file system and be large enough to hold all data
+ let initrd_nr++
+ initrd_copy[$initrd_nr]="$OPTION_INITRD"
+ OPTION_INITRD=$(printf "initrd.%03d\n" $initrd_nr)
+ fi
+ else
+ error "global initrd file '$OPTION_INITRD' not found"
+ fi
+ fi
# now determine whether we could boot from a PReP partition or whether we
# should better fall back to booting from a FAT partition
@@ -392,7 +415,10 @@
fi
[ "$OPTION_ROOT" ] && echo "root = $OPTION_ROOT"
[ "$OPTION_APPEND" ] && echo "append = \"$OPTION_APPEND\""
- [ "$OPTION_INITRD" ] && echo "initrd = $OPTION_INITRD"
+ if [ "$OPTION_INITRD" ]; then
+ echo -n "initrd = "
+ strip_device_partnr "$OPTION_INITRD" $boot_device $boot_partnr
+ fi
echo "# image section"
for (( i=1; i<=CONFIG_IMAGE_COUNT; i++ )); do
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-10.1.12/lilo.new new/lilo-10.1.13/lilo.new
--- old/lilo-10.1.12/lilo.new 2006-04-18 23:22:39.000000000 +0200
+++ new/lilo-10.1.13/lilo.new 2006-05-24 13:47:01.000000000 +0200
@@ -1,5 +1,5 @@
#! /bin/bash
-# $Id: lilo.new 693 2006-04-18 21:22:39Z olh $
+# $Id: lilo.new 720 2006-05-24 11:47:01Z jplack $
#
# a simple lilo to store the boot loader and the kernel images
# in bash2 ... Think different [tm]
@@ -63,7 +63,7 @@
function Usage() {
cat <