Hello community,
here is the log from the commit of package lilo
checked in at Tue May 9 00:39:09 CEST 2006.
--------
--- arch/ppc/lilo/lilo.changes 2006-05-01 11:34:03.000000000 +0200
+++ STABLE/lilo/lilo.changes 2006-05-03 19:37:53.000000000 +0200
@@ -1,0 +2,17 @@
+Wed May 3 19:36:24 CEST 2006 - olh@suse.de
+
+- let yaboot start vmlinux download even if no filename is specified
+ allows load files from network via 'net:'
+
+-------------------------------------------------------------------
+Wed May 3 19:33:32 CEST 2006 - olh@suse.de
+
+- parse net path properly in yaboot on pseries, there is usually
+ nothing after the device part. avoid operations on NULL pointer
+
+-------------------------------------------------------------------
+Wed May 3 19:03:26 CEST 2006 - olh@suse.de
+
+- initrd= can now be specified on the yaboot boot: prompt (100213)
+
+-------------------------------------------------------------------
Old:
----
lilo-10.1.10.tar.bz2
yaboot-10.1.10-r705.tar.bz2
New:
----
lilo-10.1.11.tar.bz2
yaboot-10.1.11-r710.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lilo.spec ++++++
--- /var/tmp/diff_new_pack.YPiCHL/_old 2006-05-09 00:38:55.000000000 +0200
+++ /var/tmp/diff_new_pack.YPiCHL/_new 2006-05-09 00:38:55.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package lilo (Version 10.1.10)
+# spec file for package lilo (Version 10.1.11)
#
# 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.10-r705
+%define yaboot_vers 10.1.11-r710
Group: System/Boot
License: BSD, Other License(s), see package
Summary: The Linux Loader, a Boot Menu
@@ -22,8 +22,8 @@
Requires: gawk sed coreutils
Requires: powerpc-utils
Requires: binutils
-Version: 10.1.10
-Release: 1
+Version: 10.1.11
+Release: 2
Source0: lilo-%{version}.tar.bz2
Source1: http://penguinppc.org/projects/yaboot/yaboot-%{yaboot_vers}.tar.bz2
# $Id: lilo.spec 696 2006-04-18 23:00:04Z olh $
@@ -159,6 +159,14 @@
%doc %{_mandir}/*/*
%changelog -n lilo
+* Wed May 03 2006 - olh@suse.de
+- let yaboot start vmlinux download even if no filename is specified
+ allows load files from network via 'net:'
+* Wed May 03 2006 - olh@suse.de
+- parse net path properly in yaboot on pseries, there is usually
+ nothing after the device part. avoid operations on NULL pointer
+* Wed May 03 2006 - olh@suse.de
+- initrd= can now be specified on the yaboot boot: prompt (100213)
* Mon May 01 2006 - olh@suse.de
- remove the code that clears boot-file. yaboot did not look at
/chosen/bootargs for a long time, now it may look for conf=
++++++ lilo-10.1.10.tar.bz2 -> lilo-10.1.11.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-10.1.10/lilo.new new/lilo-10.1.11/lilo.new
--- old/lilo-10.1.10/lilo.new 2006-04-18 23:22:39.000000000 +0200
+++ new/lilo-10.1.11/lilo.new 2006-04-18 23:22:39.000000000 +0200
@@ -63,7 +63,7 @@
function Usage() {
cat < yaboot-10.1.11-r710.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.10-r705/Changelog.SuSE new/yaboot-10.1.11-r710/Changelog.SuSE
--- old/yaboot-10.1.10-r705/Changelog.SuSE 2006-05-02 13:19:37.000000000 +0200
+++ new/yaboot-10.1.11-r710/Changelog.SuSE 2006-05-03 19:46:58.000000000 +0200
@@ -1,4 +1,30 @@
------------------------------------------------------------------------
+r710 | olh | 2006-05-03 17:37:53 +0000 (Wed, 03 May 2006) | 3 lines
+Changed paths:
+ M /trunk/lilo.changes
+ M /trunk/yaboot/second/yaboot.c
+
++- let yaboot start vmlinux download even if no filename is specified
++ allows load files from network via 'net:'
+
+------------------------------------------------------------------------
+r709 | olh | 2006-05-03 17:35:51 +0000 (Wed, 03 May 2006) | 3 lines
+Changed paths:
+ M /trunk/lilo.changes
+ M /trunk/yaboot/second/parse_device_path.c
+
++- parse net path properly in yaboot on pseries, there is usually
++ nothing after the device part. avoid operations on NULL pointer
+
+------------------------------------------------------------------------
+r708 | olh | 2006-05-03 17:05:27 +0000 (Wed, 03 May 2006) | 2 lines
+Changed paths:
+ M /trunk/lilo.changes
+ M /trunk/yaboot/second/yaboot.c
+
++- initrd= can now be specified on the yaboot boot: prompt (100213)
+
+------------------------------------------------------------------------
r705 | olh | 2006-04-29 20:23:14 +0000 (Sat, 29 Apr 2006) | 3 lines
Changed paths:
M /trunk/lilo.changes
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.10-r705/Makefile new/yaboot-10.1.11-r710/Makefile
--- old/yaboot-10.1.10-r705/Makefile 2006-05-02 13:19:37.000000000 +0200
+++ new/yaboot-10.1.11-r710/Makefile 2006-05-03 19:46:58.000000000 +0200
@@ -6,7 +6,7 @@
include Config
-VERSION = 10.1.10-r705
+VERSION = 10.1.11-r710
# Debug mode (spam/verbose)
DEBUG = 0
# make install vars
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.10-r705/second/parse_device_path.c new/yaboot-10.1.11-r710/second/parse_device_path.c
--- old/yaboot-10.1.10-r705/second/parse_device_path.c 2006-04-23 21:10:39.000000000 +0200
+++ new/yaboot-10.1.11-r710/second/parse_device_path.c 2006-05-03 19:35:51.000000000 +0200
@@ -1,4 +1,4 @@
-/* $Id: parse_device_path.c 701 2006-04-23 19:10:39Z olh $ */
+/* $Id: parse_device_path.c 709 2006-05-03 17:35:51Z olh $ */
#ifndef DEVPATH_TEST
#include
#include
@@ -234,7 +234,9 @@
len = strlen(default_device->device) + 1 + strlen(past_device);
else {
len = strlen(default_device->device) + 1;
- len += strlen(default_device->u.n.ip_before_filename) + 1;
+ if (default_device->u.n.ip_before_filename)
+ len += strlen(default_device->u.n.ip_before_filename);
+ len++;
len += strlen(imagepath);
if (default_device->u.n.ip_after_filename) {
len += 1 + strlen(default_device->u.n.ip_after_filename);
@@ -244,7 +246,8 @@
len += 2;
pathname = malloc(len);
if (pathname)
- sprintf(pathname, "%s:%s,%s%s%s", default_device->device, default_device->u.n.ip_before_filename,
+ sprintf(pathname, "%s:%s,%s%s%s", default_device->device,
+ default_device->u.n.ip_before_filename ? default_device->u.n.ip_before_filename : "",
past_device ? past_device : imagepath, comma,
default_device->u.n.ip_after_filename ? default_device->u.n.ip_after_filename : "");
#if defined(DEBUG) || defined(DEVPATH_TEST)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.10-r705/second/yaboot.c new/yaboot-10.1.11-r710/second/yaboot.c
--- old/yaboot-10.1.10-r705/second/yaboot.c 2006-04-18 23:24:08.000000000 +0200
+++ new/yaboot-10.1.11-r710/second/yaboot.c 2006-05-03 19:37:53.000000000 +0200
@@ -666,15 +666,21 @@
return 0;
}
- if (useconf) {
- p = cfg_get_strg(label, "initrd");
- if (p && *p) {
- DEBUG_F("Parsing initrd path <%s>\n", p);
- if (!imagepath_to_path_description(p, ¶ms->rd, &img_def_device)) {
- prom_printf("%s: Unable to parse\n", p);
- return 0;
- }
- }
+ p = strstr(params->args, "initrd=");
+ if (p) {
+ p = strdup(p + sizeof("initrd=") - 1);
+ if (p) {
+ q = strchr(p, ' ');
+ if (q)
+ *q = '\0';
+ }
+ } else if (useconf)
+ p = cfg_get_strg(label, "initrd");
+
+ if (p && *p) {
+ DEBUG_F("Parsing initrd path <%s>\n", p);
+ if (!imagepath_to_path_description(p, ¶ms->rd, &img_def_device))
+ prom_printf("%s: Unable to parse\n", p);
}
return 0;
}
@@ -707,8 +713,6 @@
if (get_params(¶ms))
return;
- if (!params.kernel.filename)
- continue;
prom_printf("Please wait, loading kernel...\n");
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...