Magellan Linux

  • Back to homepage
    • /[magellan-source]/tags/grubby-8_36/grubby.c

    Diff of /tags/grubby-8_36/grubby.c

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

    revision 2056 by niro, Wed Feb 20 14:04:28 2013 UTC revision 2058 by niro, Wed Feb 20 14:06:30 2013 UTC
    # Line 3757  static void traceback(int signum) Line 3757  static void traceback(int signum)
    3757      memset(array, '\0', sizeof (array));      memset(array, '\0', sizeof (array));
    3758      size = backtrace(array, 40);      size = backtrace(array, 40);
    3759    
    3760      fprintf(stderr, "grubby recieved SIGSEGV!  Backtrace (%ld):\n",      fprintf(stderr, "grubby received SIGSEGV!  Backtrace (%ld):\n",
    3761              (unsigned long)size);              (unsigned long)size);
    3762      backtrace_symbols_fd(array, size, STDERR_FILENO);      backtrace_symbols_fd(array, size, STDERR_FILENO);
    3763      exit(1);      exit(1);
    # Line 3855  int main(int argc, const char ** argv) { Line 3855  int main(int argc, const char ** argv) {
    3855   { "initrd", 0, POPT_ARG_STRING, &newKernelInitrd, 0,   { "initrd", 0, POPT_ARG_STRING, &newKernelInitrd, 0,
    3856      _("initrd image for the new kernel"), _("initrd-path") },      _("initrd image for the new kernel"), _("initrd-path") },
    3857   { "extra-initrd", 'i', POPT_ARG_STRING, NULL, 'i',   { "extra-initrd", 'i', POPT_ARG_STRING, NULL, 'i',
    3858      _("auxilliary initrd image for things other than the new kernel"), _("initrd-path") },      _("auxiliary initrd image for things other than the new kernel"), _("initrd-path") },
    3859   { "lilo", 0, POPT_ARG_NONE, &configureLilo, 0,   { "lilo", 0, POPT_ARG_NONE, &configureLilo, 0,
    3860      _("configure lilo bootloader") },      _("configure lilo bootloader") },
    3861   { "make-default", 0, 0, &makeDefault, 0,   { "make-default", 0, 0, &makeDefault, 0,
    Legend:
    Removed from v.2056  
    changed lines
      Added in v.2058