Hello community, here is the log from the commit of package grub checked in at Sun Mar 18 07:01:57 CET 2007. -------- --- arch/i386/grub/grub.changes 2007-02-02 00:45:50.000000000 +0100 +++ /mounts/work_src_done/STABLE/grub/grub.changes 2007-03-16 18:10:59.000000000 +0100 @@ -1,0 +2,13 @@ +Fri Mar 16 18:05:18 CET 2007 - duwe@suse.de + +- Make fsys_ext2fs recognise Zen partitions (Bug#255006) +- handle /dev/disk/by-id in device.map (Bug#248216) +- add some on-board IDs for eepro100 (Bug#242660) +- fix grubonce entry# recognition (Bug#242992) +- make it clear that grub-install is not supported by us, + rename the script and call yast2 and + grub --batch < /etc/grub.conf instead +- fix the old, unsupported grub-install to recognise LABEL and UUID + (Bug#181830) + +------------------------------------------------------------------- New: ---- disk-by-ID e100-newIDs grub-install grub-install-fix-UUID_LABEL recognise-zen ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grub.spec ++++++ --- /var/tmp/diff_new_pack.YT8740/_old 2007-03-18 07:00:51.000000000 +0100 +++ /var/tmp/diff_new_pack.YT8740/_new 2007-03-18 07:00:51.000000000 +0100 @@ -18,10 +18,11 @@ License: GNU General Public License (GPL) Group: System/Boot Version: 0.97 -Release: 42 +Release: 47 Source0: %{name}-%{version}.tar.gz Source1: installgrub Source2: grubonce +Source3: grub-install Patch0: %{name}-%{version}-path-patch Patch1: use_ferror.diff Patch2: grub-R @@ -37,6 +38,10 @@ Patch12: %{name}-%{version}-initrdaddr.diff #Patch13: grub-A20-sysctlportA Patch13: http://www.scl.ameslab.gov/Projects/mini-xen/grub-a20.patch +Patch14: disk-by-ID +Patch15: e100-newIDs +Patch16: recognise-zen +Patch17: grub-install-fix-UUID_LABEL Patch20: stage2-dir-callback.diff Patch21: stage2-wildcard.diff Patch22: stage2-wildcard-zerowidth.diff @@ -92,6 +97,10 @@ # A20 gate haunts even intel macs. Be extra careful, # see http://www.win.tue.nl/~aeb/linux/kbd/A20.html %patch13 -p1 +%patch14 -p1 +%patch15 -p1 +%patch16 -p1 +%patch17 -p1 # Disable the wildcard feature #%patch20 -p1 #%patch21 -p1 @@ -131,7 +140,9 @@ ln -sfn . $RPM_BUILD_ROOT/boot/boot (cd $RPM_BUILD_ROOT/usr/lib/grub && mv *-suse/* . && rmdir *-suse) >/dev/null 2>&1 || true cp -p {nb,pxe}grub stage2/stage2{,.netboot} $RPM_BUILD_ROOT/usr/lib/grub -cp -p %{SOURCE2} $RPM_BUILD_ROOT/usr/sbin/. +mv $RPM_BUILD_ROOT/usr/sbin/grub-install{,.unsupported} +mv $RPM_BUILD_ROOT/%{_mandir}/man8/grub-install{,.unsupported}.8 +cp -p %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT/usr/sbin/. # This fine script used to do everything at once, which # isn't necessary any more with Yast2 support. # Kept only for reference and historical reasons. @@ -158,17 +169,19 @@ %{_infodir}/grub*.gz %{_infodir}/multiboot.info.gz %{_mandir}/man1/mbchk.1.gz -%{_mandir}/man8/grub-install.8.gz +%{_mandir}/man8/grub-install.unsupported.8.gz %{_mandir}/man8/grub.8.gz %{_mandir}/man8/grub-md5-crypt.8.gz +/usr/lib/grub +%defattr(755,root,root) /usr/sbin/grub /usr/sbin/grubonce /usr/sbin/grub-set-default /usr/sbin/grub-install +/usr/sbin/grub-install.unsupported /usr/sbin/grub-md5-crypt #/usr/sbin/installgrub %dir /boot/boot -/usr/lib/grub %post # should anything go wrong the system will remain bootable : @@ -186,7 +199,17 @@ %install_info --info-dir=%{_infodir} %{_infodir}/multiboot.info.gz exit 0 -%changelog -n grub +%changelog +* Fri Mar 16 2007 - duwe@suse.de +- Make fsys_ext2fs recognise Zen partitions (Bug#255006) +- handle /dev/disk/by-id in device.map (Bug#248216) +- add some on-board IDs for eepro100 (Bug#242660) +- fix grubonce entry# recognition (Bug#242992) +- make it clear that grub-install is not supported by us, + rename the script and call yast2 and + grub --batch < /etc/grub.conf instead +- fix the old, unsupported grub-install to recognise LABEL and UUID + (Bug#181830) * Fri Feb 02 2007 - ro@suse.de - added -fno-stack-protector to EXTRACFLAGS * Mon Jan 29 2007 - duwe@suse.de ++++++ disk-by-ID ++++++ diff -Burbp grub-0.97.orig/lib/device.c grub-0.97/lib/device.c --- grub-0.97.orig/lib/device.c 2007-03-16 14:15:52.000000000 +0100 +++ grub-0.97/lib/device.c 2007-03-16 17:19:59.000000000 +0100 @@ -869,7 +869,11 @@ write_to_partition (char **map, int driv len = strlen(dev); pnum = ((partition >> 16) & 0xFF); - if (isdigit(dev[len-1])) + if (strncmp (dev, "/dev/disk/by-id/", 16) == 0) + { + sprintf (dev + len, "-part%d", pnum + 1); + } + else if (isdigit(dev[len-1])) { /* It is obviously some RAID disk: "/dev/<dsk>/c0d0" . "p1" */ sprintf (dev + len, "p%d", pnum + 1); ++++++ e100-newIDs ++++++ diff -pruN grub-0.97/netboot/config.c grub-0.97.new/netboot/config.c --- grub-0.97/netboot/config.c 2003-07-09 13:45:37.000000000 +0200 +++ grub-0.97.new/netboot/config.c 2007-02-05 14:50:57.000000000 +0100 @@ -122,6 +122,14 @@ static struct pci_device pci_nic_list[] "Intel EtherExpressPro100 ID1029", 0, 0, 0, 0}, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ID1030, "Intel Corporation 82559 InBusiness 10/100", 0, 0, 0, 0}, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ID1031, + "Intel EtherExpressPro100 ID1031", 0, 0, 0, 0}, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ID1039, + "Intel EtherExpressPro100 ID1039", 0, 0, 0, 0}, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ID103B, + "Intel 82801BD PRO/100 VM", 0, 0, 0, 0}, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ID1050, + "Intel EtherExpressPro100 82555 10/100", 0, 0, 0, 0}, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82562, "Intel EtherExpressPro100 82562EM", 0, 0, 0, 0}, #endif @@ -281,6 +309,10 @@ static struct pci_dispatch_table PCI_NIC { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82559ER, eepro100_probe }, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ID1029, eepro100_probe }, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ID1030, eepro100_probe }, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ID1031, eepro100_probe }, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ID1039, eepro100_probe }, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ID103B, eepro100_probe }, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ID1050, eepro100_probe }, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82562, eepro100_probe }, # endif /* INCLUDE_EEPRO100 */ # ifdef INCLUDE_EPIC100 diff -pruN grub-0.97/netboot/pci.h grub-0.97.new/netboot/pci.h --- grub-0.97/netboot/pci.h 2003-07-09 13:45:38.000000000 +0200 +++ grub-0.97.new/netboot/pci.h 2007-02-05 14:50:57.000000000 +0100 @@ -129,6 +129,10 @@ __asm__ __volatile__("pushl %0 ; popfl": #define PCI_DEVICE_ID_INTEL_82559ER 0x1209 #define PCI_DEVICE_ID_INTEL_ID1029 0x1029 #define PCI_DEVICE_ID_INTEL_ID1030 0x1030 +#define PCI_DEVICE_ID_INTEL_ID1031 0x1031 +#define PCI_DEVICE_ID_INTEL_ID1039 0x1039 +#define PCI_DEVICE_ID_INTEL_ID103B 0x103B +#define PCI_DEVICE_ID_INTEL_ID1050 0x1050 #define PCI_DEVICE_ID_INTEL_82562 0x2449 #define PCI_VENDOR_ID_AMD 0x1022 #define PCI_DEVICE_ID_AMD_LANCE 0x2000 ++++++ grub-install-fix-UUID_LABEL ++++++ --- grub-0.97/util/grub-install.in.orig 2007-03-16 17:29:21.000000000 +0100 +++ grub-0.97/util/grub-install.in 2007-03-16 17:43:14.000000000 +0100 @@ -216,7 +216,16 @@ resolve_symlink () { find_device () { # For now, this uses the program `df' to get the device name, but is # this really portable? - tmp_fname=`df $1/ | sed -n 's%.*\(/dev/[^ ]*\).*%\1%p'` + tmp_fname=`df $1/ | awk '/\/dev\/|LABEL=|UUID=/{ print $1 }'` + + if grep -q LABEL= <<<$tmp_fname; then + label=`sed -e s/.*=// <<<$tmp_fname` + tmp_fname=`readlink -f /dev/disk/by-label/$label` + fi + if grep -q UUID= <<<$tmp_fname; then + uuid=`sed -e s/.*=// <<<$tmp_fname` + tmp_fname=`readlink -f /dev/disk/by-uuid/$uuid` + fi if test -z "$tmp_fname"; then echo "Could not find device for $1" 2>&1 ++++++ grubonce ++++++ --- arch/i386/grub/grubonce 2006-04-20 18:53:09.000000000 +0200 +++ /mounts/work_src_done/STABLE/grub/grubonce 2007-03-16 17:27:00.000000000 +0100 @@ -17,8 +17,8 @@ if (@ARGV > 0) { # Argument may be entirely numerical, in which case it is an index, # or a perl RE that leads to the first title matching. - if (( $ARGV[0] =~ m,[0-9]+, && $titleno eq $ARGV[0] ) || - ( $ARGV[0] !~ m,[0-9]+, && $title_name =~ m,$ARGV[0],i) ) { + if (( $ARGV[0] =~ m,^[0-9]+$, && $titleno eq $ARGV[0] ) || + ( $ARGV[0] !~ m,^[0-9]+$, && $title_name =~ m,$ARGV[0],i) ) { $gotit = 1; last; } ++++++ recognise-zen ++++++ diff -Burbp grub-0.97.orig/stage2/fsys_ext2fs.c grub-0.97/stage2/fsys_ext2fs.c --- grub-0.97.orig/stage2/fsys_ext2fs.c 2007-03-16 14:15:52.000000000 +0100 +++ grub-0.97/stage2/fsys_ext2fs.c 2007-03-16 16:25:19.000000000 +0100 @@ -257,6 +257,8 @@ ext2fs_mount (void) if ((((current_drive & 0x80) || (current_slice != 0)) && (current_slice != PC_SLICE_TYPE_EXT2FS) && (current_slice != PC_SLICE_TYPE_LINUX_RAID) + && (current_slice != PC_SLICE_TYPE_ZEN) + && (current_slice != PC_SLICE_TYPE_ZEN_DISABLED) && (! IS_PC_SLICE_TYPE_BSD_WITH_FS (current_slice, FS_EXT2FS)) && (! IS_PC_SLICE_TYPE_BSD_WITH_FS (current_slice, FS_OTHER))) || part_length < (SBLOCK + (sizeof (struct ext2_super_block) / DEV_BSIZE)) diff -Burbp grub-0.97.orig/stage2/pc_slice.h grub-0.97/stage2/pc_slice.h --- grub-0.97.orig/stage2/pc_slice.h 2003-07-09 13:45:53.000000000 +0200 +++ grub-0.97/stage2/pc_slice.h 2007-03-16 16:24:16.000000000 +0100 @@ -114,6 +114,8 @@ #define PC_SLICE_TYPE_EXT2FS 0x83 #define PC_SLICE_TYPE_LINUX_EXTENDED 0x85 #define PC_SLICE_TYPE_VSTAFS 0x9e +#define PC_SLICE_TYPE_ZEN 0xbc +#define PC_SLICE_TYPE_ZEN_DISABLED 0xbd #define PC_SLICE_TYPE_DELL_UTIL 0xde #define PC_SLICE_TYPE_LINUX_RAID 0xfd ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de