diff options
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/initpkg/vfstab.sh | 11 | ||||
| -rw-r--r-- | usr/src/cmd/stmsboot/stmsboot.sh | 9 | ||||
| -rw-r--r-- | usr/src/cmd/syseventd/svc-syseventd | 3 | ||||
| -rw-r--r-- | usr/src/lib/libsec/common/aclutils.h | 2 |
4 files changed, 10 insertions, 15 deletions
diff --git a/usr/src/cmd/initpkg/vfstab.sh b/usr/src/cmd/initpkg/vfstab.sh index af8fc8deca..481d875cd5 100644 --- a/usr/src/cmd/initpkg/vfstab.sh +++ b/usr/src/cmd/initpkg/vfstab.sh @@ -3,9 +3,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -21,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -36,8 +35,8 @@ echo "#device device mount FS fsck mount mount # /devices - /devices devfs - no - /proc - /proc proc - no - -ctfs - /system/contract ctfs - no - -objfs - /system/object objfs - no - +ctfs - /system/contract ctfs - no - +objfs - /system/object objfs - no - fd - /dev/fd fd - no - swap - /tmp tmpfs - yes - ">vfstab diff --git a/usr/src/cmd/stmsboot/stmsboot.sh b/usr/src/cmd/stmsboot/stmsboot.sh index c6c8489b08..4d45ca1077 100644 --- a/usr/src/cmd/stmsboot/stmsboot.sh +++ b/usr/src/cmd/stmsboot/stmsboot.sh @@ -3,9 +3,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -21,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" @@ -281,7 +280,7 @@ fi if [ "x$cmd" = xenable -o "x$cmd" = xdisable -o "x$cmd" = xupdate ]; then # # The bootup script doesn't work on cache-only-clients as the script - # is executed before the plumbing for cachfs mounting of root is done. + # is executed before the plumbing for cachefs mounting of root is done. # if mount -v | egrep -s " on / type (nfs|cachefs) "; then gettext "This command option is not supported on systems with nfs or cachefs mounted root filesystem.\n" 1>&2 diff --git a/usr/src/cmd/syseventd/svc-syseventd b/usr/src/cmd/syseventd/svc-syseventd index a896b0731b..1884bf9c61 100644 --- a/usr/src/cmd/syseventd/svc-syseventd +++ b/usr/src/cmd/syseventd/svc-syseventd @@ -39,9 +39,6 @@ case "$1" in # by syseventd. syseventd should be stopped before devfsadm and syseventconfd. # 'stop') - dpid=`/usr/bin/pgrep devfsadm` - scpid=`/usr/bin/pgrep syseventconfd` - spid=`/usr/bin/pgrep syseventd` zone=`smf_zonename` /usr/bin/pkill -x -u 0 -P 1 -z $zone rcm_daemon /usr/bin/pkill -x -u 0 -P 1 -z $zone syseventd diff --git a/usr/src/lib/libsec/common/aclutils.h b/usr/src/lib/libsec/common/aclutils.h index 44ed988348..e5c34347bf 100644 --- a/usr/src/lib/libsec/common/aclutils.h +++ b/usr/src/lib/libsec/common/aclutils.h @@ -44,7 +44,7 @@ extern "C" { /* * Hint for whether acl_totext() should use - * mneumonics: + * mnemonics: * read_data/list_directory * write_data/add_file or * append_data/add_subdirectory |