Merge lp:~psusi/ubuntu/raring/grub2/fix-ldm into lp:ubuntu/raring/grub2

[Phillip Susi]

[Colin Watson (cjwatson)]

I'll look at this, but this belongs at least in Debian rather than landing directly in Ubuntu, and I want to look at its upstream status first. Please could other sponsors leave this one alone for now?

[Stéphane Graber (stgraber)]

Hi Colin,

I assigned the review to you and marked the branch as Work in progress, this should make it disappear from the sponsoring report, that way no sponsor will touch it and it should avoid having people read through it over and over again.

Unmerged revisions

163. By Phillip Susi on 2012-11-28

debian/ldm-require-sfs-partition.patch: Only recognize ldm partition
table if there is an SFS partition listed in the DOS MBR (LP: #1061255)

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2012-10-31 10:36:57 +0000
+++ .pc/applied-patches	2012-12-03 15:02:19 +0000
@@ -56,3 +56,4 @@
 ubuntu_mount_readdir_symlink_failures.patch
 ubuntu_initrd_addr_min.patch
 ubuntu_gnulib_gets.patch
+ldm-require-sfs-partition.patch

=== added directory '.pc/ldm-require-sfs-partition.patch'
=== added file '.pc/ldm-require-sfs-partition.patch/.timestamp'
=== added file '.pc/ldm-require-sfs-partition.patch/Makefile.util.def'
--- .pc/ldm-require-sfs-partition.patch/Makefile.util.def	1970-01-01 00:00:00 +0000
+++ .pc/ldm-require-sfs-partition.patch/Makefile.util.def	2012-12-03 15:02:19 +0000
@@ -0,0 +1,783 @@
+AutoGen definitions Makefile.tpl;
+
+library = {
+  name = libgrubkern.a;
+  cflags = '$(CFLAGS_GNULIB)';
+  cppflags = '$(CPPFLAGS_GNULIB)';
+
+  common = util/misc.c;
+  common = grub-core/kern/command.c;
+  common = grub-core/kern/device.c;
+  common = grub-core/kern/disk.c;
+  common = util/getroot.c;
+  common = util/raid.c;
+  common = grub-core/kern/emu/hostdisk.c;
+  common = grub-core/kern/emu/misc.c;
+  common = grub-core/kern/emu/mm.c;
+  common = grub-core/kern/env.c;
+  common = grub-core/kern/err.c;
+  common = grub-core/kern/file.c;
+  common = grub-core/kern/fs.c;
+  common = grub-core/kern/list.c;
+  common = grub-core/kern/misc.c;
+  common = grub-core/kern/partition.c;
+  common = grub-core/lib/crypto.c;
+  common = grub-core/disk/luks.c;
+  common = grub-core/disk/geli.c;
+  common = grub-core/disk/cryptodisk.c;
+  common = grub-core/disk/AFSplitter.c;
+  common = grub-core/lib/pbkdf2.c;
+  common = grub-core/commands/extcmd.c;
+  common = grub-core/lib/arg.c;
+  common = grub-core/disk/ldm.c;
+  common = grub-core/disk/diskfilter.c;
+  common = grub-core/partmap/gpt.c;
+};
+
+library = {
+  name = libgrubmods.a;
+  cflags = '$(CFLAGS_POSIX) -Wno-undef -Wno-error=missing-noreturn';
+  cppflags = '-I$(top_srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H';
+
+  common_nodist = grub_script.tab.c;
+  common_nodist = grub_script.yy.c;
+  common_nodist = libgrub_a_init.c;
+  common_nodist = grub_script.yy.h;
+  common_nodist = grub_script.tab.h;
+
+  common = grub-core/commands/blocklist.c;
+  common = grub-core/commands/xnu_uuid.c;
+  common = grub-core/commands/testload.c;
+  common = grub-core/commands/ls.c;
+  common = grub-core/disk/dmraid_nvidia.c;
+  common = grub-core/disk/loopback.c;
+  common = grub-core/disk/lvm.c;
+  common = grub-core/disk/mdraid_linux.c;
+  common = grub-core/disk/mdraid_linux_be.c;
+  common = grub-core/disk/mdraid1x_linux.c;
+  common = grub-core/disk/raid5_recover.c;
+  common = grub-core/disk/raid6_recover.c;
+  common = grub-core/fs/affs.c;
+  common = grub-core/fs/afs.c;
+  common = grub-core/fs/bfs.c;
+  common = grub-core/fs/btrfs.c;
+  common = grub-core/fs/cpio.c;
+  common = grub-core/fs/cpio_be.c;
+  common = grub-core/fs/odc.c;
+  common = grub-core/fs/newc.c;
+  common = grub-core/fs/ext2.c;
+  common = grub-core/fs/fat.c;
+  common = grub-core/fs/exfat.c;
+  common = grub-core/fs/fshelp.c;
+  common = grub-core/fs/hfs.c;
+  common = grub-core/fs/hfsplus.c;
+  common = grub-core/fs/iso9660.c;
+  common = grub-core/fs/jfs.c;
+  common = grub-core/fs/minix.c;
+  common = grub-core/fs/minix2.c;
+  common = grub-core/fs/minix3.c;
+  common = grub-core/fs/minix_be.c;
+  common = grub-core/fs/minix2_be.c;
+  common = grub-core/fs/minix3_be.c;
+  common = grub-core/fs/nilfs2.c;
+  common = grub-core/fs/ntfs.c;
+  common = grub-core/fs/ntfscomp.c;
+  common = grub-core/fs/reiserfs.c;
+  common = grub-core/fs/romfs.c;
+  common = grub-core/fs/sfs.c;
+  common = grub-core/fs/squash4.c;
+  common = grub-core/fs/tar.c;
+  common = grub-core/fs/udf.c;
+  common = grub-core/fs/ufs2.c;
+  common = grub-core/fs/ufs.c;
+  common = grub-core/fs/xfs.c;
+  common = grub-core/fs/zfs/zfscrypt.c;
+  common = grub-core/fs/zfs/zfs.c;
+  common = grub-core/fs/zfs/zfsinfo.c;
+  common = grub-core/fs/zfs/zfs_lzjb.c;
+  common = grub-core/fs/zfs/zfs_sha256.c;
+  common = grub-core/fs/zfs/zfs_fletcher.c;
+  common = grub-core/lib/envblk.c;
+  common = grub-core/lib/hexdump.c;
+  common = grub-core/lib/LzFind.c;
+  common = grub-core/lib/LzmaEnc.c;
+  common = grub-core/lib/crc.c;
+  common = grub-core/lib/adler32.c;
+  common = grub-core/lib/crc64.c;
+  common = grub-core/normal/datetime.c;
+  common = grub-core/normal/misc.c;
+  common = grub-core/partmap/acorn.c;
+  common = grub-core/partmap/amiga.c;
+  common = grub-core/partmap/apple.c;
+  common = grub-core/partmap/msdos.c;
+  common = grub-core/partmap/sun.c;
+  common = grub-core/partmap/plan.c;
+  common = grub-core/partmap/dvh.c;
+  common = grub-core/partmap/sunpc.c;
+  common = grub-core/partmap/bsdlabel.c;
+  common = grub-core/script/function.c;
+  common = grub-core/script/lexer.c;
+  common = grub-core/script/main.c;
+  common = grub-core/script/script.c;
+  common = grub-core/script/argv.c;
+  common = grub-core/io/gzio.c;
+  common = grub-core/io/lzopio.c;
+  common = grub-core/kern/ia64/dl_helper.c;
+  common = grub-core/lib/minilzo/minilzo.c;
+  common = grub-core/lib/xzembed/xz_dec_bcj.c;
+  common = grub-core/lib/xzembed/xz_dec_lzma2.c;
+  common = grub-core/lib/xzembed/xz_dec_stream.c;
+};
+
+program = {
+  name = grub-bin2h;
+  common = util/bin2h.c;
+  ldadd = libgrubmods.a;
+  ldadd = libgrubgcry.a;
+  ldadd = libgrubkern.a;
+  ldadd = grub-core/gnulib/libgnu.a;
+  ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
+  installdir = noinst;
+};
+
+program = {
+  name = grub-mkimage;
+  mansection = 1;
+
+  common = util/grub-mkimage.c;
+  common = util/resolve.c;
+  common = grub-core/kern/emu/argp_common.c;
+
+  extra_dist = util/grub-mkimagexx.c;
+
+  ldadd = libgrubmods.a;
+  ldadd = libgrubgcry.a;
+  ldadd = libgrubkern.a;
+  ldadd = grub-core/gnulib/libgnu.a;
+  ldadd = '$(LIBLZMA)';
+  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
+  cppflags = '-DGRUB_PKGLIBDIR=\"$(pkglibdir)\"';
+};
+
+program = {
+  name = grub-mkrelpath;
+  mansection = 1;
+
+  common = util/grub-mkrelpath.c;
+  common = grub-core/kern/emu/argp_common.c;
+
+  ldadd = libgrubmods.a;
+  ldadd = libgrubgcry.a;
+  ldadd = libgrubkern.a;
+  ldadd = grub-core/gnulib/libgnu.a;
+  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
+};
+
+program = {
+  name = grub-script-check;
+  mansection = 1;
+
+  common = util/grub-script-check.c;
+  common = grub-core/kern/emu/argp_common.c;
+
+  ldadd = libgrubmods.a;
+  ldadd = libgrubgcry.a;
+  ldadd = libgrubkern.a;
+  ldadd = grub-core/gnulib/libgnu.a;
+  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
+};
+
+program = {
+  name = grub-editenv;
+  mansection = 1;
+
+  common = util/grub-editenv.c;
+
+  ldadd = libgrubmods.a;
+  ldadd = libgrubgcry.a;
+  ldadd = libgrubkern.a;
+  ldadd = grub-core/gnulib/libgnu.a;
+  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
+};
+
+program = {
+  name = grub-mkpasswd-pbkdf2;
+  mansection = 1;
+
+  common = util/grub-mkpasswd-pbkdf2.c;
+  common = grub-core/kern/emu/argp_common.c;
+
+  ldadd = libgrubmods.a;
+  ldadd = libgrubgcry.a;
+  ldadd = libgrubkern.a;
+  ldadd = grub-core/gnulib/libgnu.a;
+  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
+  cflags = '$(CFLAGS_GCRY)';
+  cppflags = '$(CPPFLAGS_GCRY)';
+};
+
+program = {
+  name = grub-macho2img;
+  mansection = 1;
+  common = util/grub-macho2img.c;
+  condition = COND_APPLE_CC;
+};
+
+program = {
+  name = grub-pe2elf;
+  mansection = 1;
+  common = util/grub-pe2elf.c;
+
+  ldadd = libgrubmods.a;
+  ldadd = libgrubgcry.a;
+  ldadd = libgrubkern.a;
+  ldadd = grub-core/gnulib/libgnu.a;
+  ldadd = '$(LIBINTL)';
+  condition = COND_GRUB_PE2ELF;
+};
+
+program = {
+  name = grub-fstest;
+  mansection = 1;
+  common_nodist = grub_fstest_init.c;
+  common = util/grub-fstest.c;
+  common = grub-core/kern/emu/hostfs.c;
+  common = grub-core/disk/host.c;
+
+  cflags = '$(CFLAGS_GCRY)';
+  cppflags = '$(CPPFLAGS_GCRY)';
+
+  ldadd = libgrubmods.a;
+  ldadd = libgrubgcry.a;
+  ldadd = libgrubkern.a;
+  ldadd = grub-core/gnulib/libgnu.a;
+  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
+};
+
+program = {
+  name = grub-mount;
+  mansection = 1;
+  common_nodist = grub_fstest_init.c;
+  common = util/grub-mount.c;
+  common = grub-core/kern/emu/hostfs.c;
+  common = grub-core/disk/host.c;
+
+  ldadd = libgrubmods.a;
+  ldadd = libgrubgcry.a;
+  ldadd = libgrubkern.a;
+  ldadd = grub-core/gnulib/libgnu.a;
+  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse';
+  condition = COND_GRUB_MOUNT;
+};
+
+program = {
+  name = grub-mkfont;
+  mansection = 1;
+  common = util/grub-mkfont.c;
+  common = grub-core/unidata.c;
+  common = grub-core/kern/emu/argp_common.c;
+
+  cflags = '$(freetype_cflags)';
+
+  ldadd = libgrubmods.a;
+  ldadd = libgrubgcry.a;
+  ldadd = libgrubkern.a;
+  ldadd = grub-core/gnulib/libgnu.a;
+  ldadd = '$(freetype_libs)';
+  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
+  condition = COND_GRUB_MKFONT;
+};
+
+program = {
+  name = grub-mkdevicemap;
+  installdir = sbin;
+  mansection = 8;
+
+  common = util/grub-mkdevicemap.c;
+  common = util/deviceiter.c;
+  common = util/devicemap.c;
+
+  ldadd = libgrubmods.a;
+  ldadd = libgrubgcry.a;
+  ldadd = libgrubkern.a;
+  ldadd = grub-core/gnulib/libgnu.a;
+  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
+};
+
+program = {
+  name = grub-probe;
+  installdir = sbin;
+  mansection = 8;
+  common = util/grub-probe.c;
+  common = util/ieee1275/ofpath.c;
+  common = grub-core/kern/emu/argp_common.c;
+
+  ldadd = libgrubmods.a;
+  ldadd = libgrubgcry.a;
+  ldadd = libgrubkern.a;
+  ldadd = grub-core/gnulib/libgnu.a;
+  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
+};
+
+program = {
+  name = grub-bios-setup;
+  installdir = sbin;
+  mansection = 8;
+  common = util/grub-setup.c;
+  common = util/lvm.c;
+  common = grub-core/kern/emu/argp_common.c;
+  common = grub-core/lib/reed_solomon.c;
+
+  ldadd = libgrubmods.a;
+  ldadd = libgrubkern.a;
+  ldadd = libgrubgcry.a;
+  ldadd = grub-core/gnulib/libgnu.a;
+  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
+  cppflags = '-DGRUB_SETUP_BIOS=1';
+};
+
+program = {
+  name = grub-sparc64-setup;
+  installdir = sbin;
+  mansection = 8;
+  common = util/grub-setup.c;
+  common = util/lvm.c;
+  common = grub-core/kern/emu/argp_common.c;
+  common = grub-core/lib/reed_solomon.c;
+  common = util/ieee1275/ofpath.c;
+
+  ldadd = libgrubmods.a;
+  ldadd = libgrubkern.a;
+  ldadd = libgrubgcry.a;
+  ldadd = grub-core/gnulib/libgnu.a;
+  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
+  cppflags = '-DGRUB_SETUP_SPARC64=1';
+};
+
+program = {
+  name = grub-ofpathname;
+  installdir = sbin;
+  mansection = 8;
+  common = util/ieee1275/grub-ofpathname.c;
+  common = util/ieee1275/ofpath.c;
+
+  ldadd = libgrubmods.a;
+  ldadd = libgrubgcry.a;
+  ldadd = libgrubkern.a;
+  ldadd = grub-core/gnulib/libgnu.a;
+  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBGEOM)';
+};
+
+program = {
+  name = grub-mklayout;
+  mansection = 1;
+
+  common = util/grub-mklayout.c;
+  common = grub-core/kern/emu/argp_common.c;
+
+  ldadd = libgrubmods.a;
+  ldadd = libgrubgcry.a;
+  ldadd = libgrubkern.a;
+  ldadd = grub-core/gnulib/libgnu.a;
+  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
+};
+
+data = {
+  common = util/grub.d/README;
+  installdir = grubconf;
+};
+
+script = {
+  name = '00_header';
+  common = util/grub.d/00_header.in;
+  installdir = grubconf;
+};
+
+script = {
+  name = '10_windows';
+  common = util/grub.d/10_windows.in;
+  installdir = grubconf;
+  condition = COND_HOST_WINDOWS;
+};
+
+script = {
+  name = '10_hurd';
+  common = util/grub.d/10_hurd.in;
+  installdir = grubconf;
+  condition = COND_HOST_HURD;
+};
+
+script = {
+  name = '10_kfreebsd';
+  common = util/grub.d/10_kfreebsd.in;
+  installdir = grubconf;
+  condition = COND_HOST_KFREEBSD;
+};
+
+script = {
+  name = '10_illumos';
+  common = util/grub.d/10_illumos.in;
+  installdir = grubconf;
+  condition = COND_HOST_ILLUMOS;
+};
+
+script = {
+  name = '10_netbsd';
+  common = util/grub.d/10_netbsd.in;
+  installdir = grubconf;
+  condition = COND_HOST_NETBSD;
+};
+
+script = {
+  name = '10_linux';
+  common = util/grub.d/10_linux.in;
+  installdir = grubconf;
+  condition = COND_HOST_LINUX;
+};
+
+script = {
+  name = '10_xnu';
+  common = util/grub.d/10_xnu.in;
+  installdir = grubconf;
+  condition = COND_HOST_XNU;
+};
+
+script = {
+  name = '20_linux_xen';
+  common = util/grub.d/20_linux_xen.in;
+  installdir = grubconf;
+  condition = COND_HOST_LINUX;
+};
+
+script = {
+  name = '30_os-prober';
+  common = util/grub.d/30_os-prober.in;
+  installdir = grubconf;
+};
+
+script = {
+  name = '30_uefi-firmware';
+  common = util/grub.d/30_uefi-firmware.in;
+  installdir = grubconf;
+};
+
+script = {
+  name = '40_custom';
+  common = util/grub.d/40_custom.in;
+  installdir = grubconf;
+};
+
+script = {
+  name = '41_custom';
+  common = util/grub.d/41_custom.in;
+  installdir = grubconf;
+};
+
+script = {
+  mansection = 1;
+  name = grub-mkrescue;
+  x86 = util/grub-mkrescue.in;
+  mips_qemu_mips = util/grub-mkrescue.in;
+  mips_loongson = util/grub-mkrescue.in;
+  ia64_efi = util/grub-mkrescue.in;
+  powerpc_ieee1275 = util/powerpc/ieee1275/grub-mkrescue.in;
+  enable = i386_pc;
+  enable = i386_efi;
+  enable = x86_64_efi;
+  enable = i386_qemu;
+  enable = i386_multiboot;
+  enable = i386_coreboot;
+  enable = mips_qemu_mips;
+  enable = mips_loongson;
+  enable = ia64_efi;
+  enable = powerpc_ieee1275;
+};
+
+script = {
+  mansection = 1;
+  name = grub-mkstandalone;
+  common = util/grub-mkstandalone.in;
+};
+
+script = {
+  mansection = 8;
+  installdir = sbin;
+  name = grub-install;
+
+  common = util/grub-install.in;
+  enable = noemu;
+};
+
+script = {
+  mansection = 8;
+  installdir = sbin;
+  name = grub-mknetdir;
+
+  common = util/grub-mknetdir.in;
+};
+
+script = {
+  name = grub-mkconfig;
+  common = util/grub-mkconfig.in;
+  mansection = 8;
+  installdir = sbin;
+};
+
+script = {
+  name = grub-set-default;
+  common = util/grub-set-default.in;
+  mansection = 8;
+  installdir = sbin;
+};
+
+script = {
+  name = grub-reboot;
+  common = util/grub-reboot.in;
+  mansection = 8;
+  installdir = sbin;
+};
+
+script = {
+  name = grub-mkconfig_lib;
+  common = util/grub-mkconfig_lib.in;
+  installdir = noinst;
+};
+
+script = {
+  name = grub-kbdcomp;
+  common = util/grub-kbdcomp.in;
+  mansection = 1;
+};
+
+script = {
+  name = grub-shell;
+  common = tests/util/grub-shell.in;
+  installdir = noinst;
+};
+
+script = {
+  name = grub-shell-tester;
+  common = tests/util/grub-shell-tester.in;
+  installdir = noinst;
+};
+
+script = {
+  testcase;
+  name = example_scripted_test;
+  common = tests/example_scripted_test.in;
+};
+
+script = {
+  testcase;
+  name = example_grub_script_test;
+  common = tests/example_grub_script_test.in;
+};
+
+script = {
+  testcase;
+  name = grub_script_echo1;
+  common = tests/grub_script_echo1.in;
+};
+
+script = {
+  testcase;
+  name = grub_script_leading_whitespace;
+  common = tests/grub_script_leading_whitespace.in;
+};
+
+script = {
+  testcase;
+  name = grub_script_echo_keywords;
+  common = tests/grub_script_echo_keywords.in;
+};
+
+script = {
+  testcase;
+  name = grub_script_vars1;
+  common = tests/grub_script_vars1.in;
+};
+
+script = {
+  testcase;
+  name = grub_script_for1;
+  common = tests/grub_script_for1.in;
+};
+
+script = {
+  testcase;
+  name = grub_script_while1;
+  common = tests/grub_script_while1.in;
+};
+
+script = {
+  testcase;
+  name = grub_script_if;
+  common = tests/grub_script_if.in;
+};
+
+script = {
+  testcase;
+  name = grub_script_blanklines;
+  common = tests/grub_script_blanklines.in;
+};
+
+script = {
+  testcase;
+  name = grub_script_final_semicolon;
+  common = tests/grub_script_final_semicolon.in;
+};
+
+script = {
+  testcase;
+  name = grub_script_dollar;
+  common = tests/grub_script_dollar.in;
+};
+
+script = {
+  testcase;
+  name = grub_script_comments;
+  common = tests/grub_script_comments.in;
+};
+
+script = {
+  testcase;
+  name = grub_script_functions;
+  common = tests/grub_script_functions.in;
+};
+
+script = {
+  testcase;
+  name = grub_script_break;
+  common = tests/grub_script_break.in;
+};
+
+script = {
+  testcase;
+  name = grub_script_continue;
+  common = tests/grub_script_continue.in;
+};
+
+script = {
+  testcase;
+  name = grub_script_shift;
+  common = tests/grub_script_shift.in;
+};
+
+script = {
+  testcase;
+  name = grub_script_blockarg;
+  common = tests/grub_script_blockarg.in;
+};
+
+script = {
+  testcase;
+  name = grub_script_setparams;
+  common = tests/grub_script_setparams.in;
+};
+
+script = {
+  testcase;
+  name = grub_script_return;
+  common = tests/grub_script_return.in;
+};
+
+script = {
+  testcase;
+  name = grub_cmd_regexp;
+  common = tests/grub_cmd_regexp.in;
+};
+
+script = {
+  testcase;
+  name = grub_script_expansion;
+  common = tests/grub_script_expansion.in;
+};
+
+script = {
+  testcase;
+  name = grub_script_not;
+  common = tests/grub_script_not.in;
+};
+
+script = {
+  testcase;
+  name = partmap_test;
+  common = tests/partmap_test.in;
+};
+
+script = {
+  testcase;
+  name = grub_cmd_echo;
+  common = tests/grub_cmd_echo.in;
+};
+
+script = {
+  testcase;
+  name = grub_script_gettext;
+  common = tests/grub_script_gettext.in;
+};
+
+script = {
+  testcase;
+  name = grub_script_strcmp;
+  common = tests/grub_script_strcmp.in;
+};
+
+program = {
+  testcase;
+  name = example_unit_test;
+  common = tests/example_unit_test.c;
+  common = tests/lib/unit_test.c;
+  common = grub-core/kern/list.c;
+  common = grub-core/kern/misc.c;
+  common = grub-core/tests/lib/test.c;
+  ldadd = libgrubmods.a;
+  ldadd = libgrubgcry.a;
+  ldadd = libgrubkern.a;
+  ldadd = grub-core/gnulib/libgnu.a;
+  ldadd = '$(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
+};
+
+program = {
+  testcase;
+  name = printf_test;
+  common = tests/printf_unit_test.c;
+  common = tests/lib/unit_test.c;
+  common = grub-core/kern/list.c;
+  common = grub-core/kern/misc.c;
+  common = grub-core/tests/lib/test.c;
+  ldadd = libgrubmods.a;
+  ldadd = libgrubgcry.a;
+  ldadd = libgrubkern.a;
+  ldadd = grub-core/gnulib/libgnu.a;
+  ldadd = '$(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
+};
+
+program = {
+  testcase;
+  name = cmp_test;
+  common = tests/cmp_unit_test.c;
+  common = tests/lib/unit_test.c;
+  common = grub-core/kern/list.c;
+  common = grub-core/kern/misc.c;
+  common = grub-core/tests/lib/test.c;
+  ldadd = libgrubmods.a;
+  ldadd = libgrubgcry.a;
+  ldadd = libgrubkern.a;
+  ldadd = grub-core/gnulib/libgnu.a;
+  ldadd = '$(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
+};
+
+program = {
+  name = grub-menulst2cfg;
+  mansection = 1;
+  common = util/grub-menulst2cfg.c;
+  common = grub-core/lib/legacy_parse.c;
+  common = grub-core/lib/i386/pc/vesa_modes_table.c;
+
+  ldadd = libgrubmods.a;
+  ldadd = libgrubgcry.a;
+  ldadd = libgrubkern.a;
+  ldadd = grub-core/gnulib/libgnu.a;
+  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
+};

