vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge my local branch

Browse source
This commit is contained in:
Robert Millan 2009-12-25 12:43:20 +01:00
commit 427d6aa453
9 changed files with 148 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

1
util/grub-install.in
View file

@ -29,6 +29,7 @@ PACKAGE_TARNAME=@PACKAGE_TARNAME@
PACKAGE_VERSION=@PACKAGE_VERSION@
target_cpu=@target_cpu@
platform=@platform@
host_os=@host_os@
pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`
grub_setup=${sbindir}/`echo grub-setup | sed ${transform}`

1
util/i386/efi/grub-install.in
View file

@ -29,6 +29,7 @@ PACKAGE_TARNAME=@PACKAGE_TARNAME@
PACKAGE_VERSION=@PACKAGE_VERSION@
target_cpu=@target_cpu@
platform=@platform@
host_os=@host_os@
pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`
grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}`

3
util/mkisofs/write.c
View file

@ -1436,7 +1436,10 @@ static int FDECL1(padblock_write, FILE *, outfile)
FILE *fp = fopen (boot_image_embed, "rb");
if (! fp)
error (1, errno, _("Unable to open %s"), boot_image_embed);
fread (buffer, 2048 * PADBLOCK_SIZE, 1, fp);
if (fgetc (fp) != EOF)
error (1, 0, _("%s is too big for embed area"), boot_image_embed);
}
if (use_protective_msdos_label)