commit trustedgrub

Hello community, here is the log from the commit of package trustedgrub checked in at Fri Nov 7 15:51:48 CET 2008. -------- --- arch/i386/trustedgrub/trustedgrub.changes 2008-10-27 10:38:52.000000000 +0100 +++ /mounts/work_src_done/STABLE/trustedgrub/trustedgrub.changes 2008-11-07 14:07:06.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Nov 7 14:02:41 CET 2008 - duwe@suse.de + +- pull from grub package fixes for BNC# + 386800,438236,408727,435958,422685 +- fix trustedgrub-specific bnc#425742, 433737 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- ext2-support-256byte-inodes grub-read-gpt ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ trustedgrub.spec ++++++ --- /var/tmp/diff_new_pack.O17554/_old 2008-11-07 15:50:43.000000000 +0100 +++ /var/tmp/diff_new_pack.O17554/_new 2008-11-07 15:50:43.000000000 +0100 @@ -26,7 +26,7 @@ License: GPL v2 or later Group: System/Boot Version: 1.1.3 -Release: 5 +Release: 6 Source0: TrustedGRUB-%{version}.tgz Source2: grubonce Source3: grub-install @@ -44,6 +44,8 @@ Patch14: disk-by-ID Patch16: recognise-zen Patch17: grub-install-fix-UUID_LABEL +Patch18: ext2-support-256byte-inodes +Patch19: grub-read-gpt Patch24: grub-%{version}-protexec.patch Patch25: pacify-autoconf Patch26: grub-grubonce-no-wait @@ -110,6 +112,8 @@ # %patch15 -p1 %patch16 -p1 %patch17 -p1 +%patch18 -p1 +%patch19 -p1 # %patch18 -p1 # %patch24 -p1 %patch25 -p1 @@ -129,7 +133,7 @@ %endif CFLAGS="$RPM_OPT_FLAGS -Os -DNDEBUG -W -Wall -Wpointer-arith $EXTRACFLAGS" ./configure \ --prefix=/usr --infodir=%{_infodir} --mandir=%{_mandir} --datadir=/usr/lib \ - --disable-auto-linux-mem-opt --disable-xfs + --disable-auto-linux-mem-opt --disable-xfs --disable-ffs --disable-ufs2 make %install @@ -146,7 +150,7 @@ rm -f $RPM_BUILD_ROOT/usr/share/man/man8/grub-terminfo* %clean -[ "$RPM_BUILD_ROOT" != "" -a -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; +rm -rf $RPM_BUILD_ROOT; %preun %install_info --delete --info-dir=%{_infodir} %{_infodir}/grub.info.gz @@ -183,6 +187,8 @@ # copy especially stage2 over, because it will be modified in-place ! cp -p /usr/lib/grub/*stage1* /boot/grub 2>/dev/null || true cp -p /usr/lib/grub/*/*stage1* /boot/grub 2>/dev/null || true +%install_info --info-dir=%{_infodir} %{_infodir}/grub.info.gz +%install_info --info-dir=%{_infodir} %{_infodir}/multiboot.info.gz #special hack for #46843 dd if=/usr/lib/grub/stage2 of=/boot/grub/stage2 bs=256k sync @@ -193,14 +199,18 @@ #if [ "X$ID_FS_TYPE" = "X" -o "t_$ID_FS_TYPE" = "t_xfs" ]; then # sync; sleep 5; sync; sleep 5; sync #fi +# Do not try to update/install in the chrooted build environment +[ -e /.buildenv ] && exit 0 # command sequence to update-install stage1/stage2. # leave everything else alone ! -[ -e /etc/grub.conf ] && /usr/sbin/grub --batch < /etc/grub.conf >/dev/null 2>&1 -%install_info --info-dir=%{_infodir} %{_infodir}/grub.info.gz -%install_info --info-dir=%{_infodir} %{_infodir}/multiboot.info.gz +[ -e /etc/grub.conf ] && /usr/sbin/grub --batch < /etc/grub.conf >/var/log/grub-install.log 2>&1 || true exit 0 %changelog +* Fri Nov 07 2008 duwe@suse.de +- pull from grub package fixes for BNC# + 386800,438236,408727,435958,422685 +- fix trustedgrub-specific bnc#425742, 433737 * Mon Oct 27 2008 kukuk@suse.de - disable unwind tables * Tue Sep 23 2008 dmueller@suse.de ++++++ disk-by-ID ++++++ --- /var/tmp/diff_new_pack.O17554/_old 2008-11-07 15:50:43.000000000 +0100 +++ /var/tmp/diff_new_pack.O17554/_new 2008-11-07 15:50:43.000000000 +0100 @@ -1,16 +1,20 @@ 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 +@@ -869,7 +869,15 @@ 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) ++ if (strncmp (dev, "/dev/disk/by-", 13) == 0) + { + sprintf (dev + len, "-part%d", pnum + 1); + } -+ else if (isdigit(dev[len-1])) ++ else if (strncmp (dev, "/dev/mapper/", 12) == 0) ++ { ++ sprintf (dev + len, "_part%d", pnum + 1); ++ } ++ else if (isdigit(dev[len-1]) || strncmp (dev, "/dev/i2o/", 9) == 0) { /* It is obviously some RAID disk: "/dev/<dsk>/c0d0" . "p1" */ sprintf (dev + len, "p%d", pnum + 1); ++++++ ext2-support-256byte-inodes ++++++ --- grub-0.97.orig/stage2/fsys_ext2fs.c 2008-04-14 11:57:47.000000000 +0200 +++ grub-0.97/stage2/fsys_ext2fs.c 2008-04-15 12:40:14.000000000 +0200 @@ -79,7 +79,50 @@ struct ext2_super_block __u32 s_rev_level; /* Revision level */ __u16 s_def_resuid; /* Default uid for reserved blocks */ __u16 s_def_resgid; /* Default gid for reserved blocks */ - __u32 s_reserved[235]; /* Padding to the end of the block */ + /* + * These fields are for EXT2_DYNAMIC_REV superblocks only. + * + * Note: the difference between the compatible feature set and + * the incompatible feature set is that if there is a bit set + * in the incompatible feature set that the kernel doesn't + * know about, it should refuse to mount the filesystem. + * + * e2fsck's requirements are more strict; if it doesn't know + * about a feature in either the compatible or incompatible + * feature set, it must abort and not try to meddle with + * things it doesn't understand... + */ + __u32 s_first_ino; /* First non-reserved inode */ + __u16 s_inode_size; /* size of inode structure */ + __u16 s_block_group_nr; /* block group # of this superblock */ + __u32 s_feature_compat; /* compatible feature set */ + __u32 s_feature_incompat; /* incompatible feature set */ + __u32 s_feature_ro_compat; /* readonly-compatible feature set */ + __u8 s_uuid[16]; /* 128-bit uuid for volume */ + char s_volume_name[16]; /* volume name */ + char s_last_mounted[64]; /* directory where last mounted */ + __u32 s_algorithm_usage_bitmap; /* For compression */ + /* + * Performance hints. Directory preallocation should only + * happen if the EXT2_COMPAT_PREALLOC flag is on. + */ + __u8 s_prealloc_blocks; /* Nr of blocks to try to preallocate*/ + __u8 s_prealloc_dir_blocks; /* Nr to preallocate for dirs */ + __u16 s_padding1; + /* + * Journaling support valid if EXT3_FEATURE_COMPAT_HAS_JOURNAL set. + */ + __u8 s_journal_uuid[16]; /* uuid of journal superblock */ + __u32 s_journal_inum; /* inode number of journal file */ + __u32 s_journal_dev; /* device number of journal file */ + __u32 s_last_orphan; /* start of list of inodes to delete */ + __u32 s_hash_seed[4]; /* HTREE hash seed */ + __u8 s_def_hash_version; /* Default hash version to use */ + __u8 s_reserved_char_pad; + __u16 s_reserved_word_pad; + __u32 s_default_mount_opts; + __u32 s_first_meta_bg; /* First metablock block group */ + __u32 s_reserved[190]; /* Padding to the end of the block */ }; struct ext2_group_desc @@ -218,6 +260,9 @@ struct ext2_dir_entry #define EXT2_ADDR_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / sizeof (__u32)) #define EXT2_ADDR_PER_BLOCK_BITS(s) (grub_log2(EXT2_ADDR_PER_BLOCK(s))) +#define EXT2_INODE_SIZE(s) (SUPERBLOCK->s_inode_size) +#define EXT2_INODES_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s)/EXT2_INODE_SIZE(s)) + /* linux/ext2_fs.h */ #define EXT2_BLOCK_SIZE_BITS(s) ((s)->s_log_block_size + 10) /* kind of from ext2/super.c */ @@ -555,7 +600,7 @@ ext2fs_dir (char *dirname) gdp = GROUP_DESC; ino_blk = gdp[desc].bg_inode_table + (((current_ino - 1) % (SUPERBLOCK->s_inodes_per_group)) - >> log2 (EXT2_BLOCK_SIZE (SUPERBLOCK) / sizeof (struct ext2_inode))); + >> log2 (EXT2_INODES_PER_BLOCK (SUPERBLOCK))); #ifdef E2DEBUG printf ("inode table fsblock=%d\n", ino_blk); #endif /* E2DEBUG */ @@ -567,13 +612,13 @@ ext2fs_dir (char *dirname) /* reset indirect blocks! */ mapblock2 = mapblock1 = -1; - raw_inode = INODE + - ((current_ino - 1) - & (EXT2_BLOCK_SIZE (SUPERBLOCK) / sizeof (struct ext2_inode) - 1)); + raw_inode = (struct ext2_inode *)( (unsigned long)INODE + + ((current_ino - 1) & (EXT2_INODES_PER_BLOCK (SUPERBLOCK) - 1)) + * EXT2_INODE_SIZE(SUPERBLOCK)); #ifdef E2DEBUG printf ("ipb=%d, sizeof(inode)=%d\n", - (EXT2_BLOCK_SIZE (SUPERBLOCK) / sizeof (struct ext2_inode)), - sizeof (struct ext2_inode)); + EXT2_INODES_PER_BLOCK (SUPERBLOCK), + EXT2_INODE_SIZE(SUPERBLOCK)); printf ("inode=%x, raw_inode=%x\n", INODE, raw_inode); printf ("offset into inode table block=%d\n", (int) raw_inode - (int) INODE); for (i = (unsigned char *) INODE; i <= (unsigned char *) raw_inode; ++++++ grubonce ++++++ --- /var/tmp/diff_new_pack.O17554/_old 2008-11-07 15:50:44.000000000 +0100 +++ /var/tmp/diff_new_pack.O17554/_new 2008-11-07 15:50:44.000000000 +0100 @@ -9,8 +9,8 @@ $titleno = -1; $global_default = undef; while(<MENU>) { - m,\s*default\s+(.+), && $titleno == -1 && ($global_default = $1); - next unless m,\s*title\s+(.*),i; + m,^\s*default\s+(.+), && $titleno == -1 && ($global_default = $1); + next unless m,^\s*title\s+(.*),i; $title_name = $1; $titleno++; ++++++ grub-read-gpt ++++++ diff -Nurp grub-0.97.old/stage2/builtins.c grub-0.97/stage2/builtins.c --- grub-0.97.old/stage2/builtins.c 2008-11-05 17:39:17.000000000 +0100 +++ grub-0.97/stage2/builtins.c 2008-11-05 17:40:36.000000000 +0100 @@ -1255,14 +1255,15 @@ find_func (char *arg, int flags) for (drive = 0x80; drive < 0x88; drive++) { unsigned long part = 0xFFFFFF; - unsigned long start, len, offset, ext_offset; - int type, entry; + unsigned long start, len, offset, ext_offset, gpt_offset; + int type, entry, gpt_count, gpt_size; char buf[SECTOR_SIZE]; current_drive = drive; while (next_partition (drive, 0xFFFFFF, &part, &type, &start, &len, &offset, &entry, - &ext_offset, buf)) + &ext_offset, &gpt_offset, + &gpt_count, &gpt_size, buf)) { if (type != PC_SLICE_TYPE_NONE && ! IS_PC_SLICE_TYPE_BSD (type) @@ -2877,8 +2878,8 @@ parttype_func (char *arg, int flags) { int new_type; unsigned long part = 0xFFFFFF; - unsigned long start, len, offset, ext_offset; - int entry, type; + unsigned long start, len, offset, ext_offset, gpt_offset; + int entry, type, gpt_count, gpt_size; char mbr[512]; /* Get the drive and the partition. */ @@ -2915,8 +2916,15 @@ parttype_func (char *arg, int flags) /* Look for the partition. */ while (next_partition (current_drive, 0xFFFFFF, &part, &type, &start, &len, &offset, &entry, - &ext_offset, mbr)) + &ext_offset, &gpt_offset, &gpt_count, &gpt_size, mbr)) { + /* The partition may not be a GPT partition. */ + if (gpt_offset != 0) + { + errnum = ERR_BAD_ARGUMENT; + return 1; + } + if (part == current_partition) { /* Found. */ diff -Nurp grub-0.97.old/stage2/disk_io.c grub-0.97/stage2/disk_io.c --- grub-0.97.old/stage2/disk_io.c 2008-11-05 17:39:17.000000000 +0100 +++ grub-0.97/stage2/disk_io.c 2008-11-05 17:40:36.000000000 +0100 @@ -21,6 +21,7 @@ #include #include +#include #ifdef SUPPORT_NETBOOT # define GRUB 1 @@ -502,8 +503,8 @@ int set_partition_hidden_flag (int hidden) { unsigned long part = 0xFFFFFF; - unsigned long start, len, offset, ext_offset; - int entry, type; + unsigned long start, len, offset, ext_offset, gpt_offset; + int entry, type, gpt_count, gpt_size; char mbr[512]; /* The drive must be a hard disk. */ @@ -524,8 +525,15 @@ set_partition_hidden_flag (int hidden) /* Look for the partition. */ while (next_partition (current_drive, 0xFFFFFF, &part, &type, &start, &len, &offset, &entry, - &ext_offset, mbr)) + &ext_offset, &gpt_offset, &gpt_count, &gpt_size, mbr)) + { + /* The partition may not be a GPT partition. */ + if (gpt_offset != 0) { + errnum = ERR_BAD_ARGUMENT; + return 1; + } + if (part == current_partition) { /* Found. */ @@ -577,11 +585,14 @@ next_partition (unsigned long drive, uns unsigned long *partition, int *type, unsigned long *start, unsigned long *len, unsigned long *offset, int *entry, - unsigned long *ext_offset, char *buf) + unsigned long *ext_offset, + unsigned long *gpt_offset, int *gpt_count, + int *gpt_size, char *buf) { /* Forward declarations. */ auto int next_bsd_partition (void); auto int next_pc_slice (void); + auto int next_gpt_slice(void); /* Get next BSD partition in current PC slice. */ int next_bsd_partition (void) @@ -666,6 +677,40 @@ next_partition (unsigned long drive, uns return 0; } + /* If this is a GPT partition table, read it as such. */ + if (*entry == -1 && *offset == 0 && PC_SLICE_TYPE (buf, 0) == PC_SLICE_TYPE_GPT) + { + struct grub_gpt_header *hdr = (struct grub_gpt_header *) buf; + + /* Read in the GPT Partition table header. */ + if (! rawread (drive, 1, 0, SECTOR_SIZE, buf)) + return 0; + + if (hdr->magic == GPT_HEADER_MAGIC && hdr->version == 0x10000) + { + /* Let gpt_offset point to the first entry in the GPT + partition table. This can also be used by callers of + next_partition to determine if a entry comes from a + GPT partition table or not. */ + *gpt_offset = hdr->partitions; + *gpt_count = hdr->maxpart; + *gpt_size = hdr->partentry_size; + + return next_gpt_slice(); + } + else + { + /* This is not a valid header for a GPT partition table. + Re-read the MBR or the boot sector of the extended + partition. */ + if (! rawread (drive, *offset, 0, SECTOR_SIZE, buf)) + return 0; + } + } + + /* Not a GPT partition. */ + *gpt_offset = 0; + /* Increase the entry number. */ (*entry)++; @@ -710,6 +755,43 @@ next_partition (unsigned long drive, uns return 1; } + /* Get the next GPT slice. */ + int next_gpt_slice (void) + { + struct grub_gpt_partentry *gptentry = (struct grub_gpt_partentry *) buf; + /* Make GPT partitions show up as PC slices. */ + int pc_slice_no = (*partition & 0xFF0000) >> 16; + + /* If this is the first time... */ + if (pc_slice_no == 0xFF) + { + pc_slice_no = -1; + *entry = -1; + } + + do { + (*entry)++; + + if (*entry >= *gpt_count) + { + errnum = ERR_NO_PART; + return 0; + } + /* Read in the GPT Partition table entry. */ + if (! rawread (drive, (*gpt_offset) + GPT_ENTRY_SECTOR (*gpt_size, *entry), GPT_ENTRY_INDEX (*gpt_size, *entry), *gpt_size, buf)) + return 0; + } while (! (gptentry->type1 && gptentry->type2)); + + pc_slice_no++; + *start = gptentry->start; + *len = gptentry->end - gptentry->start + 1; + *type = PC_SLICE_TYPE_EXT2FS; + *entry = pc_slice_no; + *partition = (*entry << 16) | 0xFFFF; + + return 1; + } + /* Start the body of this function. */ #ifndef STAGE1_5 @@ -717,6 +799,9 @@ next_partition (unsigned long drive, uns return 0; #endif + if (*partition != 0xFFFFFF && *gpt_offset != 0) + return next_gpt_slice (); + /* If previous partition is a BSD partition or a PC slice which contains BSD partitions... */ if ((*partition != 0xFFFFFF && IS_PC_SLICE_TYPE_BSD (*type & 0xff)) @@ -755,6 +840,9 @@ real_open_partition (int flags) unsigned long dest_partition = current_partition; unsigned long part_offset; unsigned long ext_offset; + unsigned long gpt_offset; + int gpt_count; + int gpt_size; int entry; char buf[SECTOR_SIZE]; int bsd_part, pc_slice; @@ -766,7 +854,8 @@ real_open_partition (int flags) int ret = next_partition (current_drive, dest_partition, ¤t_partition, ¤t_slice, &part_start, &part_length, - &part_offset, &entry, &ext_offset, buf); + &part_offset, &entry, &ext_offset, + &gpt_offset, &gpt_count, &gpt_size, buf); bsd_part = (current_partition >> 8) & 0xFF; pc_slice = current_partition >> 16; return ret; diff -Nurp grub-0.97.old/stage2/gpt.h grub-0.97/stage2/gpt.h --- grub-0.97.old/stage2/gpt.h 1970-01-01 01:00:00.000000000 +0100 +++ grub-0.97/stage2/gpt.h 2008-11-05 17:40:36.000000000 +0100 @@ -0,0 +1,68 @@ +/* + * GRUB -- GRand Unified Bootloader + * Copyright (C) 2002,2005,2006 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#ifndef _GPT_H +#define _GPT_H + +typedef signed char grub_int8_t; +typedef signed short grub_int16_t; +typedef signed int grub_int32_t; +typedef signed long long int grub_int64_t; +typedef unsigned char grub_uint8_t; +typedef unsigned short grub_uint16_t; +typedef unsigned int grub_uint32_t; +typedef unsigned long long int grub_uint64_t; + +struct grub_gpt_header +{ + grub_uint64_t magic; + grub_uint32_t version; + grub_uint32_t headersize; + grub_uint32_t crc32; + grub_uint32_t unused1; + grub_uint64_t primary; + grub_uint64_t backup; + grub_uint64_t start; + grub_uint64_t end; + grub_uint8_t guid[16]; + grub_uint64_t partitions; + grub_uint32_t maxpart; + grub_uint32_t partentry_size; + grub_uint32_t partentry_crc32; +} __attribute__ ((packed)); + +struct grub_gpt_partentry +{ + grub_uint64_t type1; + grub_uint64_t type2; + grub_uint8_t guid[16]; + grub_uint64_t start; + grub_uint64_t end; + grub_uint8_t attrib; + char name[72]; +} __attribute__ ((packed)); + +#define GPT_HEADER_MAGIC 0x5452415020494645ULL + +#define GPT_ENTRY_SECTOR(size,entry) \ + ((((entry) * (size) + 1) & ~(SECTOR_SIZE - 1)) >> SECTOR_BITS) +#define GPT_ENTRY_INDEX(size,entry) \ + ((((entry) * (size) + 1) & (SECTOR_SIZE - 1)) - 1) + +#endif /* _GPT_H */ diff -Nurp grub-0.97.old/stage2/pc_slice.h grub-0.97/stage2/pc_slice.h --- grub-0.97.old/stage2/pc_slice.h 2008-11-05 17:39:17.000000000 +0100 +++ grub-0.97/stage2/pc_slice.h 2008-11-05 17:40:36.000000000 +0100 @@ -117,6 +117,7 @@ #define PC_SLICE_TYPE_ZEN 0xbc #define PC_SLICE_TYPE_ZEN_DISABLED 0xbd #define PC_SLICE_TYPE_DELL_UTIL 0xde +#define PC_SLICE_TYPE_GPT 0xee #define PC_SLICE_TYPE_LINUX_RAID 0xfd diff -Nurp grub-0.97.old/stage2/shared.h grub-0.97/stage2/shared.h --- grub-0.97.old/stage2/shared.h 2008-11-05 17:39:17.000000000 +0100 +++ grub-0.97/stage2/shared.h 2008-11-05 17:40:36.000000000 +0100 @@ -984,7 +984,9 @@ int next_partition (unsigned long drive, unsigned long *partition, int *type, unsigned long *start, unsigned long *len, unsigned long *offset, int *entry, - unsigned long *ext_offset, char *buf); + unsigned long *ext_offset, + unsigned long *gpt_offset, int *gpt_count, + int *gpt_size, char *buf); /* Sets device to the one represented by the SAVED_* parameters. */ int make_saved_active (void); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org