=== added directory '.pc/ldm-require-sfs-partition.patch/grub-core'
=== added directory '.pc/ldm-require-sfs-partition.patch/grub-core/disk'
=== added file '.pc/ldm-require-sfs-partition.patch/grub-core/disk/ldm.c'
--- .pc/ldm-require-sfs-partition.patch/grub-core/disk/ldm.c	1970-01-01 00:00:00 +0000
+++ .pc/ldm-require-sfs-partition.patch/grub-core/disk/ldm.c	2012-12-03 15:02:19 +0000
@@ -0,0 +1,1010 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2006,2007,2008,2009,2011  Free Software Foundation, Inc.
+ *
+ *  GRUB 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 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <grub/dl.h>
+#include <grub/disk.h>
+#include <grub/mm.h>
+#include <grub/err.h>
+#include <grub/misc.h>
+#include <grub/diskfilter.h>
+#include <grub/gpt_partition.h>
+#include <grub/i18n.h>
+
+#ifdef GRUB_UTIL
+#include <grub/emu/misc.h>
+#include <grub/emu/hostdisk.h>
+#endif
+
+GRUB_MOD_LICENSE ("GPLv3+");
+
+#define LDM_GUID_STRLEN 64
+#define LDM_NAME_STRLEN 32
+
+typedef grub_uint8_t *grub_ldm_id_t;
+
+enum { STRIPE = 1, SPANNED = 2, RAID5 = 3 };
+
+#define LDM_LABEL_SECTOR 6
+struct grub_ldm_vblk {
+  char magic[4];
+  grub_uint8_t unused1[12];
+  grub_uint16_t update_status;
+  grub_uint8_t flags;
+  grub_uint8_t type;
+  grub_uint32_t unused2;
+  grub_uint8_t dynamic[104];
+} __attribute__ ((packed));
+#define LDM_VBLK_MAGIC "VBLK"
+
+enum
+  {
+    STATUS_CONSISTENT = 0,
+    STATUS_STILL_ACTIVE = 1,
+    STATUS_NOT_ACTIVE_YET = 2
+  };
+
+enum
+  {
+    ENTRY_COMPONENT = 0x32,
+    ENTRY_PARTITION = 0x33,
+    ENTRY_DISK = 0x34,
+    ENTRY_VOLUME = 0x51,
+  };
+
+struct grub_ldm_label
+{
+  char magic[8];
+  grub_uint32_t unused1;
+  grub_uint16_t ver_major;
+  grub_uint16_t ver_minor;
+  grub_uint8_t unused2[32];
+  char disk_guid[LDM_GUID_STRLEN];
+  char host_guid[LDM_GUID_STRLEN];
+  char group_guid[LDM_GUID_STRLEN];
+  char group_name[LDM_NAME_STRLEN];
+  grub_uint8_t unused3[11];
+  grub_uint64_t pv_start;
+  grub_uint64_t pv_size;
+  grub_uint64_t config_start;
+  grub_uint64_t config_size;
+} __attribute__ ((packed));
+
+
+#define LDM_MAGIC "PRIVHEAD"
+
+

+
+static inline grub_uint64_t
+read_int (grub_uint8_t *in, grub_size_t s)
+{
+  grub_uint8_t *ptr2;
+  grub_uint64_t ret;
+  ret = 0;
+  for (ptr2 = in; ptr2 < in + s; ptr2++)
+    {
+      ret <<= 8;
+      ret |= *ptr2;
+    }
+  return ret;
+}
+
+static const grub_gpt_part_type_t ldm_type = GRUB_GPT_PARTITION_TYPE_LDM;
+
+static grub_disk_addr_t
+gpt_ldm_sector (grub_disk_t dsk)
+{
+  grub_disk_addr_t sector = 0;
+  grub_err_t err;
+  auto int hook (grub_disk_t disk, const grub_partition_t p);
+  int hook (grub_disk_t disk, const grub_partition_t p)
+  {
+    struct grub_gpt_partentry gptdata;
+    grub_partition_t p2;
+
+    p2 = disk->partition;
+    disk->partition = p->parent;
+    if (grub_disk_read (disk, p->offset, p->index,
+			sizeof (gptdata), &gptdata))
+      {
+	disk->partition = p2;
+	return 0;
+      }
+    disk->partition = p2;
+
+    if (! grub_memcmp (&gptdata.type, &ldm_type, 16))
+      {
+	sector = p->start + p->len - 1;
+	return 1;
+      }
+    return 0;
+  }
+  err = grub_gpt_partition_map_iterate (dsk, hook);
+  if (err)
+    {
+      grub_errno = GRUB_ERR_NONE;
+      return 0;
+    }
+  return sector;
+}
+
+static struct grub_diskfilter_vg *
+make_vg (grub_disk_t disk,
+	 const struct grub_ldm_label *label)
+{
+  grub_disk_addr_t startsec, endsec, cursec;
+  struct grub_diskfilter_vg *vg;
+  grub_err_t err;
+
+  /* First time we see this volume group. We've to create the
+     whole volume group structure. */
+  vg = grub_malloc (sizeof (*vg));
+  if (! vg)
+    return NULL;
+  vg->extent_size = 1;
+  vg->name = grub_malloc (LDM_NAME_STRLEN + 1);
+  vg->uuid = grub_malloc (LDM_GUID_STRLEN + 1);
+  if (! vg->uuid || !vg->name)
+    {
+      grub_free (vg->uuid);
+      grub_free (vg->name);
+      return NULL;
+    }
+  grub_memcpy (vg->uuid, label->group_guid, LDM_GUID_STRLEN);
+  grub_memcpy (vg->name, label->group_name, LDM_NAME_STRLEN);
+  vg->name[LDM_NAME_STRLEN] = 0;
+  vg->uuid[LDM_GUID_STRLEN] = 0;
+  vg->uuid_len = grub_strlen (vg->uuid);
+
+  vg->lvs = NULL;
+  vg->pvs = NULL;
+
+  startsec = grub_be_to_cpu64 (label->config_start);
+  endsec = startsec + grub_be_to_cpu64 (label->config_size);
+
+  /* First find disks.  */
+  for (cursec = startsec + 0x12; cursec < endsec; cursec++)
+    {
+      struct grub_ldm_vblk vblk[GRUB_DISK_SECTOR_SIZE
+				/ sizeof (struct grub_ldm_vblk)];
+      unsigned i;
+      err = grub_disk_read (disk, cursec, 0,
+			    sizeof(vblk), &vblk);
+      if (err)
+	goto fail2;
+
+      for (i = 0; i < ARRAY_SIZE (vblk); i++)
+	{
+	  struct grub_diskfilter_pv *pv;
+	  grub_uint8_t *ptr;
+	  if (grub_memcmp (vblk[i].magic, LDM_VBLK_MAGIC,
+			   sizeof (vblk[i].magic)) != 0)
+	    continue;
+	  if (grub_be_to_cpu16 (vblk[i].update_status)
+	      != STATUS_CONSISTENT
+	      && grub_be_to_cpu16 (vblk[i].update_status)
+	      != STATUS_STILL_ACTIVE)
+	    continue;
+	  if (vblk[i].type != ENTRY_DISK)
+	    continue;
+	  pv = grub_zalloc (sizeof (*pv));
+	  if (!pv)
+	    goto fail2;
+
+	  pv->disk = 0;
+	  ptr = vblk[i].dynamic;
+	  if (ptr + *ptr + 1 >= vblk[i].dynamic
+	      + sizeof (vblk[i].dynamic))
+	    {
+	      grub_free (pv);
+	      goto fail2;
+	    }
+	  pv->internal_id = grub_malloc (ptr[0] + 2);
+	  if (!pv->internal_id)
+	    {
+	      grub_free (pv);
+	      goto fail2;
+	    }
+	  grub_memcpy (pv->internal_id, ptr, (grub_size_t) ptr[0] + 1);
+	  pv->internal_id[(grub_size_t) ptr[0] + 1] = 0;
+	  
+	  ptr += *ptr + 1;
+	  if (ptr + *ptr + 1 >= vblk[i].dynamic
+	      + sizeof (vblk[i].dynamic))
+	    {
+	      grub_free (pv);
+	      goto fail2;
+	    }
+	  /* ptr = name.  */
+	  ptr += *ptr + 1;
+	  if (ptr + *ptr + 1
+	      >= vblk[i].dynamic + sizeof (vblk[i].dynamic))
+	    {
+	      grub_free (pv);
+	      goto fail2;
+	    }
+	  pv->id.uuidlen = *ptr;
+	  pv->id.uuid = grub_malloc (pv->id.uuidlen + 1);
+	  grub_memcpy (pv->id.uuid, ptr + 1, pv->id.uuidlen);
+	  pv->id.uuid[pv->id.uuidlen] = 0;
+
+	  pv->next = vg->pvs;
+	  vg->pvs = pv;
+	}
+    }
+
+  /* Then find LVs.  */
+  for (cursec = startsec + 0x12; cursec < endsec; cursec++)
+    {
+      struct grub_ldm_vblk vblk[GRUB_DISK_SECTOR_SIZE
+				/ sizeof (struct grub_ldm_vblk)];
+      unsigned i;
+      err = grub_disk_read (disk, cursec, 0,
+			    sizeof(vblk), &vblk);
+      if (err)
+	goto fail2;
+
+      for (i = 0; i < ARRAY_SIZE (vblk); i++)
+	{
+	  struct grub_diskfilter_lv *lv;
+	  grub_uint8_t *ptr;
+	  if (grub_memcmp (vblk[i].magic, LDM_VBLK_MAGIC,
+			   sizeof (vblk[i].magic)) != 0)
+	    continue;
+	  if (grub_be_to_cpu16 (vblk[i].update_status)
+	      != STATUS_CONSISTENT
+	      && grub_be_to_cpu16 (vblk[i].update_status)
+	      != STATUS_STILL_ACTIVE)
+	    continue;
+	  if (vblk[i].type != ENTRY_VOLUME)
+	    continue;
+	  lv = grub_zalloc (sizeof (*lv));
+	  if (!lv)
+	    goto fail2;
+
+	  lv->vg = vg;
+	  lv->segment_count = 1;
+	  lv->segment_alloc = 1;
+	  lv->visible = 1;
+	  lv->segments = grub_zalloc (sizeof (*lv->segments));
+	  if (!lv->segments)
+	    goto fail2;
+	  lv->segments->start_extent = 0;
+	  lv->segments->type = GRUB_DISKFILTER_MIRROR;
+	  lv->segments->node_count = 0;
+	  lv->segments->node_alloc = 8;
+	  lv->segments->nodes = grub_zalloc (sizeof (*lv->segments->nodes)
+					     * lv->segments->node_alloc);
+	  if (!lv->segments->nodes)
+	    goto fail2;
+	  ptr = vblk[i].dynamic;
+	  if (ptr + *ptr + 1 >= vblk[i].dynamic
+	      + sizeof (vblk[i].dynamic))
+	    {
+	      grub_free (lv);
+	      goto fail2;
+	    }
+	  lv->internal_id = grub_malloc ((grub_size_t) ptr[0] + 2);
+	  if (!lv->internal_id)
+	    {
+	      grub_free (lv);
+	      goto fail2;
+	    }
+	  grub_memcpy (lv->internal_id, ptr, ptr[0] + 1);
+	  lv->internal_id[ptr[0] + 1] = 0;
+
+	  ptr += *ptr + 1;
+	  if (ptr + *ptr + 1 >= vblk[i].dynamic
+	      + sizeof (vblk[i].dynamic))
+	    {
+	      grub_free (lv);
+	      goto fail2;
+	    }
+	  lv->name = grub_malloc (*ptr + 1);
+	  if (!lv->name)
+	    {
+	      grub_free (lv->internal_id);
+	      grub_free (lv);
+	      goto fail2;
+	    }
+	  grub_memcpy (lv->name, ptr + 1, *ptr);
+	  lv->name[*ptr] = 0;
+	  lv->fullname = grub_xasprintf ("ldm/%s/%s",
+					 vg->uuid, lv->name);
+	  if (!lv->fullname)
+	    {
+	      grub_free (lv->internal_id);
+	      grub_free (lv->name);
+	      grub_free (lv);
+	      goto fail2;
+	    }
+	  ptr += *ptr + 1;
+	  if (ptr + *ptr + 1
+	      >= vblk[i].dynamic + sizeof (vblk[i].dynamic))
+	    {
+	      grub_free (lv->internal_id);
+	      grub_free (lv->name);
+	      grub_free (lv);
+	      goto fail2;
+	    }
+	  /* ptr = volume type.  */
+	  ptr += *ptr + 1;
+	  if (ptr >= vblk[i].dynamic + sizeof (vblk[i].dynamic))
+	    {
+	      grub_free (lv->internal_id);
+	      grub_free (lv->name);
+	      grub_free (lv);
+	      goto fail2;
+	    }
+	  /* ptr = flags.  */
+	  ptr += *ptr + 1;
+	  if (ptr >= vblk[i].dynamic + sizeof (vblk[i].dynamic))
+	    {
+	      grub_free (lv->internal_id);
+	      grub_free (lv->name);
+	      grub_free (lv);
+	      goto fail2;
+	    }
+
+	  /* Skip state, type, unknown, volume number, zeros, flags. */
+	  ptr += 14 + 1 + 1 + 1 + 3 + 1;
+	  /* ptr = number of children.  */
+	  if (ptr >= vblk[i].dynamic + sizeof (vblk[i].dynamic))
+	    {
+	      grub_free (lv->internal_id);
+	      grub_free (lv->name);
+	      grub_free (lv);
+	      goto fail2;
+	    }
+	  ptr += *ptr + 1;
+	  if (ptr >= vblk[i].dynamic + sizeof (vblk[i].dynamic))
+	    {
+	      grub_free (lv->internal_id);
+	      grub_free (lv->name);
+	      grub_free (lv);
+	      goto fail2;
+	    }
+
+	  /* Skip 2 more fields.  */
+	  ptr += 8 + 8;
+	  if (ptr >= vblk[i].dynamic + sizeof (vblk[i].dynamic)
+	      || ptr + *ptr + 1>= vblk[i].dynamic
+	      + sizeof (vblk[i].dynamic))
+	    {
+	      grub_free (lv->internal_id);
+	      grub_free (lv->name);
+	      grub_free (lv);
+	      goto fail2;
+	    }
+	  lv->size = read_int (ptr + 1, *ptr);
+	  lv->segments->extent_count = lv->size;
+
+	  lv->next = vg->lvs;
+	  vg->lvs = lv;
+	}
+    }
+
+  /* Now the components.  */
+  for (cursec = startsec + 0x12; cursec < endsec; cursec++)
+    {
+      struct grub_ldm_vblk vblk[GRUB_DISK_SECTOR_SIZE
+				/ sizeof (struct grub_ldm_vblk)];
+      unsigned i;
+      err = grub_disk_read (disk, cursec, 0,
+			    sizeof(vblk), &vblk);
+      if (err)
+	goto fail2;
+
+      for (i = 0; i < ARRAY_SIZE (vblk); i++)
+	{
+	  struct grub_diskfilter_lv *comp;
+	  struct grub_diskfilter_lv *lv;
+	  grub_uint8_t type;
+
+	  grub_uint8_t *ptr;
+	  if (grub_memcmp (vblk[i].magic, LDM_VBLK_MAGIC,
+			   sizeof (vblk[i].magic)) != 0)
+	    continue;
+	  if (grub_be_to_cpu16 (vblk[i].update_status)
+	      != STATUS_CONSISTENT
+	      && grub_be_to_cpu16 (vblk[i].update_status)
+	      != STATUS_STILL_ACTIVE)
+	    continue;
+	  if (vblk[i].type != ENTRY_COMPONENT)
+	    continue;
+	  comp = grub_zalloc (sizeof (*comp));
+	  if (!comp)
+	    goto fail2;
+	  comp->visible = 0;
+	  comp->name = 0;
+	  comp->fullname = 0;
+
+	  ptr = vblk[i].dynamic;
+	  if (ptr + *ptr + 1 >= vblk[i].dynamic + sizeof (vblk[i].dynamic))
+	    {
+	      goto fail2;
+	    }
+	  comp->internal_id = grub_malloc ((grub_size_t) ptr[0] + 2);
+	  if (!comp->internal_id)
+	    {
+	      grub_free (comp);
+	      goto fail2;
+	    }
+	  grub_memcpy (comp->internal_id, ptr, ptr[0] + 1);
+	  comp->internal_id[ptr[0] + 1] = 0;
+
+	  ptr += *ptr + 1;
+	  if (ptr + *ptr + 1 >= vblk[i].dynamic + sizeof (vblk[i].dynamic))
+	    {
+	      grub_free (comp->internal_id);
+	      grub_free (comp);
+	      goto fail2;
+	    }
+	  /* ptr = name.  */
+	  ptr += *ptr + 1;
+	  if (ptr + *ptr + 1 >= vblk[i].dynamic + sizeof (vblk[i].dynamic))
+	    {
+	      grub_free (comp->internal_id);
+	      grub_free (comp);
+	      goto fail2;
+	    }
+	  /* ptr = state.  */
+	  ptr += *ptr + 1;
+	  type = *ptr++;
+	  /* skip zeros.  */
+	  ptr += 4;
+	  if (ptr >= vblk[i].dynamic + sizeof (vblk[i].dynamic))
+	    {
+	      grub_free (comp->internal_id);
+	      grub_free (comp);
+	      goto fail2;
+	    }
+
+	  /* ptr = number of children. */
+	  ptr += *ptr + 1;
+	  if (ptr >= vblk[i].dynamic + sizeof (vblk[i].dynamic))
+	    {
+	      grub_free (comp->internal_id);
+	      grub_free (comp);
+	      goto fail2;
+	    }
+	  ptr += 8 + 8;
+	  if (ptr + *ptr + 1 >= vblk[i].dynamic
+	      + sizeof (vblk[i].dynamic))
+	    {
+	      grub_free (comp->internal_id);
+	      grub_free (comp);
+	      goto fail2;
+	    }
+	  for (lv = vg->lvs; lv; lv = lv->next)
+	    {
+	      if (lv->internal_id[0] == ptr[0]
+		  && grub_memcmp (lv->internal_id + 1, ptr + 1, ptr[0]) == 0)
+		break;
+	    }
+	  if (!lv)
+	    {
+	      grub_free (comp->internal_id);
+	      grub_free (comp);
+	      continue;
+	    }
+	  comp->size = lv->size;
+	  if (type == SPANNED)
+	    {
+	      comp->segment_alloc = 8;
+	      comp->segment_count = 0;
+	      comp->segments = grub_malloc (sizeof (*comp->segments)
+					    * comp->segment_alloc);
+	      if (!comp->segments)
+		goto fail2;
+	    }
+	  else
+	    {
+	      comp->segment_alloc = 1;
+	      comp->segment_count = 1;
+	      comp->segments = grub_malloc (sizeof (*comp->segments));
+	      if (!comp->segments)
+		goto fail2;
+	      comp->segments->start_extent = 0;
+	      comp->segments->extent_count = lv->size;
+	      comp->segments->layout = 0;
+	      if (type == STRIPE)
+		comp->segments->type = GRUB_DISKFILTER_STRIPED;
+	      else if (type == RAID5)
+		{
+		  comp->segments->type = GRUB_DISKFILTER_RAID5;
+		  comp->segments->layout = GRUB_RAID_LAYOUT_SYMMETRIC_MASK;
+		}
+	      else
+		goto fail2;
+	      ptr += *ptr + 1;
+	      ptr++;
+	      if (!(vblk[i].flags & 0x10))
+		goto fail2;
+	      if (ptr >= vblk[i].dynamic + sizeof (vblk[i].dynamic)
+		  || ptr + *ptr + 1 >= vblk[i].dynamic
+		  + sizeof (vblk[i].dynamic))
+		{
+		  grub_free (comp->internal_id);
+		  grub_free (comp);
+		  goto fail2;
+		}
+	      comp->segments->stripe_size = read_int (ptr + 1, *ptr);
+	      ptr += *ptr + 1;
+	      if (ptr + *ptr + 1 >= vblk[i].dynamic
+		  + sizeof (vblk[i].dynamic))
+		{
+		  grub_free (comp->internal_id);
+		  grub_free (comp);
+		  goto fail2;
+		}
+	      comp->segments->node_count = read_int (ptr + 1, *ptr);
+	      comp->segments->node_alloc = comp->segments->node_count;
+	      comp->segments->nodes = grub_zalloc (sizeof (*comp->segments->nodes)
+						   * comp->segments->node_alloc);
+	      if (!lv->segments->nodes)
+		goto fail2;
+	    }
+
+	  if (lv->segments->node_alloc == lv->segments->node_count)
+	    {
+	      void *t;
+	      lv->segments->node_alloc *= 2; 
+	      t = grub_realloc (lv->segments->nodes,
+				sizeof (*lv->segments->nodes)
+				* lv->segments->node_alloc);
+	      if (!t)
+		goto fail2;
+	      lv->segments->nodes = t;
+	    }
+	  lv->segments->nodes[lv->segments->node_count].pv = 0;
+	  lv->segments->nodes[lv->segments->node_count].start = 0;
+	  lv->segments->nodes[lv->segments->node_count++].lv = comp;
+	  comp->next = vg->lvs;
+	  vg->lvs = comp;
+	}
+    }
+  /* Partitions.  */
+  for (cursec = startsec + 0x12; cursec < endsec; cursec++)
+    {
+      struct grub_ldm_vblk vblk[GRUB_DISK_SECTOR_SIZE
+				/ sizeof (struct grub_ldm_vblk)];
+      unsigned i;
+      err = grub_disk_read (disk, cursec, 0,
+			    sizeof(vblk), &vblk);
+      if (err)
+	goto fail2;
+
+      for (i = 0; i < ARRAY_SIZE (vblk); i++)
+	{
+	  struct grub_diskfilter_lv *comp;
+	  struct grub_diskfilter_node part;
+	  grub_disk_addr_t start, size;
+
+	  grub_uint8_t *ptr;
+	  part.name = 0;
+	  if (grub_memcmp (vblk[i].magic, LDM_VBLK_MAGIC,
+			   sizeof (vblk[i].magic)) != 0)
+	    continue;
+	  if (grub_be_to_cpu16 (vblk[i].update_status)
+	      != STATUS_CONSISTENT
+	      && grub_be_to_cpu16 (vblk[i].update_status)
+	      != STATUS_STILL_ACTIVE)
+	    continue;
+	  if (vblk[i].type != ENTRY_PARTITION)
+	    continue;
+	  part.lv = 0;
+	  part.pv = 0;
+
+	  ptr = vblk[i].dynamic;
+	  if (ptr + *ptr + 1 >= vblk[i].dynamic + sizeof (vblk[i].dynamic))
+	    {
+	      goto fail2;
+	    }
+	  /* ID */
+	  ptr += *ptr + 1;
+	  if (ptr >= vblk[i].dynamic + sizeof (vblk[i].dynamic))
+	    {
+	      goto fail2;
+	    }
+	  /* ptr = name.  */
+	  ptr += *ptr + 1;
+	  if (ptr >= vblk[i].dynamic + sizeof (vblk[i].dynamic))
+	    {
+	      goto fail2;
+	    }
+
+	  /* skip zeros and logcommit id.  */
+	  ptr += 4 + 8;
+	  if (ptr + 16 >= vblk[i].dynamic + sizeof (vblk[i].dynamic))
+	    {
+	      goto fail2;
+	    }
+	  part.start = read_int (ptr, 8);
+	  start = read_int (ptr + 8, 8);
+	  ptr += 16;
+	  if (ptr >= vblk[i].dynamic + sizeof (vblk[i].dynamic)
+	      || ptr + *ptr + 1 >= vblk[i].dynamic + sizeof (vblk[i].dynamic))
+	    {
+	      goto fail2;
+	    }
+	  size = read_int (ptr + 1, *ptr);
+	  ptr += *ptr + 1;
+	  if (ptr >= vblk[i].dynamic + sizeof (vblk[i].dynamic)
+	      || ptr + *ptr + 1 >= vblk[i].dynamic + sizeof (vblk[i].dynamic))
+	    {
+	      goto fail2;
+	    }
+
+	  for (comp = vg->lvs; comp; comp = comp->next)
+	    if (comp->internal_id[0] == ptr[0]
+		&& grub_memcmp (ptr + 1, comp->internal_id + 1,
+				comp->internal_id[0]) == 0)
+	      goto out;
+	  continue;
+	out:
+	  if (ptr >= vblk[i].dynamic + sizeof (vblk[i].dynamic)
+	      || ptr + *ptr + 1 >= vblk[i].dynamic + sizeof (vblk[i].dynamic))
+	    {
+	      goto fail2;
+	    }
+	  ptr += *ptr + 1;
+	  struct grub_diskfilter_pv *pv;
+	  for (pv = vg->pvs; pv; pv = pv->next)
+	    if (pv->internal_id[0] == ptr[0]
+		&& grub_memcmp (pv->internal_id + 1, ptr + 1, ptr[0]) == 0)
+	      part.pv = pv;
+
+	  if (comp->segment_alloc == 1)
+	    {
+	      unsigned index;
+	      ptr += *ptr + 1;
+	      if (ptr + *ptr + 1 >= vblk[i].dynamic
+		  + sizeof (vblk[i].dynamic))
+		{
+		  goto fail2;
+		}
+	      index = read_int (ptr + 1, *ptr);
+	      if (index < comp->segments->node_count)
+		comp->segments->nodes[index] = part;
+	    }
+	  else
+	    {
+	      if (comp->segment_alloc == comp->segment_count)
+		{
+		  void *t;
+		  comp->segment_alloc *= 2;
+		  t = grub_realloc (comp->segments,
+				    comp->segment_alloc
+				    * sizeof (*comp->segments));
+		  if (!t)
+		    goto fail2;
+		  comp->segments = t;
+		}
+	      comp->segments[comp->segment_count].start_extent = start;
+	      comp->segments[comp->segment_count].extent_count = size;
+	      comp->segments[comp->segment_count].type = GRUB_DISKFILTER_STRIPED;
+	      comp->segments[comp->segment_count].node_count = 1;
+	      comp->segments[comp->segment_count].node_alloc = 1;
+	      comp->segments[comp->segment_count].nodes
+		= grub_malloc (sizeof (*comp->segments[comp->segment_count].nodes));
+	      if (!comp->segments[comp->segment_count].nodes)
+		goto fail2;
+	      comp->segments[comp->segment_count].nodes[0] = part;
+	      comp->segment_count++;
+	    }
+	}
+    }
+  if (grub_diskfilter_vg_register (vg))
+    goto fail2;
+  return vg;
+ fail2:
+  {
+    struct grub_diskfilter_lv *lv, *next_lv;
+    struct grub_diskfilter_pv *pv, *next_pv;
+    for (lv = vg->lvs; lv; lv = next_lv)
+      {
+	unsigned i;
+	for (i = 0; i < lv->segment_count; i++)
+	  grub_free (lv->segments[i].nodes);
+
+	next_lv = lv->next;
+	grub_free (lv->segments);
+	grub_free (lv->internal_id);
+	grub_free (lv->name);
+	grub_free (lv->fullname);
+	grub_free (lv);
+      }
+    for (pv = vg->pvs; pv; pv = next_pv)
+      {
+	next_pv = pv->next;
+	grub_free (pv->id.uuid);
+	grub_free (pv);
+      }
+  }
+  grub_free (vg->uuid);
+  grub_free (vg);
+  return NULL;
+}
+
+static struct grub_diskfilter_vg * 
+grub_ldm_detect (grub_disk_t disk,
+		 struct grub_diskfilter_pv_id *id,
+		 grub_disk_addr_t *start_sector)
+{
+  grub_err_t err;
+  struct grub_ldm_label label;
+  struct grub_diskfilter_vg *vg;
+
+#ifdef GRUB_UTIL
+  grub_util_info ("scanning %s for LDM", disk->name);
+#endif
+
+  {
+    int i;
+    for (i = 0; i < 3; i++)
+      {
+	grub_disk_addr_t sector = LDM_LABEL_SECTOR;
+	switch (i)
+	  {
+	  case 0:
+	    sector = LDM_LABEL_SECTOR;
+	    break;
+	  case 1:
+	    /* LDM is never inside a partition.  */
+	    if (disk->partition)
+	      continue;
+	    sector = grub_disk_get_size (disk);
+	    if (sector == GRUB_DISK_SIZE_UNKNOWN)
+	      continue;
+	    sector--;
+	    break;
+	    /* FIXME: try the third copy.  */
+	  case 2:
+	    sector = gpt_ldm_sector (disk);
+	    if (!sector)
+	      continue;
+	    break;
+	  }
+	err = grub_disk_read (disk, sector, 0,
+			      sizeof(label), &label);
+	if (err)
+	  return NULL;
+	if (grub_memcmp (label.magic, LDM_MAGIC, sizeof (label.magic)) == 0
+	    && grub_be_to_cpu16 (label.ver_major) == 0x02
+	    && grub_be_to_cpu16 (label.ver_minor) >= 0x0b
+	    && grub_be_to_cpu16 (label.ver_minor) <= 0x0c)
+	  break;
+      }
+
+    /* Return if we didn't find a label. */
+    if (i == 3)
+      {
+#ifdef GRUB_UTIL
+	grub_util_info ("no LDM signature found");
+#endif
+	return NULL;
+      }
+  }
+
+  id->uuid = grub_malloc (LDM_GUID_STRLEN + 1);
+  if (!id->uuid)
+    return NULL;
+  grub_memcpy (id->uuid, label.disk_guid, LDM_GUID_STRLEN);
+  id->uuid[LDM_GUID_STRLEN] = 0;
+  id->uuidlen = grub_strlen ((char *) id->uuid);
+  *start_sector = grub_be_to_cpu64 (label.pv_start);
+
+  {
+    grub_size_t s;
+    for (s = 0; s < LDM_GUID_STRLEN && label.group_guid[s]; s++);
+    vg = grub_diskfilter_get_vg_by_uuid (s, label.group_guid);
+    if (! vg)
+      vg = make_vg (disk, &label);
+  }
+
+  if (!vg)
+    {
+      grub_free (id->uuid);
+      return NULL;
+    }
+  return vg;
+}
+
+#ifdef GRUB_UTIL
+
+char *
+grub_util_get_ldm (grub_disk_t disk, grub_disk_addr_t start)
+{
+  struct grub_diskfilter_pv *pv = NULL;
+  struct grub_diskfilter_vg *vg = NULL;
+  struct grub_diskfilter_lv *res = 0, *lv, *res_lv = 0;
+
+  pv = grub_diskfilter_get_pv_from_disk (disk, &vg);
+
+  if (!pv)
+    return NULL;
+
+  for (lv = vg->lvs; lv; lv = lv->next)
+    if (lv->segment_count == 1 && lv->segments->node_count == 1
+	&& lv->segments->type == GRUB_DISKFILTER_STRIPED
+	&& lv->segments->nodes->pv == pv
+	&& lv->segments->nodes->start + pv->start_sector == start)
+      {
+	res_lv = lv;
+	break;
+      }
+  if (!res_lv)
+    return NULL;
+  for (lv = vg->lvs; lv; lv = lv->next)
+    if (lv->segment_count == 1 && lv->segments->node_count == 1
+	&& lv->segments->type == GRUB_DISKFILTER_MIRROR
+	&& lv->segments->nodes->lv == res_lv)
+      {
+	res = lv;
+	break;
+      }
+  if (res && res->fullname)
+    return grub_strdup (res->fullname);
+  return NULL;
+}
+
+int
+grub_util_is_ldm (grub_disk_t disk)
+{
+  int i;
+  for (i = 0; i < 3; i++)
+    {
+      grub_disk_addr_t sector = LDM_LABEL_SECTOR;
+      grub_err_t err;
+      struct grub_ldm_label label;
+
+      switch (i)
+	{
+	case 0:
+	  sector = LDM_LABEL_SECTOR;
+	  break;
+	case 1:
+	  /* LDM is never inside a partition.  */
+	  if (disk->partition)
+	    continue;
+	  sector = grub_disk_get_size (disk);
+	  if (sector == GRUB_DISK_SIZE_UNKNOWN)
+	    continue;
+	  sector--;
+	  break;
+	  /* FIXME: try the third copy.  */
+	case 2:
+	  sector = gpt_ldm_sector (disk);
+	  if (!sector)
+	    continue;
+	  break;
+	}
+      err = grub_disk_read (disk, sector, 0, sizeof(label), &label);
+      if (err)
+	{
+	  grub_errno = GRUB_ERR_NONE;
+	  return 0;
+	}
+      /* This check is more relaxed on purpose.  */
+      if (grub_memcmp (label.magic, LDM_MAGIC, sizeof (label.magic)) == 0)
+	return 1;
+    }
+
+  return 0;
+}
+
+grub_err_t
+grub_util_ldm_embed (struct grub_disk *disk, unsigned int *nsectors,
+		     unsigned int max_nsectors,
+		     grub_embed_type_t embed_type,
+		     grub_disk_addr_t **sectors)
+{
+  struct grub_diskfilter_pv *pv = NULL;
+  struct grub_diskfilter_vg *vg;
+  struct grub_diskfilter_lv *lv;
+  unsigned i;
+
+  if (embed_type != GRUB_EMBED_PCBIOS)
+    return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
+		       "LDM curently supports only PC-BIOS embedding");
+  if (disk->partition)
+    return grub_error (GRUB_ERR_BUG, "disk isn't LDM");
+  pv = grub_diskfilter_get_pv_from_disk (disk, &vg);
+  if (!pv)
+    return grub_error (GRUB_ERR_BUG, "disk isn't LDM");
+  for (lv = vg->lvs; lv; lv = lv->next)
+    {
+      struct grub_diskfilter_lv *comp;
+
+      if (!lv->visible || !lv->fullname)
+	continue;
+
+      if (lv->segment_count != 1)
+	continue;
+      if (lv->segments->type != GRUB_DISKFILTER_MIRROR
+	  || lv->segments->node_count != 1
+	  || lv->segments->start_extent != 0
+	  || lv->segments->extent_count != lv->size)
+	continue;
+
+      comp = lv->segments->nodes->lv;
+      if (!comp)
+	continue;
+
+      if (comp->segment_count != 1 || comp->size != lv->size)
+	continue;
+      if (comp->segments->type != GRUB_DISKFILTER_STRIPED
+	  || comp->segments->node_count != 1
+	  || comp->segments->start_extent != 0
+	  || comp->segments->extent_count != lv->size)
+	continue;
+
+      /* How to implement proper check is to be discussed.  */
+#if 1
+      if (1)
+	continue;
+#else
+      if (grub_strcmp (lv->name, "Volume5") != 0)
+	continue;
+#endif
+      if (lv->size < *nsectors)
+	return grub_error (GRUB_ERR_OUT_OF_RANGE,
+			   /* TRANSLATORS: it's a partition for embedding,
+			      not a partition embed into something. GRUB
+			      install tools put core.img into a place
+			      usable for bootloaders (called generically
+			      "embedding zone") and this operation is
+			      called "embedding".  */
+			   N_("your LDM embedding Partition is too small;"
+			      " embedding won't be possible"));
+      *nsectors = lv->size;
+      if (*nsectors > max_nsectors)
+	*nsectors = max_nsectors;
+      *sectors = grub_malloc (*nsectors * sizeof (**sectors));
+      if (!*sectors)
+	return grub_errno;
+      for (i = 0; i < *nsectors; i++)
+	(*sectors)[i] = (lv->segments->nodes->start
+			 + comp->segments->nodes->start
+			 + comp->segments->nodes->pv->start_sector + i);
+      return GRUB_ERR_NONE;
+    }
+
+  return grub_error (GRUB_ERR_FILE_NOT_FOUND,
+		     /* TRANSLATORS: it's a partition for embedding,
+			not a partition embed into something.  */
+		     N_("this LDM has no Embedding Partition;"
+			" embedding won't be possible"));
+}
+#endif
+
+static struct grub_diskfilter grub_ldm_dev = {
+  .name = "ldm",
+  .detect = grub_ldm_detect,
+  .next = 0
+};
+
+GRUB_MOD_INIT (ldm)
+{
+  grub_diskfilter_register_back (&grub_ldm_dev);
+}
+
+GRUB_MOD_FINI (ldm)
+{
+  grub_diskfilter_unregister (&grub_ldm_dev);
+}

