Print this page
3788 /etc/bootrc is defunct and should be removed
fix _OBP comment in kobj_bootflags.c

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/krtld/kobj_bootflags.c
          +++ new/usr/src/uts/common/krtld/kobj_bootflags.c
↓ open down ↓ 53 lines elided ↑ open up ↑
  54   54                  boothowto |= RB_ASKNAME;
  55   55                  return;
  56   56          }
  57   57  
  58   58          (void) BOP_GETPROP(ops, "boot-file", kern_bootfile);
  59   59  
  60   60          cp = kern_bootargs;
  61   61  
  62   62  #if defined(_OBP)
  63   63          /*
  64      -         * x86: The boot scripts (i.e., /etc/bootrc) don't prepend the kernel
  65      -         * name to the boot arguments.  (And beware making it do so: if the
  66      -         * run-kernel command returns, it will loop, and you will end up with
  67      -         * multiple copies of the kernel name.)
       64 +         * Sparc only, _OBP isn't defined on x86 any more.
  68   65           */
  69   66          if (cp[0] != '-') {
  70   67                  /* if user booted kadb or kmdb, load kmdb */
  71   68                  if (cp[0] == 'k' && (cp[1] == 'a' || cp[1] == 'm') &&
  72   69                      cp[2] == 'd' && cp[3] == 'b' &&
  73   70                      (cp[4] == ' ' || cp[4] == ' ' || cp[4] == 0))
  74   71                          boothowto |= RB_KMDB;
  75   72                  SKIP_WORD(cp);          /* Skip the kernel's filename. */
  76   73          }
  77   74  #endif
↓ open down ↓ 20 lines elided ↑ open up ↑
  98   95                          boothowto |= RB_CONFIG;
  99   96                          break;
 100   97                  case 'd':
 101   98                          boothowto |= RB_DEBUGENTER;
 102   99                          break;
 103  100  #if defined(_OBP)
 104  101                  case 'D':
 105  102                  case 'F':
 106  103                          break;
 107  104                  case 'f':
 108      -                        (void)prom_setprop(prom_optionsnode(), "diag-level",
      105 +                        (void) prom_setprop(prom_optionsnode(), "diag-level",
 109  106                              (char *)params.gos_optargp,
 110  107                              params.gos_optarglen + 1);
 111  108                          break;
 112  109  #endif
 113  110                  case 'g':
 114  111                          boothowto |= RB_FORTHDEBUG;
 115  112                          break;
 116  113                  case 'G':
 117  114                          boothowto |= RB_FORTHDEBUGDBP;
 118  115                          break;
↓ open down ↓ 132 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX