Print this page
NEX-19401 update copyright year to 2019
Reviewed by: Rick McNeal <rick.mcneal@nexenta.com>
Reviewed by: Joyce McIntosh <joyce.mcintosh@nexenta.com>
MFV: illumos-gate@39cc040ff7c0c62aae858381f21d0567dd60042e
9967 dflt_termios and base_termios need update
Reviewed by: Andy Fiddaman <omnios@citrus-it.net>
Reviewed by: Jason King <jason.king@joyent.com>
Approved by: Dan McDonald <danmcd@joyent.com>
Author: Toomas Soome <tsoome@me.com>

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/init/init.c
          +++ new/usr/src/cmd/init/init.c
↓ open down ↓ 402 lines elided ↑ open up ↑
 403  403  
 404  404  static struct   pidlist {
 405  405          pid_t   pl_pid;         /* pid to watch for */
 406  406          int     pl_dflag;       /* Flag indicating SIGCLD from this pid */
 407  407          short   pl_exit;        /* Exit status of proc */
 408  408          struct  pidlist *pl_next; /* Next in list */
 409  409  } *Plhead, *Plfree;
 410  410  
 411  411  /*
 412  412   * The following structure contains a set of modes for /dev/syscon
 413      - * and should match the default contents of /etc/ioctl.syscon.  It should also
 414      - * be kept in-sync with base_termios in uts/common/io/ttcompat.c.
      413 + * and should match the default contents of /etc/ioctl.syscon.
 415  414   */
 416  415  static struct termios   dflt_termios = {
 417      -        BRKINT|ICRNL|IXON|IMAXBEL,                      /* iflag */
 418      -        OPOST|ONLCR|TAB3,                               /* oflag */
 419      -        CS8|CREAD|B9600,                                /* cflag */
 420      -        ISIG|ICANON|ECHO|ECHOE|ECHOK|ECHOCTL|ECHOKE|IEXTEN, /* lflag */
 421      -        CINTR, CQUIT, CERASE, CKILL, CEOF, 0, 0, 0,
 422      -        0, 0, 0, 0, 0, 0, 0, 0,
 423      -        0, 0, 0
      416 +        .c_iflag = BRKINT|ICRNL|IXON|IMAXBEL,
      417 +        .c_oflag = OPOST|ONLCR|TAB3,
      418 +        .c_cflag = CS8|CREAD|B9600,
      419 +        .c_lflag = ISIG|ICANON|ECHO|ECHOE|ECHOK|ECHOCTL|ECHOKE|IEXTEN,
      420 +        .c_cc = { CINTR, CQUIT, CERASE, CKILL, CEOF, 0, 0, 0,
      421 +            CSTART, CSTOP, CSWTCH, CDSUSP, CRPRNT, CFLUSH, CWERASE, CLNEXT,
      422 +            CSTATUS, CERASE2, 0
      423 +        }
 424  424  };
 425  425  
 426  426  static struct termios   stored_syscon_termios;
 427  427  static int              write_ioctl = 0;        /* Rewrite /etc/ioctl.syscon */
 428  428  
 429  429  static union WAKEUP {
 430  430          struct WAKEFLAGS {
 431  431                  unsigned w_usersignal : 1;      /* User sent signal to "init" */
 432  432                  unsigned w_childdeath : 1;      /* An "init" child died */
 433  433                  unsigned w_powerhit : 1;        /* OS experienced powerfail */
↓ open down ↓ 258 lines elided ↑ open up ↑
 692  692                                  }
 693  693                          }
 694  694                  }
 695  695  
 696  696                  console(B_FALSE,
 697  697                      "\n\n%s Release %s Version %s %d-bit\r\n",
 698  698                      un.sysname, un.release, un.version, bits);
 699  699                  console(B_FALSE,
 700  700                      "Copyright (c) 1983, 2010, Oracle and/or its affiliates."
 701  701                      " All rights reserved.\r\n");
      702 +                console(B_FALSE, "Copyright 2019 Nexenta Systems, Inc.\r\n");
 702  703          }
 703  704  
 704  705          /*
 705  706           * Get the ioctl settings for /dev/syscon from /etc/ioctl.syscon
 706  707           * so that it can be brought up in the state it was in when the
 707  708           * system went down; or set to defaults if ioctl.syscon isn't
 708  709           * valid.
 709  710           *
 710  711           * This needs to be done even if we're restarting so reset_modes()
 711  712           * will work in case we need to go down to single user mode.
↓ open down ↓ 3890 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX