← Back to branch summary

~colinb/grub/cdbmain

« back to all changes in this revision

Viewing changes to kern/i386/pc/init.c

  • Committer: Colin D Bennett
  • Date: 2008-08-03 03:57:46 UTC
  • mfrom: (820.8.1 trunk-clean)
  • Revision ID: colin@gibibit.com-20080803035746-0zn13x8oznory84l
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
kern/i386/pc/init.c
59
59
  /* XXX: This should be enough.  */
60
60
  char dev[100];
61
61
 
62
 
  if (grub_install_dos_part != -2)
 
62
  if (grub_prefix[0] != '(')
63
63
    {
64
64
      /* If the root drive is not set explicitly, assume that it is identical
65
65
         to the boot drive.  */
247
247
grub_addr_t
248
248
grub_arch_modules_addr (void)
249
249
{
250
 
  return grub_end_addr;
251
 
}
252
 
 
253
 
/* Return the start of the memdisk image.  */
254
 
grub_addr_t
255
 
grub_arch_memdisk_addr (void)
256
 
{
257
250
  return GRUB_MEMORY_MACHINE_DECOMPRESSION_ADDR
258
 
    + (grub_kernel_image_size - GRUB_KERNEL_MACHINE_RAW_SIZE)
259
 
    + grub_total_module_size;
260
 
}
261
 
 
262
 
/* Return the size of the memdisk image.  */
263
 
grub_off_t
264
 
grub_arch_memdisk_size (void)
265
 
{
266
 
  return grub_memdisk_image_size;
 
251
    + (grub_kernel_image_size - GRUB_KERNEL_MACHINE_RAW_SIZE);
267
252
}