Hello community,
here is the log from the commit of package lilo
checked in at Wed May 3 00:56:09 CEST 2006.
--------
--- arch/ppc/lilo/lilo.changes 2006-04-23 21:10:39.000000000 +0200
+++ STABLE/lilo/lilo.changes 2006-05-01 11:34:03.000000000 +0200
@@ -1,0 +2,12 @@
+Mon May 1 11:32:31 CEST 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=
+
+-------------------------------------------------------------------
+Sat Apr 29 22:21:40 CEST 2006 - olh@suse.de
+
+- do not let OpenFirmware read from msdos partitions unless type
+ is 0x6 (136537 - LTC20058)
+
+-------------------------------------------------------------------
Old:
----
lilo-10.1.9.tar.bz2
yaboot-10.1.9-r701.tar.bz2
New:
----
lilo-10.1.10.tar.bz2
yaboot-10.1.10-r705.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lilo.spec ++++++
--- /var/tmp/diff_new_pack.CJuq7y/_old 2006-05-03 00:54:58.000000000 +0200
+++ /var/tmp/diff_new_pack.CJuq7y/_new 2006-05-03 00:54:58.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package lilo (Version 10.1.9)
+# spec file for package lilo (Version 10.1.10)
#
# 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.9-r701
+%define yaboot_vers 10.1.10-r705
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.9
+Version: 10.1.10
Release: 1
Source0: lilo-%{version}.tar.bz2
Source1: http://penguinppc.org/projects/yaboot/yaboot-%{yaboot_vers}.tar.bz2
@@ -159,6 +159,12 @@
%doc %{_mandir}/*/*
%changelog -n lilo
+* 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=
+* Sat Apr 29 2006 - olh@suse.de
+- do not let OpenFirmware read from msdos partitions unless type
+ is 0x6 (136537 - LTC20058)
* Sun Apr 23 2006 - olh@suse.de
- fix unterminated string in enet:bootp bootpath handling in yaboot
* Sun Apr 23 2006 - olh@suse.de
++++++ lilo-10.1.9.tar.bz2 -> lilo-10.1.10.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-10.1.9/lilo-chrp.lib new/lilo-10.1.10/lilo-chrp.lib
--- old/lilo-10.1.9/lilo-chrp.lib 2006-04-18 23:22:39.000000000 +0200
+++ new/lilo-10.1.10/lilo-chrp.lib 2006-05-01 11:34:03.000000000 +0200
@@ -1,5 +1,5 @@
#! /bin/bash
-# $Id: lilo-chrp.lib 693 2006-04-18 21:22:39Z olh $
+# $Id: lilo-chrp.lib 706 2006-05-01 09:34:03Z olh $
# vim: syntax=sh
#
# library for CHRP routines
@@ -703,11 +703,6 @@
done
nvsetenv boot-device "$boot_path ${bootdevice[*]}"
- if [ "$(nvsetenv boot-file)" != "boot-file=" ]; then
- warning "old boot-file (contains addition OF boot args for kernel, but breaks yaboot):"
- nvsetenv boot-file >&2
- nvsetenv boot-file ""
- fi
else
warning "boot path not set to boot linux as requested" \
"please add '$boot_path' somewhere to your boot path manually"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-10.1.9/lilo-pmac.lib new/lilo-10.1.10/lilo-pmac.lib
--- old/lilo-10.1.9/lilo-pmac.lib 2006-04-18 23:22:39.000000000 +0200
+++ new/lilo-10.1.10/lilo-pmac.lib 2006-05-01 11:34:03.000000000 +0200
@@ -1,4 +1,4 @@
-# $Id: lilo-pmac.lib 693 2006-04-18 21:22:39Z olh $
+# $Id: lilo-pmac.lib 706 2006-05-01 09:34:03Z olh $
# vim: syntax=sh
#
# library for PowerMac routings
@@ -276,11 +276,6 @@
NV_BOOT_PATH=$(get_of_path $OPTION_BOOT)
echo set OF boot-device $NV_BOOT_PATH",\\\\:tbxi"
nvsetenv boot-device $NV_BOOT_PATH",\\\\:tbxi"
- if [ "$(nvsetenv boot-file)" != "boot-file=" ] ; then
- echo "old boot-file (contains addition OF boot args for kernel, but breaks yaboot):"
- nvsetenv boot-file
- nvsetenv boot-file ""
- fi
fi
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-10.1.9/lilo.new new/lilo-10.1.10/lilo.new
--- old/lilo-10.1.9/lilo.new 2006-04-18 23:22:39.000000000 +0200
+++ new/lilo-10.1.10/lilo.new 2006-04-18 23:22:39.000000000 +0200
@@ -63,7 +63,7 @@
function Usage() {
cat < yaboot-10.1.10-r705.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.9-r701/Changelog.SuSE new/yaboot-10.1.10-r705/Changelog.SuSE
--- old/yaboot-10.1.9-r701/Changelog.SuSE 2006-04-23 21:21:40.000000000 +0200
+++ new/yaboot-10.1.10-r705/Changelog.SuSE 2006-05-02 13:19:37.000000000 +0200
@@ -1,4 +1,27 @@
------------------------------------------------------------------------
+r705 | olh | 2006-04-29 20:23:14 +0000 (Sat, 29 Apr 2006) | 3 lines
+Changed paths:
+ M /trunk/lilo.changes
+ M /trunk/yaboot/include/fdisk-part.h
+ M /trunk/yaboot/second/fs_of.c
+
++- do not let OpenFirmware read from msdos partitions unless type
++ is 0x6 (136537 - LTC20058)
+
+------------------------------------------------------------------------
+r704 | olh | 2006-04-29 20:04:58 +0000 (Sat, 29 Apr 2006) | 1 line
+Changed paths:
+ M /trunk/yaboot/include/partition.h
+ M /trunk/yaboot/second/partition.c
+
+store the disk label type in the partition info
+------------------------------------------------------------------------
+r703 | olh | 2006-04-29 19:45:51 +0000 (Sat, 29 Apr 2006) | 1 line
+Changed paths:
+ M /trunk/yaboot/second/partition.c
+
+move mac label signature check to own function
+------------------------------------------------------------------------
r701 | olh | 2006-04-23 19:10:39 +0000 (Sun, 23 Apr 2006) | 2 lines
Changed paths:
M /trunk/lilo.changes
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.9-r701/Makefile new/yaboot-10.1.10-r705/Makefile
--- old/yaboot-10.1.9-r701/Makefile 2006-04-23 21:21:41.000000000 +0200
+++ new/yaboot-10.1.10-r705/Makefile 2006-05-02 13:19:37.000000000 +0200
@@ -6,7 +6,7 @@
include Config
-VERSION = 10.1.9-r701
+VERSION = 10.1.10-r705
# Debug mode (spam/verbose)
DEBUG = 0
# make install vars
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.9-r701/include/fdisk-part.h new/yaboot-10.1.10-r705/include/fdisk-part.h
--- old/yaboot-10.1.9-r701/include/fdisk-part.h 2006-03-18 23:15:10.000000000 +0100
+++ new/yaboot-10.1.10-r705/include/fdisk-part.h 2006-04-29 22:23:14.000000000 +0200
@@ -22,6 +22,7 @@
#define ACTIVE_FLAG 0x80
#define EXTENDED 0x05
+#define MSDOS_FAT16 0x06
#define WIN98_EXTENDED 0x0f
#define LINUX_PARTITION 0x81
#define LINUX_SWAP 0x82
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.9-r701/include/partition.h new/yaboot-10.1.10-r705/include/partition.h
--- old/yaboot-10.1.9-r701/include/partition.h 2006-03-05 14:08:36.000000000 +0100
+++ new/yaboot-10.1.10-r705/include/partition.h 2006-04-29 22:04:58.000000000 +0200
@@ -25,6 +25,12 @@
+enum disk_label {
+ LABEL_MAC,
+ LABEL_MSDOS,
+ LABEL_AMIGA,
+ LABEL_ISO9660,
+};
struct partition_t {
struct partition_t* next;
@@ -32,6 +38,7 @@
unsigned long part_start; /* In blocks */
unsigned long part_size; /* In blocks */
unsigned short blocksize;
+ enum disk_label label;
int sys_ind; /* fs type */
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.9-r701/second/fs_of.c new/yaboot-10.1.10-r705/second/fs_of.c
--- old/yaboot-10.1.9-r701/second/fs_of.c 2006-04-05 19:38:14.000000000 +0200
+++ new/yaboot-10.1.10-r705/second/fs_of.c 2006-04-29 22:23:14.000000000 +0200
@@ -93,8 +93,8 @@
strcat(buffer, ":");
if (part) {
char pn[12];
- if (part->sys_ind == LINUX_RAID) {
- DEBUG_F("skipping because partition is marked LINUX_RAID\n");
+ if (part->label == LABEL_MSDOS && part->sys_ind != MSDOS_FAT16) {
+ prom_printf("skipping partition %d, type is not FAT16\n", part->part_number);
DEBUG_LEAVE(FILE_ERR_BAD_FSYS);
return FILE_ERR_BAD_FSYS;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.9-r701/second/partition.c new/yaboot-10.1.10-r705/second/partition.c
--- old/yaboot-10.1.9-r701/second/partition.c 2006-04-05 15:03:57.000000000 +0200
+++ new/yaboot-10.1.10-r705/second/partition.c 2006-04-29 22:04:58.000000000 +0200
@@ -50,6 +50,7 @@
static void
add_new_partition(struct partition_t** list, int part_number,
unsigned long part_start, unsigned long part_size,
+ enum disk_label label,
unsigned short part_blocksize, int sys_ind)
{
struct partition_t* part;
@@ -60,6 +61,7 @@
part->part_start = part_start;
part->part_size = part_size;
part->blocksize = part_blocksize;
+ part->label = label;
part->sys_ind = sys_ind;
/* Tack this entry onto the list */
@@ -72,6 +74,12 @@
* I have to check if it's true. If it's not, then things will get
* a bit more complicated
*/
+static int mac_magic_present(char *block_buffer)
+{
+ struct mac_driver_desc *desc = (struct mac_driver_desc *)block_buffer;
+ return desc->signature == MAC_DRIVER_MAGIC;
+}
+
static void
partition_mac_lookup(prom_handle disk,
struct partition_t** list )
@@ -109,6 +117,7 @@
block, /* partition number */
part->start_block + part->data_start, /* start */
part->data_count, /* size */
+ LABEL_MAC,
ptable_block_size,
0);
}
@@ -161,7 +170,7 @@
if (next + length > partition_start + partition_size)
continue;
}
- add_new_partition(list, partition, next, length, 512, part->sys_ind);
+ add_new_partition(list, partition, next, length, LABEL_MSDOS, 512, part->sys_ind);
partition++;
}
part -= 4;
@@ -189,7 +198,7 @@
for (partition=1; partition <= 4 ;partition++, part++) {
if (msdos_is_linux_partition(part->sys_ind))
- add_new_partition(list, partition, le32_to_cpu(part->start), le32_to_cpu(part->size), 512, part->sys_ind);
+ add_new_partition(list, partition, le32_to_cpu(part->start), le32_to_cpu(part->size), LABEL_MSDOS, 512, part->sys_ind);
else if (msdos_is_extended_partition(part->sys_ind))
msdos_parse_extended(disk, list, le32_to_cpu(part->start), le32_to_cpu(part->size));
}
@@ -329,6 +338,7 @@
partition, /* partition number */
blockspercyl * amiga_block[AMIGA_PART_LOWCYL], /* start */
blockspercyl * (amiga_block[AMIGA_PART_HIGHCYL] - amiga_block[AMIGA_PART_LOWCYL] + 1), /* size */
+ LABEL_AMIGA,
prom_blksize,
0 );
}
@@ -338,7 +348,6 @@
partitions_lookup(const char *device)
{
ihandle disk;
- struct mac_driver_desc *desc = (struct mac_driver_desc *)block_buffer;
struct partition_t* list = NULL;
unsigned int prom_blksize, iso_root_block;
@@ -366,7 +375,7 @@
prom_printf("Can't read boot blocks\n");
goto bail;
}
- if (desc->signature == MAC_DRIVER_MAGIC) {
+ if (mac_magic_present(block_buffer)) {
/* pdisk partition format */
partition_mac_lookup(disk, &list);
} else if (msdos_magic_present(block_buffer)) {
@@ -377,6 +386,7 @@
0,
iso_root_block,
0,
+ LABEL_ISO9660,
prom_blksize,
0);
prom_printf("ISO9660 disk\n");
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...