--- old/usr/src/cmd/svc/milestone/devices-local
          +++ new/usr/src/cmd/svc/milestone/devices-local

   1    1  #!/sbin/sh
   2    2  #
   3    3  # CDDL HEADER START
   4    4  #
   5    5  # The contents of this file are subject to the terms of the
   6    6  # Common Development and Distribution License (the "License").
   7    7  # You may not use this file except in compliance with the License.
   8    8  #
   9    9  # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  10   10  # or http://www.opensolaris.org/os/licensing.
  11   11  # See the License for the specific language governing permissions
  12   12  # and limitations under the License.

  13   13  #
  14   14  # When distributing Covered Code, include this CDDL HEADER in each
  15   15  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  16   16  # If applicable, add the following below this CDDL HEADER, with the
  17   17  # fields enclosed by brackets "[]" replaced with your own identifying
  18   18  # information: Portions Copyright [yyyy] [name of copyright owner]
  19   19  #
  20   20  # CDDL HEADER END
  21   21  #
  22   22  #
  23      -# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
       23 +# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  24   24  # Use is subject to license terms.
  25   25  #
  26   26  # Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T.
  27   27  # All rights reserved.
  28   28  #
  29      -#
  30      -# ident "%Z%%M% %I%     %E% SMI"
  31   29  
  32   30  # Initiate the device reconfiguration process in case we need some
  33   31  # device links established so that we can successfully perform our
  34   32  # remaining standard mounts.
  35   33  
  36   34  . /lib/svc/share/smf_include.sh
  37   35  
  38   36  smf_is_globalzone || exit $SMF_EXIT_OK
  39   37  
  40   38  svcprop -q -p system/reconfigure system/svc/restarter:default

  41   39  if [ $? -eq 0 ]; then
  42   40          echo 'Configuring devices.' > /dev/msglog 2>&1
  43   41          /usr/sbin/devfsadm >/dev/msglog 2>&1
  44   42          if [ -x /usr/ucb/ucblinks -a -f /usr/ucblib/ucblinks.awk ]; then
  45   43                  /usr/ucb/ucblinks >/dev/null 2>&1
  46   44          fi
  47   45  
  48   46          #
  49   47          # Flush any existing socket mappings since the major numbers of
  50   48          # the device files may have changed.
  51   49          #
  52   50          /usr/bin/awk '/^[^#]/ { print $1, $2, $3 }' /etc/sock2path | \
  53   51                  /sbin/soconfig -f /dev/fd/0 >/dev/null 2>&1
  54   52          /sbin/soconfig -f /etc/sock2path >/dev/null 2>&1
  55   53  
  56   54          #
  57   55          # Update kernel driver.conf cache.
  58   56          #
  59   57          /usr/sbin/devfsadm -I
  60   58  fi
  61   59  
  62   60  # Establish the default framebuffer name.
  63   61  
  64   62  fbdev=`/usr/sbin/prtconf -F 2>/dev/null`
  65   63  
  66   64  if [ $? -eq 0 ]; then
  67   65          set -- /devices$fbdev*
  68   66          if [ -c $1 ]; then
  69   67                  if [ -h /dev/fb ]; then
  70   68                          fblink=`ls -l /dev/fb | /usr/bin/awk '{ print $11 }'`
  71   69  
  72   70                          if [ "$1" != "$fblink" ]; then
  73   71                                  rm -f /dev/fb
  74   72                                  ln -s $1 /dev/fb

  75   73                          fi
  76   74                  else
  77   75                          rm -f /dev/fb
  78   76                          ln -s $1 /dev/fb
  79   77                  fi
  80   78          fi
  81   79  fi
  82   80  
  83   81  # Create any zvol devices
  84   82  if [ -x /usr/sbin/zfs ]; then
       83 +        /usr/sbin/zpool key -l -a
  85   84          /usr/sbin/zfs volinit || exit $SMF_EXIT_ERR_FATAL
  86   85          #
  87   86          # Add swap again to allow for swapping to zvols.
  88   87          #
  89   88          /sbin/swapadd
  90   89  fi
  91   90  
  92   91  exit $SMF_EXIT_OK
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX