grub2 1.96+20080724-9 (Re: (grub2) pre-approval for bug reporting improvements)
On Wed, Aug 27, 2008 at 09:44:35PM +0200, Luk Claes wrote:
> Robert Millan wrote:
> > Hi,
> >
> > The attached changes don't fix any end-user bug, but produce a very significant
> > improvement in the quality of the bug reports we will receive during lenny life
> > period (for example, #496040 and #489287 would have been much easier to triage
> > for us).
> >
> > Besides, they are rather undisruptive; so please consider pre-approving them.
>
> Please upload.
Here, included with 1.96+20080724-9. A debdiff is attached.
Thanks
--
Robert Millan
The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and
how) you may access your data; but nobody's threatening your freedom: we
still allow you to remove your data and not access it at all."
diff -u grub2-1.96+20080724/debian/changelog grub2-1.96+20080724/debian/changelog
--- grub2-1.96+20080724/debian/changelog
+++ grub2-1.96+20080724/debian/changelog
@@ -1,11 +1,37 @@
+grub2 (1.96+20080724-9) unstable; urgency=high
+
+ [ Felix Zielcke ]
+ * Remove build-depency of unifont-bin and bump version of unifont to
+ (>= 1:5.1.20080820-1), this avoids licensing problems (Closes: #496061)
+ * patches/00_skip_dev_leading_dot.diff: Add patch from Robert to skip
+ all devices which start with a dot not just directories (Closes: #486624)
+ * Fix a bit the changelog entry from me of previous version
+ - Colon missing on `Closes' for #494383.
+ - #464215 was on wrong line, it's about LVM dash problem not /dev/md/N.
+ - Align to 80 chars.
+ * patches/02_mdraid_sb_raid_disks.diff: Use raid_disks field of the mdraid
+ superblock instead of nr_disks (Closes: #496573)
+
+ [ Robert Millan ]
+ * Detect when grub-setup leaves core.img in filesystem, and include that
+ info in bug report templates.
+ - debian/patches/08_core_in_fs.diff
+ - debian/script
+ * Remove a red herring error message so that the real errors are displayed
+ (does not fix, but problem can be seen in #496040)
+ - debian/patches/00_kern_device_red_herring.diff
+
+ -- Robert Millan <rmh@aybabtu.com> Tue, 26 Aug 2008 23:40:47 +0200
+
grub2 (1.96+20080724-8) unstable; urgency=high
[ Felix Zielcke ]
* patches/00_fix_raid0.diff: Fix a `small' incorrect calculation for raid 0.
* patches/09_handle_md_slash_N.diff: Add support for /dev/md/N style mdraid
- devices. (Closes: #475585, #464215)
- * patches/10_handle_lvm_dash_escaping.diff: LVM escapes a dash with a dash and GRUB
- doestn't like that, so remove the double dashes. (Closes #494383)
+ devices. (Closes: #475585)
+ * patches/10_handle_lvm_dash_escaping.diff: LVM escapes a dash with a dash
+ and GRUB doestn't like that, so remove the double dashes. (Closes: #494383,
+ #464215)
[ Robert Millan ]
* Handle errors in RAID/LVM scan routine (rather than letting the upper
@@ -14,7 +40,7 @@
- debian/patches/00_grub_print_error.diff: Fix a bug exposed by
00_raid_lvm_error_handling.diff.
- -- Robert Millan <rmh@aybabtu.com> Mon, 18 Aug 2008 15:17:29 +0200
+ -- Felix Zielcke <fzielcke@z-51.de> Sat, 23 Aug 2008 15:04:22 +0200
grub2 (1.96+20080724-7) unstable; urgency=high
diff -u grub2-1.96+20080724/debian/control grub2-1.96+20080724/debian/control
--- grub2-1.96+20080724/debian/control
+++ grub2-1.96+20080724/debian/control
@@ -10,7 +10,7 @@
gcc-multilib [amd64 kfreebsd-amd64 ppc64] | gcc-4.1 (<< 4.1.2) [amd64 kfreebsd-amd64 ppc64],
libncurses5-dev,
liblzo2-dev (>= 2.03) [i386 kfreebsd-i386 hurd-i386 amd64 kfreebsd-amd64] | liblzo-dev [i386 kfreebsd-i386 hurd-i386 amd64 kfreebsd-amd64],
- unifont (>= 1:5.1.20080808-2) | unifont-bin (<< 1:5.1.20080706-1),
+ unifont (>= 1:5.1.20080820-1),
help2man
Build-Conflicts: autoconf2.13, liblzo2-dev (<< 2.02)
Standards-Version: 3.8.0
diff -u grub2-1.96+20080724/debian/script grub2-1.96+20080724/debian/script
--- grub2-1.96+20080724/debian/script
+++ grub2-1.96+20080724/debian/script
@@ -1,5 +1,9 @@
#!/bin/bash -e
+if test -e /boot/grub/setup_left_core_image_in_filesystem ; then
+ echo -e "\n*********************** WARNING grub-setup left core.img in filesystem" >&3
+fi
+
for i in /proc/mounts ; do
if test -e $i ; then
echo -e "\n*********************** BEGIN $i" >&3
diff -u grub2-1.96+20080724/debian/po/es.po grub2-1.96+20080724/debian/po/es.po
--- grub2-1.96+20080724/debian/po/es.po
+++ grub2-1.96+20080724/debian/po/es.po
@@ -18,8 +18,8 @@
# - La guía de traducción de po's de debconf:
# /usr/share/doc/po-debconf/README-trans
# o http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-#
+#
+#
msgid ""
msgstr ""
"Project-Id-Version: grub2 1.96\n"
only in patch2:
unchanged:
--- grub2-1.96+20080724.orig/debian/patches/00_kern_device_red_herring.diff
+++ grub2-1.96+20080724/debian/patches/00_kern_device_red_herring.diff
@@ -0,0 +1,10 @@
+--- kern/device.c 2008-07-04 00:56:43.000000000 +0200
++++ kern/device.c.new 2008-08-26 23:44:32.000000000 +0200
+@@ -50,7 +50,6 @@
+ disk = grub_disk_open (name);
+ if (! disk)
+ {
+- grub_error (GRUB_ERR_BAD_DEVICE, "unknown device %s", name);
+ goto fail;
+ }
+
only in patch2:
unchanged:
--- grub2-1.96+20080724.orig/debian/patches/08_core_in_fs.diff
+++ grub2-1.96+20080724/debian/patches/08_core_in_fs.diff
@@ -0,0 +1,31 @@
+Index: util/i386/pc/grub-setup.c
+===================================================================
+--- util/i386/pc/grub-setup.c (revision 1828)
++++ util/i386/pc/grub-setup.c (working copy)
+@@ -53,6 +53,7 @@
+
+ #define DEFAULT_BOOT_FILE "boot.img"
+ #define DEFAULT_CORE_FILE "core.img"
++#define CORE_IMG_IN_FS "setup_left_core_image_in_filesystem"
+
+ /* This is the blocklist used in the diskboot image. */
+ struct boot_blocklist
+@@ -350,6 +351,8 @@
+ boot_img))
+ grub_util_error ("%s", grub_errmsg);
+
++ unlink (DEFAULT_DIRECTORY "/" CORE_IMG_IN_FS);
++
+ goto finish;
+ }
+ else
+@@ -365,6 +368,9 @@
+ /* The core image must be put on a filesystem unfortunately. */
+ grub_util_info ("will leave the core image on the filesystem");
+
++ fp = fopen (DEFAULT_DIRECTORY "/" CORE_IMG_IN_FS, "w");
++ fclose (fp);
++
+ /* Make sure that GRUB reads the identical image as the OS. */
+ tmp_img = xmalloc (core_size);
+ core_path_dev = grub_util_get_path (DEFAULT_DIRECTORY, core_file);
only in patch2:
unchanged:
--- grub2-1.96+20080724.orig/debian/patches/02_mdraid_sb_raid_disks.diff
+++ grub2-1.96+20080724/debian/patches/02_mdraid_sb_raid_disks.diff
@@ -0,0 +1,11 @@
+--- disk/raid.c 2008-08-25 20:21:55.000000000 +0200
++++ disk/raid.c 2008-08-25 20:23:28.000000000 +0200
+@@ -459,7 +459,7 @@
+ array->version = sb.major_version;
+ array->level = sb.level;
+ array->layout = sb.layout;
+- array->total_devs = sb.nr_disks;
++ array->total_devs = sb.raid_disks;
+ array->nr_devs = 0;
+ array->uuid[0] = sb.set_uuid0;
+ array->uuid[1] = sb.set_uuid1;
only in patch2:
unchanged:
--- grub2-1.96+20080724.orig/debian/patches/00_skip_dev_leading_dot.diff
+++ grub2-1.96+20080724/debian/patches/00_skip_dev_leading_dot.diff
@@ -0,0 +1,35 @@
+2008-08-23 Robert Millan <rmh@aybabtu.com>
+
+ * util/getroot.c (find_root_device): Skip anything that starts with
+ a dot, not just directories. This avoids things like /dev/.tmp.md0.
+
+Index: util/getroot.c
+===================================================================
+--- util/getroot.c (Revision 1825)
++++ util/getroot.c (Revision 1826)
+@@ -196,7 +196,10 @@
+ {
+ struct stat st;
+
+- if (strcmp (ent->d_name, ".") == 0 || strcmp (ent->d_name, "..") == 0)
++ /* Avoid:
++ - dotfiles (like "/dev/.tmp.md0") since they could be duplicates.
++ - dotdirs (like "/dev/.static") since they could contain duplicates. */
++ if (ent->d_name[0] == '.')
+ continue;
+
+ if (lstat (ent->d_name, &st) < 0)
+@@ -207,11 +210,9 @@
+ /* Don't follow symbolic links. */
+ continue;
+
+- if (S_ISDIR (st.st_mode) && ent->d_name[0] != '.')
++ if (S_ISDIR (st.st_mode))
+ {
+- /* Find it recursively, but avoid dotdirs (like ".static") since they
+- could contain duplicates, which would later break the
+- pathname-based check */
++ /* Find it recursively. */
+ char *res;
+
+ res = find_root_device (ent->d_name, dev);
Reply to: