/[grub]/grub2/util/i386/pc/grub-setup.c
ViewVC logotype

Diff of /grub2/util/i386/pc/grub-setup.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.13 by okuji, Mon Aug 1 20:38:46 2005 UTC revision 1.14 by okuji, Sun Aug 7 17:12:52 2005 UTC
# Line 269  setup (const char *prefix, const char *d Line 269  setup (const char *prefix, const char *d
269                struct grub_pc_partition *pcdata =                struct grub_pc_partition *pcdata =
270                  root_dev->disk->partition->data;                  root_dev->disk->partition->data;
271                                
272                if (strcmp (root_dev->disk->partition->partmap->name, "pc"))                if (strcmp (root_dev->disk->partition->partmap->name,
273                              "pc_partition_map") != 0)
274                  grub_util_error ("No PC style partitions found");                  grub_util_error ("No PC style partitions found");
275                                
276                *install_dos_part                *install_dos_part
# Line 423  setup (const char *prefix, const char *d Line 424  setup (const char *prefix, const char *d
424        struct grub_pc_partition *pcdata =        struct grub_pc_partition *pcdata =
425          root_dev->disk->partition->data;          root_dev->disk->partition->data;
426    
427        if (strcmp (root_dev->disk->partition->partmap->name, "pc"))        if (strcmp (root_dev->disk->partition->partmap->name,
428                      "pc_partition_map") != 0)
429          grub_util_error ("No PC style partitions found");          grub_util_error ("No PC style partitions found");
430                
431        *install_dos_part        *install_dos_part
# Line 487  Usage: grub-setup [OPTION]... DEVICE\n\ Line 489  Usage: grub-setup [OPTION]... DEVICE\n\
489  Set up images to boot from DEVICE.\n\  Set up images to boot from DEVICE.\n\
490  DEVICE must be a GRUB device (e.g. ``(hd0,0)'').\n\  DEVICE must be a GRUB device (e.g. ``(hd0,0)'').\n\
491  \n\  \n\
492    -b, --boot-file=FILE    use FILE as the boot file [default=%s]\n\    -b, --boot-image=FILE   use FILE as the boot image [default=%s]\n\
493    -c, --core-file=FILE    use FILE as the core file [default=%s]\n\    -c, --core-image=FILE   use FILE as the core image [default=%s]\n\
494    -d, --directory=DIR     use GRUB files in the directory DIR [default=%s]\n\    -d, --directory=DIR     use GRUB files in the directory DIR [default=%s]\n\
495    -m, --device-map=FILE   use FILE as the device map [default=%s]\n\    -m, --device-map=FILE   use FILE as the device map [default=%s]\n\
496    -r, --root-device=DEV   use DEV as the root device [default=guessed]\n\    -r, --root-device=DEV   use DEV as the root device [default=guessed]\n\
# Line 655  main (int argc, char *argv[]) Line 657  main (int argc, char *argv[])
657            grub_util_error ("Cannot guess the root device. Specify the option ``--root-device''.");            grub_util_error ("Cannot guess the root device. Specify the option ``--root-device''.");
658          }          }
659      }      }
660      
661    /* Do the real work.  */    /* Do the real work.  */
662    setup (prefix,    setup (prefix,
663           dir ? : DEFAULT_DIRECTORY,           dir ? : DEFAULT_DIRECTORY,

Legend:
Removed from v.1.13  
changed lines
  Added in v.1.14

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26