← Back to branch summary

~ubuntu-core-dev/ubuntu/trusty/grub2/trusty

« back to all changes in this revision

Viewing changes to grub-core/normal/main.c

  • Committer: Colin Watson
  • Date: 2013-08-15 09:40:28 UTC
  • mfrom: (1892.1.819 grub2)
  • Revision ID: cjwatson@canonical.com-20130815094028-hseyicpqhkgbyasg
merge from Debian 2.00-17

Show diffs side-by-side

added added

removed removed

Lines of Context:
grub-core/normal/main.c
399
399
grub_normal_read_line_real (char **line, int cont, int nested)
400
400
{
401
401
  const char *prompt;
 
402
#ifdef GRUB_QUIET_BOOT
402
403
  static int displayed_intro;
403
404
 
404
405
  if (! displayed_intro)
406
407
      grub_normal_reader_init (nested);
407
408
      displayed_intro = 1;
408
409
    }
 
410
#endif
409
411
 
410
412
  if (cont)
411
413
    /* TRANSLATORS: it's command line prompt.  */
453
455
      return;
454
456
    }
455
457
 
 
458
#ifndef GRUB_QUIET_BOOT
 
459
  grub_normal_reader_init (nested);
 
460
#endif
 
461
 
456
462
  while (1)
457
463
    {
458
464
      char *line;