=== added directory '.pc/ldm-require-sfs-partition.patch/include'
=== added directory '.pc/ldm-require-sfs-partition.patch/include/grub'
=== added file '.pc/ldm-require-sfs-partition.patch/include/grub/msdos_partition.h'
--- .pc/ldm-require-sfs-partition.patch/include/grub/msdos_partition.h	1970-01-01 00:00:00 +0000
+++ .pc/ldm-require-sfs-partition.patch/include/grub/msdos_partition.h	2012-12-03 15:02:19 +0000
@@ -0,0 +1,126 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 1999,2000,2001,2002,2004,2007  Free Software Foundation, Inc.
+ *
+ *  GRUB 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 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GRUB_PC_PARTITION_HEADER
+#define GRUB_PC_PARTITION_HEADER	1
+
+#include <grub/symbol.h>
+#include <grub/types.h>
+#include <grub/err.h>
+#include <grub/disk.h>
+#include <grub/partition.h>
+
+/* The signature.  */
+#define GRUB_PC_PARTITION_SIGNATURE		0xaa55
+
+/* This is not a flag actually, but used as if it were a flag.  */
+#define GRUB_PC_PARTITION_TYPE_HIDDEN_FLAG	0x10
+
+/* DOS partition types.  */
+#define GRUB_PC_PARTITION_TYPE_NONE		0
+#define GRUB_PC_PARTITION_TYPE_FAT12		1
+#define GRUB_PC_PARTITION_TYPE_FAT16_LT32M	4
+#define GRUB_PC_PARTITION_TYPE_EXTENDED		5
+#define GRUB_PC_PARTITION_TYPE_FAT16_GT32M	6
+#define GRUB_PC_PARTITION_TYPE_NTFS	        7
+#define GRUB_PC_PARTITION_TYPE_FAT32		0xb
+#define GRUB_PC_PARTITION_TYPE_FAT32_LBA	0xc
+#define GRUB_PC_PARTITION_TYPE_FAT16_LBA	0xe
+#define GRUB_PC_PARTITION_TYPE_WIN95_EXTENDED	0xf
+#define GRUB_PC_PARTITION_TYPE_PLAN9            0x39
+#define GRUB_PC_PARTITION_TYPE_EZD		0x55
+#define GRUB_PC_PARTITION_TYPE_MINIX		0x80
+#define GRUB_PC_PARTITION_TYPE_LINUX_MINIX	0x81
+#define GRUB_PC_PARTITION_TYPE_LINUX_SWAP	0x82
+#define GRUB_PC_PARTITION_TYPE_EXT2FS		0x83
+#define GRUB_PC_PARTITION_TYPE_LINUX_EXTENDED	0x85
+#define GRUB_PC_PARTITION_TYPE_VSTAFS		0x9e
+#define GRUB_PC_PARTITION_TYPE_FREEBSD		0xa5
+#define GRUB_PC_PARTITION_TYPE_OPENBSD		0xa6
+#define GRUB_PC_PARTITION_TYPE_NETBSD		0xa9
+#define GRUB_PC_PARTITION_TYPE_HFS		0xaf
+#define GRUB_PC_PARTITION_TYPE_GPT_DISK		0xee
+#define GRUB_PC_PARTITION_TYPE_LINUX_RAID	0xfd
+
+/* The partition entry.  */
+struct grub_msdos_partition_entry
+{
+  /* If active, 0x80, otherwise, 0x00.  */
+  grub_uint8_t flag;
+
+  /* The head of the start.  */
+  grub_uint8_t start_head;
+
+  /* (S | ((C >> 2) & 0xC0)) where S is the sector of the start and C
+     is the cylinder of the start. Note that S is counted from one.  */
+  grub_uint8_t start_sector;
+
+  /* (C & 0xFF) where C is the cylinder of the start.  */
+  grub_uint8_t start_cylinder;
+
+  /* The partition type.  */
+  grub_uint8_t type;
+
+  /* The end versions of start_head, start_sector and start_cylinder,
+     respectively.  */
+  grub_uint8_t end_head;
+  grub_uint8_t end_sector;
+  grub_uint8_t end_cylinder;
+
+  /* The start sector. Note that this is counted from zero.  */
+  grub_uint32_t start;
+
+  /* The length in sector units.  */
+  grub_uint32_t length;
+} __attribute__ ((packed));
+
+/* The structure of MBR.  */
+struct grub_msdos_partition_mbr
+{
+  /* The code area (actually, including BPB).  */
+  grub_uint8_t code[446];
+
+  /* Four partition entries.  */
+  struct grub_msdos_partition_entry entries[4];
+
+  /* The signature 0xaa55.  */
+  grub_uint16_t signature;
+} __attribute__ ((packed));
+
+

