Hello community, here is the log from the commit of package lilo checked in at Tue May 23 01:16:04 CEST 2006. -------- --- arch/ppc/lilo/lilo.changes 2006-05-03 19:37:53.000000000 +0200 +++ lilo/lilo.changes 2006-05-22 10:05:00.000000000 +0200 @@ -1,0 +2,27 @@ +Mon May 22 10:04:43 CEST 2006 - olh@suse.de + +- add a man page for show_of_path.sh + +------------------------------------------------------------------- +Wed May 17 20:33:36 CEST 2006 - olh@suse.de + +- record vmlinux/initrd in /chosen/yaboot,image and yaboot,initrd + +------------------------------------------------------------------- +Wed May 17 19:14:05 CEST 2006 - olh@suse.de + +- number logical msdos partitions correctly in yaboot + if there is more than one logical partition, only the first one + was considered because the loop was exited early + +------------------------------------------------------------------- +Fri May 12 14:37:08 CEST 2006 - jplack@suse.de + +- Mark Emulex FC HBA/0xFD00 as tested (#163786) + +------------------------------------------------------------------- +Sat May 6 15:03:39 CEST 2006 - olh@suse.de + +- do not print a NUL char after every newline in yaboot + +------------------------------------------------------------------- Old: ---- lilo-10.1.11.tar.bz2 yaboot-10.1.11-r710.tar.bz2 New: ---- lilo-10.1.12.tar.bz2 yaboot-10.1.12-r716.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lilo.spec ++++++ --- /var/tmp/diff_new_pack.VAWsDk/_old 2006-05-23 01:15:07.000000000 +0200 +++ /var/tmp/diff_new_pack.VAWsDk/_new 2006-05-23 01:15:07.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package lilo (Version 10.1.11) +# spec file for package lilo (Version 10.1.12) # # 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.11-r710 +%define yaboot_vers 10.1.12-r716 Group: System/Boot License: BSD, Other License(s), see package Summary: The Linux Loader, a Boot Menu @@ -22,11 +22,11 @@ Requires: gawk sed coreutils Requires: powerpc-utils Requires: binutils -Version: 10.1.11 -Release: 2 +Version: 10.1.12 +Release: 1 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 $ +# $Id: lilo.spec 717 2006-05-22 08:05:00Z olh $ %description LILO boots Linux from your hard drive. It can also boot other operating @@ -107,6 +107,7 @@ cp -av COPYING $RPM_BUILD_ROOT%{_docdir}/lilo/ cp -av man/lilo.conf.5 $RPM_BUILD_ROOT%{_mandir}/man5 cp -av man/lilo.8 $RPM_BUILD_ROOT%{_mandir}/man8 +cp -av man/show_of_path.sh.8 $RPM_BUILD_ROOT%{_mandir}/man8 cd bootheader make install DESTDIR=$RPM_BUILD_ROOT cd .. @@ -159,6 +160,18 @@ %doc %{_mandir}/*/* %changelog -n lilo +* Mon May 22 2006 - olh@suse.de +- add a man page for show_of_path.sh +* Wed May 17 2006 - olh@suse.de +- record vmlinux/initrd in /chosen/yaboot,image and yaboot,initrd +* Wed May 17 2006 - olh@suse.de +- number logical msdos partitions correctly in yaboot + if there is more than one logical partition, only the first one + was considered because the loop was exited early +* Fri May 12 2006 - jplack@suse.de +- Mark Emulex FC HBA/0xFD00 as tested (#163786) +* Sat May 06 2006 - olh@suse.de +- do not print a NUL char after every newline in yaboot * 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:' ++++++ lilo-10.1.11.tar.bz2 -> lilo-10.1.12.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-10.1.11/lilo.new new/lilo-10.1.12/lilo.new --- old/lilo-10.1.11/lilo.new 2006-04-18 23:22:39.000000000 +0200 +++ new/lilo-10.1.12/lilo.new 2006-04-18 23:22:39.000000000 +0200 @@ -63,7 +63,7 @@ function Usage() { cat <<EOHELP -lilo for PowerPC 10.1.11 +lilo for PowerPC 10.1.12 configures the Linux Loader on a few different PowerPC board types, based on the configuration file /etc/lilo.conf. This includes IBM RS/6000 and pSeries models, IBM legacy iSeries, @@ -453,7 +453,7 @@ get_arch=1 ;; --version|-v) - echo "lilo for PowerPC 10.1.11" + echo "lilo for PowerPC 10.1.12" exit 0 ;; --help) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-10.1.11/man/show_of_path.sh.8 new/lilo-10.1.12/man/show_of_path.sh.8 --- old/lilo-10.1.11/man/show_of_path.sh.8 1970-01-01 01:00:00.000000000 +0100 +++ new/lilo-10.1.12/man/show_of_path.sh.8 2006-05-22 10:05:00.000000000 +0200 @@ -0,0 +1,26 @@ +.\" $Id: show_of_path.sh.8 717 2006-05-22 08:05:00Z olh $ \" +.\" vim: syntax=nroff +.TH show_of_path.sh 8 +.SH NAME +\fBshow_of_path.sh\fR \- construct an OpenFirmware device path +.SH SYNOPSIS +\fBshow_of_path.sh\fR [filename] +.SH DESCRIPTION +.BR show_of_path.sh (8) +generates an OpenFirmware device path for the given filename. If a block device node is specified, the path for the device behind this node will be generated. When called without options, the path for / will be generated. This path is used by the OpenFirmware itself to load the bootloader, and by \fByaboot(8)\fR to load files specified in \fByaboot.conf(5)\fR. + +\fBshow_of_path.sh\fR does a stat on the given file to get the major:minor pair. Then this pair is searched in \fBdev\fR files below /sys/block/. If the main block device has a \fIdevice\fR symlink, this symlink is followed to get to the real hardware backing the block device. If no device symlink exists, the block device is most likely a "virtual" device like loop, lvm, software raid or device-mapper based. Neither OpenFirmware nor yaboot can do anything with such devices. The full path name of the directory where the \fIdevice\fR symlink points to is used to make assumptions about the hardware bus type and the topology on the bus. Then a file named \fBdevspec\fR is searched in the parent directories. Its content is the OpenFirmware path to the hardware controller. A copy of the firmware device tree is stored in \fB/proc/device-tree\fR, the \fBdevspec\fR content can be appended to get to the directory of device node. A few properties exist there which are used to construct the final path. + +Currently all on-board SCSI and IDE controllers, Emulex and Qlogic fibrechannel controllers and Apple PowerMac firewire controllers are supported. Paths to network devices are not supported, use the "\fBbootlist(8)\fR -m normal eth0" command to set the boot-device on IBM pSeries systems. + +.SH AUTHORS +.B show_of_path.sh +was written by Olaf Hering <olh@suse.de>. It is now maintained and improved further by Joachim Plack <jplack@suse.de> +.SH REPORTING BUGS +Bugs in \fBshow_of_path.sh\fR should be reported to <olaf@suse.de> +.SH SEE ALSO +.BR lilo (8), +.BR lilo.conf (5), +.BR bootstrap (8), +.BR yaboot (8), +.BR yaboot.conf (5) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-10.1.11/show_of_path.sh new/lilo-10.1.12/show_of_path.sh --- old/lilo-10.1.11/show_of_path.sh 2006-03-24 12:15:07.000000000 +0100 +++ new/lilo-10.1.12/show_of_path.sh 2006-05-12 14:37:04.000000000 +0200 @@ -2,7 +2,7 @@ # vim: syntax=off # set -ex # -# $Id: show_of_path.sh 627 2006-03-24 11:15:07Z jplack $ +# $Id: show_of_path.sh 713 2006-05-12 12:37:04Z jplack $ # find a OF bootpath on Apple PowerMacintosh Newworld machines # Copyright (C) 2000, 2004 Olaf Hering <olh@suse.de>, # 2005 Joachim Plack <jplack@suse.de> @@ -62,7 +62,7 @@ shopt -s extglob -read d myversion d <<< "$Date: 2006-03-24 11:15:07 +0000 (Fri, 24 Mar 2006) $" +read d myversion d <<< "$Date: 2006-05-12 12:37:04 +0000 (Fri, 12 May 2006) $" function error() { @@ -407,7 +407,7 @@ if (( vendor_id == 0x10df )); then # PCI_VENDOR_ID_EMULEX==0x10df id=$(printf "%04x" $device_id) - if [[ $id == @(f901|f981|f982|fa00|fa01|fd00) ]]; then + if [[ $id == @(f901|f981|f982|fa00|fa01) ]]; then warning "Emulex FC HBA with device id 0x$id not yet tested." \ "Reboot may fail." fi ++++++ yaboot-10.1.11-r710.tar.bz2 -> yaboot-10.1.12-r716.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.11-r710/Changelog.SuSE new/yaboot-10.1.12-r716/Changelog.SuSE --- old/yaboot-10.1.11-r710/Changelog.SuSE 2006-05-03 19:46:58.000000000 +0200 +++ new/yaboot-10.1.12-r716/Changelog.SuSE 2006-05-22 10:05:45.000000000 +0200 @@ -1,4 +1,37 @@ ------------------------------------------------------------------------ +r716 | olh | 2006-05-17 18:34:50 +0000 (Wed, 17 May 2006) | 2 lines +Changed paths: + M /trunk/lilo.changes + M /trunk/yaboot/second/yaboot.c + ++- record vmlinux/initrd in /chosen/yaboot,image and yaboot,initrd + +------------------------------------------------------------------------ +r715 | olh | 2006-05-17 18:04:34 +0000 (Wed, 17 May 2006) | 2 lines +Changed paths: + M /trunk/yaboot/second/yaboot.c + +use path_description_to_string on vmlinux/initrd load errors + +------------------------------------------------------------------------ +r714 | olh | 2006-05-17 17:17:05 +0000 (Wed, 17 May 2006) | 4 lines +Changed paths: + M /trunk/lilo.changes + M /trunk/yaboot/second/partition.c + ++- number logical msdos partitions correctly in yaboot ++ if there is more than one logical partition, only the first one ++ was considered because the loop was exited early + +------------------------------------------------------------------------ +r712 | olh | 2006-05-06 13:04:22 +0000 (Sat, 06 May 2006) | 2 lines +Changed paths: + M /trunk/lilo.changes + M /trunk/yaboot/second/prom.c + ++- do not print a NUL char after every newline in yaboot + +------------------------------------------------------------------------ r710 | olh | 2006-05-03 17:37:53 +0000 (Wed, 03 May 2006) | 3 lines Changed paths: M /trunk/lilo.changes diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.11-r710/Makefile new/yaboot-10.1.12-r716/Makefile --- old/yaboot-10.1.11-r710/Makefile 2006-05-03 19:46:58.000000000 +0200 +++ new/yaboot-10.1.12-r716/Makefile 2006-05-22 10:05:45.000000000 +0200 @@ -6,7 +6,7 @@ include Config -VERSION = 10.1.11-r710 +VERSION = 10.1.12-r716 # Debug mode (spam/verbose) DEBUG = 0 # make install vars diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.11-r710/second/partition.c new/yaboot-10.1.12-r716/second/partition.c --- old/yaboot-10.1.11-r710/second/partition.c 2006-04-29 22:04:58.000000000 +0200 +++ new/yaboot-10.1.12-r716/second/partition.c 2006-05-17 19:17:05.000000000 +0200 @@ -160,8 +160,6 @@ next = partition_start + offset; if (!le32_to_cpu(part->size) || msdos_is_extended_partition(part->sys_ind)) continue; - if (!msdos_is_linux_partition(part->sys_ind)) - break; if (i >= 2) { if (offset + length > partition_size) continue; @@ -170,7 +168,8 @@ if (next + length > partition_start + partition_size) continue; } - add_new_partition(list, partition, next, length, LABEL_MSDOS, 512, part->sys_ind); + if (msdos_is_linux_partition(part->sys_ind)) + add_new_partition(list, partition, next, length, LABEL_MSDOS, 512, part->sys_ind); partition++; } part -= 4; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.11-r710/second/prom.c new/yaboot-10.1.12-r716/second/prom.c --- old/yaboot-10.1.11-r710/second/prom.c 2006-03-27 21:38:58.000000000 +0200 +++ new/yaboot-10.1.12-r716/second/prom.c 2006-05-06 15:04:22.000000000 +0200 @@ -361,9 +361,9 @@ static void prom_putnewline(prom_handle file) { if (stdout_is_screen) - call_prom("write", 3, 1, file, newline_indent, sizeof(newline_indent)); + call_prom("write", 3, 1, file, newline_indent, sizeof(newline_indent) - 1); else - call_prom("write", 3, 1, file, newline, sizeof(newline)); + call_prom("write", 3, 1, file, newline, sizeof(newline) - 1); } void prom_putchar(char c) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.11-r710/second/yaboot.c new/yaboot-10.1.12-r716/second/yaboot.c --- old/yaboot-10.1.11-r710/second/yaboot.c 2006-05-03 19:37:53.000000000 +0200 +++ new/yaboot-10.1.12-r716/second/yaboot.c 2006-05-17 20:34:50.000000000 +0200 @@ -704,6 +704,7 @@ loadinfo_t loadinfo; void *initrd_more,*initrd_want; unsigned long initrd_read; + char *msg; loadinfo.load_loc = 0; @@ -716,10 +717,13 @@ prom_printf("Please wait, loading kernel...\n"); + msg = path_description_to_string(¶ms.kernel); result = open_file(¶ms.kernel, &file); if (result != FILE_ERR_OK) { - prom_printf("%s:%d,", params.kernel.device, params.kernel.part); - prom_perror(result, params.kernel.filename); + if (msg) { + prom_perror(result, msg); + free(msg); + } continue; } @@ -750,6 +754,10 @@ continue; } file.fs->close(&file); + if (msg) { + prom_set_chosen ("yaboot,image", msg, strlen(msg) + 1); + free(msg); + } /* If ramdisk, load it (only if booting a vmlinux). For now, we * can't tell the size it will be so we claim an arbitrary amount @@ -757,10 +765,13 @@ */ if (params.rd.filename) { prom_printf("Loading ramdisk...\n"); + msg = path_description_to_string(¶ms.rd); result = open_file(¶ms.rd, &file); if (result != FILE_ERR_OK) { - prom_printf("%s:%d,", params.rd.device, params.rd.part); - prom_perror(result, params.rd.filename); + if (msg) { + prom_perror(result, msg); + free(msg); + } } else { #define INITRD_CHUNKSIZE 0x400000 @@ -801,10 +812,14 @@ } file.fs->close(&file); } - if (initrd_base) - prom_printf("ramdisk loaded %08lx @ %p\n", - initrd_size, initrd_base); - else { + if (initrd_base) { + if (msg) { + prom_set_chosen ("yaboot,initrd", msg, strlen(msg) + 1); + free(msg); + } + prom_printf("ramdisk loaded %08lx @ %p\n", initrd_size, initrd_base); + + } else { prom_printf("ramdisk load failed !\n"); prom_pause(); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...
participants (1)
-
root＠suse.de