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

2005-08-08 Yoshinori K. Okuji <okuji@enbug.org>

Browse source 
* Makefile.in (LIBLZO): New variable.

        * configure.ac: Check for LZO version 2.

        * util/i386/pc/grub-mkimage.c [HAVE_LZO_LZO1X_H]: Include
        lzo/lzo1x.h instead of lzo1x.h.

        * conf/i386-pc.rmk (grub_mkimage_LDFLAGS): Use $(LIBLZO) instead
        of -llzo.

        * util/i386/pc/grub-setup.c (main): Do not free PREFIX
        twice. Reported by Vladimir Serbinenko <phcoder@gmail.com>.

        * partmap/pc.c (pc_partition_map_probe): Restore P->DATA after
        copying the data from PARTITION to P.
This commit is contained in:
okuji 2005-08-08 23:15:21 +00:00
parent f4917dfdd6
commit 4ac9bd0438
12 changed files with 352 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
util/i386/pc/grub-mkimage.c
View file

@ -35,7 +35,11 @@
#define _GNU_SOURCE 1
#include <getopt.h>
#include <lzo1x.h>
#if defined(HAVE_LZO_LZO1X_H)
# include <lzo/lzo1x.h>
#elif defined(HAVE_LZO1X_H)
# include <lzo1x.h>
#endif
static void
compress_kernel (char *kernel_img, size_t kernel_size,

5
util/i386/pc/grub-setup.c
View file

@ -436,6 +436,10 @@ setup (const char *prefix, const char *dir,
else
*install_dos_part = *install_bsd_part = grub_cpu_to_le32 (-1);
grub_util_info ("dos partition is %u, bsd partition is %u, prefix is %s",
grub_le_to_cpu32 (*install_dos_part),
grub_le_to_cpu32 (*install_bsd_part),
prefix);
strcpy (install_prefix, prefix);
/* Write the first two sectors of the core image onto the disk. */
@ -678,7 +682,6 @@ main (int argc, char *argv[])
free (boot_file);
free (core_file);
free (prefix);
free (dir);
free (dev_map);
free (root_dev);