~ubuntu-branches/ubuntu/utopic/grub/utopic

« back to all changes in this revision

Viewing changes to stage2/fsys_xfs.c

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2005-11-30 18:00:45 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20051130180045-q90uxa58hf9pdrrp
Tags: 0.97-1ubuntu1
* Resynchronise with Debian.
* Drop Nathaniel McCallum's nonaltoptions patch, done differently in
  Debian (as defoptions); added migration code to deal with old Ubuntu
  menu.lst files.
* Drop Matthew Garrett's stage 2 drive fallback patch, since upstream has
  implemented a different solution which appears to address essentially
  the same problem.
* Generated debian/control once from debian/control.in using
  type-handling, but continue to avoid the build-dependency on
  type-handling; the generated debian/control is in the source package.
* Disable fix_amd64_compile.diff for now; it causes configure to fail with
  "GRUB requires a working absolute objcopy; upgrade your binutils".

Show diffs side-by-side

added added

removed removed

Lines of Context:
334
334
{
335
335
        int namelen = 1;
336
336
        int toread;
337
 
        static char *usual[2] = {".", ".."};
 
337
        static char usual[2][3] = {".", ".."};
338
338
        static xfs_dir2_sf_entry_t *sfe;
339
339
        char *name = usual[0];
340
340