+
+static inline int
+grub_msdos_partition_is_empty (int type)
+{
+  return (type == GRUB_PC_PARTITION_TYPE_NONE);
+}
+
+static inline int
+grub_msdos_partition_is_extended (int type)
+{
+  return (type == GRUB_PC_PARTITION_TYPE_EXTENDED
+	  || type == GRUB_PC_PARTITION_TYPE_WIN95_EXTENDED
+	  || type == GRUB_PC_PARTITION_TYPE_LINUX_EXTENDED);
+}
+
+grub_err_t
+grub_partition_msdos_iterate (grub_disk_t disk,
+			      int (*hook) (grub_disk_t disk,
+					   const grub_partition_t partition));
+
+#endif /* ! GRUB_PC_PARTITION_HEADER */

=== modified file 'Makefile.util.def'
--- Makefile.util.def	2012-10-08 12:16:40 +0000
+++ Makefile.util.def	2012-12-03 15:02:19 +0000
@@ -32,6 +32,7 @@
   common = grub-core/disk/ldm.c;
   common = grub-core/disk/diskfilter.c;
   common = grub-core/partmap/gpt.c;
+  common = grub-core/partmap/msdos.c;
 };
 
 library = {
@@ -109,7 +110,6 @@
   common = grub-core/partmap/acorn.c;
   common = grub-core/partmap/amiga.c;
   common = grub-core/partmap/apple.c;
-  common = grub-core/partmap/msdos.c;
   common = grub-core/partmap/sun.c;
   common = grub-core/partmap/plan.c;
   common = grub-core/partmap/dvh.c;

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-31 10:36:57 +0000
+++ debian/changelog	2012-12-03 15:02:19 +0000
@@ -1,3 +1,10 @@
+grub2 (2.00-7ubuntu14) raring; urgency=low
+
+  * debian/ldm-require-sfs-partition.patch: Only recognize ldm partition
+    table if there is an SFS partition listed in the DOS MBR (LP: #1061255)
+
+ -- Phillip Susi <[e-mail]>  Wed, 28 Nov 2012 15:08:45 -0500
+
 grub2 (2.00-7ubuntu13) raring; urgency=low
 
   * Avoid assuming that gets is declared.

=== added file 'debian/patches/ldm-require-sfs-partition.patch'
--- debian/patches/ldm-require-sfs-partition.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/ldm-require-sfs-partition.patch	2012-12-03 15:02:19 +0000
@@ -0,0 +1,136 @@
+Author: Andrey Borzenkov <[e-mail]>
+Origin: [e-mail]
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1061255
+Description: There are multiple reports of GRUB2 refusing to install on
+ disk which was used for LDM in the past. Example is:
+ https://bugs.launchpad.net/ubuntu/+source/grub2/+bug/1061255
+ 
+ I tested behavior of Windows and Linux on a disk with valid LDM
+ signature but manually modified partition table. Both ignore LDM labels
+ if disk does not contain SFS partition (0x42) and treat is as pure MBR
+ disk. This differs from GRUB2 behavior which always checks for LDM
+ label whether SFS partition exists or not.
+ 
+ Would the following be appropriate? It adds additional check for
+ partition 0x42 before checking for LDM labels.
+ 
+ -andrey
+
+--- a/grub-core/disk/ldm.c
++++ b/grub-core/disk/ldm.c
+@@ -22,6 +22,7 @@
+ #include <grub/err.h>
+ #include <grub/misc.h>
+ #include <grub/diskfilter.h>
++#include <grub/msdos_partition.h>
+ #include <grub/gpt_partition.h>
+ #include <grub/i18n.h>
+ 
+@@ -103,6 +104,34 @@
+   return ret;
+ }
+ 
++static int
++msdos_has_ldm_partition (grub_disk_t dsk)
++{
++  grub_err_t err;
++  int has_sfs = 0;
++  auto int hook (grub_disk_t disk, const grub_partition_t p);
++  int hook (grub_disk_t disk __attribute__ ((unused)), const grub_partition_t p)
++  {
++    if (p->number >= 4)
++      return 1;
++    if (p->msdostype == GRUB_PC_PARTITION_TYPE_SFS)
++      {
++	has_sfs = 1;
++	return 1;
++      }
++    return 0;
++  }
++
++  err = grub_partition_msdos_iterate (dsk, hook);
++  if (err)
++    {
++      grub_errno = GRUB_ERR_NONE;
++      return 0;
++    }
++
++  return has_sfs;
++}
++
+ static const grub_gpt_part_type_t ldm_type = GRUB_GPT_PARTITION_TYPE_LDM;
+ 
+ static grub_disk_addr_t
+@@ -756,17 +785,20 @@
+ 
+   {
+     int i;
++    int has_sfs = msdos_has_ldm_partition (disk);
+     for (i = 0; i < 3; i++)
+       {
+ 	grub_disk_addr_t sector = LDM_LABEL_SECTOR;
+ 	switch (i)
+ 	  {
+ 	  case 0:
++	    if (!has_sfs)
++	      continue;
+ 	    sector = LDM_LABEL_SECTOR;
+ 	    break;
+ 	  case 1:
+ 	    /* LDM is never inside a partition.  */
+-	    if (disk->partition)
++	    if (!has_sfs || disk->partition)
+ 	      continue;
+ 	    sector = grub_disk_get_size (disk);
+ 	    if (sector == GRUB_DISK_SIZE_UNKNOWN)
+@@ -867,6 +899,7 @@
+ grub_util_is_ldm (grub_disk_t disk)
+ {
+   int i;
++  int has_sfs = msdos_has_ldm_partition (disk);
+   for (i = 0; i < 3; i++)
+     {
+       grub_disk_addr_t sector = LDM_LABEL_SECTOR;
+@@ -876,11 +909,13 @@
+       switch (i)
+ 	{
+ 	case 0:
++	  if (!has_sfs)
++	    continue;
+ 	  sector = LDM_LABEL_SECTOR;
+ 	  break;
+ 	case 1:
+ 	  /* LDM is never inside a partition.  */
+-	  if (disk->partition)
++	  if (!has_sfs || disk->partition)
+ 	    continue;
+ 	  sector = grub_disk_get_size (disk);
+ 	  if (sector == GRUB_DISK_SIZE_UNKNOWN)
+--- a/include/grub/msdos_partition.h
++++ b/include/grub/msdos_partition.h
+@@ -43,6 +43,7 @@
+ #define GRUB_PC_PARTITION_TYPE_FAT16_LBA	0xe
+ #define GRUB_PC_PARTITION_TYPE_WIN95_EXTENDED	0xf
+ #define GRUB_PC_PARTITION_TYPE_PLAN9            0x39
++#define GRUB_PC_PARTITION_TYPE_SFS		0x42
+ #define GRUB_PC_PARTITION_TYPE_EZD		0x55
+ #define GRUB_PC_PARTITION_TYPE_MINIX		0x80
+ #define GRUB_PC_PARTITION_TYPE_LINUX_MINIX	0x81
+--- a/Makefile.util.def
++++ b/Makefile.util.def
+@@ -32,6 +32,7 @@
+   common = grub-core/disk/ldm.c;
+   common = grub-core/disk/diskfilter.c;
+   common = grub-core/partmap/gpt.c;
++  common = grub-core/partmap/msdos.c;
+ };
+ 
+ library = {
+@@ -109,7 +110,6 @@
+   common = grub-core/partmap/acorn.c;
+   common = grub-core/partmap/amiga.c;
+   common = grub-core/partmap/apple.c;
+-  common = grub-core/partmap/msdos.c;
+   common = grub-core/partmap/sun.c;
+   common = grub-core/partmap/plan.c;
+   common = grub-core/partmap/dvh.c;

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-10-31 10:36:57 +0000
+++ debian/patches/series	2012-12-03 15:02:19 +0000
@@ -56,3 +56,4 @@
 ubuntu_mount_readdir_symlink_failures.patch
 ubuntu_initrd_addr_min.patch
 ubuntu_gnulib_gets.patch
+ldm-require-sfs-partition.patch

=== modified file 'grub-core/disk/ldm.c'
--- grub-core/disk/ldm.c	2012-09-13 18:02:04 +0000
+++ grub-core/disk/ldm.c	2012-12-03 15:02:19 +0000
@@ -22,6 +22,7 @@
 #include <grub/err.h>
 #include <grub/misc.h>
 #include <grub/diskfilter.h>
+#include <grub/msdos_partition.h>
 #include <grub/gpt_partition.h>
 #include <grub/i18n.h>
 
@@ -103,6 +104,34 @@
   return ret;
 }
 
+static int
+msdos_has_ldm_partition (grub_disk_t dsk)
+{
+  grub_err_t err;
+  int has_sfs = 0;
+  auto int hook (grub_disk_t disk, const grub_partition_t p);
+  int hook (grub_disk_t disk __attribute__ ((unused)), const grub_partition_t p)
+  {
+    if (p->number >= 4)
+      return 1;
+    if (p->msdostype == GRUB_PC_PARTITION_TYPE_SFS)
+      {
+	has_sfs = 1;
+	return 1;
+      }
+    return 0;
+  }
+
+  err = grub_partition_msdos_iterate (dsk, hook);
+  if (err)
+    {
+      grub_errno = GRUB_ERR_NONE;
+      return 0;
+    }
+
+  return has_sfs;
+}
+
 static const grub_gpt_part_type_t ldm_type = GRUB_GPT_PARTITION_TYPE_LDM;
 
 static grub_disk_addr_t
@@ -756,17 +785,20 @@
 
   {
     int i;
+    int has_sfs = msdos_has_ldm_partition (disk);
     for (i = 0; i < 3; i++)
       {
 	grub_disk_addr_t sector = LDM_LABEL_SECTOR;
 	switch (i)
 	  {
 	  case 0:
+	    if (!has_sfs)
+	      continue;
 	    sector = LDM_LABEL_SECTOR;
 	    break;
 	  case 1:
 	    /* LDM is never inside a partition.  */
-	    if (disk->partition)
+	    if (!has_sfs || disk->partition)
 	      continue;
 	    sector = grub_disk_get_size (disk);
 	    if (sector == GRUB_DISK_SIZE_UNKNOWN)
@@ -867,6 +899,7 @@
 grub_util_is_ldm (grub_disk_t disk)
 {
   int i;
+  int has_sfs = msdos_has_ldm_partition (disk);
   for (i = 0; i < 3; i++)
     {
       grub_disk_addr_t sector = LDM_LABEL_SECTOR;
@@ -876,11 +909,13 @@
       switch (i)
 	{
 	case 0:
+	  if (!has_sfs)
+	    continue;
 	  sector = LDM_LABEL_SECTOR;
 	  break;
 	case 1:
 	  /* LDM is never inside a partition.  */
-	  if (disk->partition)
+	  if (!has_sfs || disk->partition)
 	    continue;
 	  sector = grub_disk_get_size (disk);
 	  if (sector == GRUB_DISK_SIZE_UNKNOWN)

=== modified file 'include/grub/msdos_partition.h'
--- include/grub/msdos_partition.h	2012-09-13 18:02:04 +0000
+++ include/grub/msdos_partition.h	2012-12-03 15:02:19 +0000
@@ -43,6 +43,7 @@
 #define GRUB_PC_PARTITION_TYPE_FAT16_LBA	0xe
 #define GRUB_PC_PARTITION_TYPE_WIN95_EXTENDED	0xf
 #define GRUB_PC_PARTITION_TYPE_PLAN9            0x39
+#define GRUB_PC_PARTITION_TYPE_SFS		0x42
 #define GRUB_PC_PARTITION_TYPE_EZD		0x55
 #define GRUB_PC_PARTITION_TYPE_MINIX		0x80
 #define GRUB_PC_PARTITION_TYPE_LINUX_MINIX	0x81