diff options
Diffstat (limited to 'usr/src/cmd/svc')
57 files changed, 186 insertions, 203 deletions
diff --git a/usr/src/cmd/svc/common/i.manifest b/usr/src/cmd/svc/common/i.manifest index 18d2c2622d..62e73ee50f 100644 --- a/usr/src/cmd/svc/common/i.manifest +++ b/usr/src/cmd/svc/common/i.manifest @@ -23,7 +23,7 @@ # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# i.manifest - smf(5) service manifest install class action script +# i.manifest - smf(7) service manifest install class action script # repfile=$PKG_INSTALL_ROOT/etc/svc/repository.db @@ -75,7 +75,7 @@ svc_deathrow() # # If the repository does not yet exist, create it from the appropriate seed. If -# for some reason the seeds do not exist, svccfg(1M) will create the repository +# for some reason the seeds do not exist, svccfg(8) will create the repository # automatically. # if [ ! -f $repfile ]; then @@ -93,8 +93,8 @@ fi if [ ! -r $PKG_INSTALL_ROOT/etc/svc/volatile/repository_door ]; then # - # smf(5) is not presently running for the destination environment. - # Since we presently cannot refresh without a running svc.startd(1M), we + # smf(7) is not presently running for the destination environment. + # Since we presently cannot refresh without a running svc.startd(8), we # cannot consistently handle dependent placement. Defer to next boot. # while read src dst; do diff --git a/usr/src/cmd/svc/common/r.manifest b/usr/src/cmd/svc/common/r.manifest index 98c6e48f19..e47494f67a 100644 --- a/usr/src/cmd/svc/common/r.manifest +++ b/usr/src/cmd/svc/common/r.manifest @@ -24,7 +24,7 @@ # Use is subject to license terms. # # -# r.manifest - smf(5) manifest remove class action script +# r.manifest - smf(7) manifest remove class action script # MFSTSCAN=/lib/svc/bin/mfstscan diff --git a/usr/src/cmd/svc/configd/backend.c b/usr/src/cmd/svc/configd/backend.c index 4c3a7d0816..40726dd1d0 100644 --- a/usr/src/cmd/svc/configd/backend.c +++ b/usr/src/cmd/svc/configd/backend.c @@ -28,7 +28,7 @@ /* * sqlite is not compatible with _FILE_OFFSET_BITS=64, but we need to * be able to statvfs(2) possibly large systems. This define gives us - * access to the transitional interfaces. See lfcompile64(5) for how + * access to the transitional interfaces. See lfcompile64(7) for how * _LARGEFILE64_SOURCE works. */ #define _LARGEFILE64_SOURCE @@ -1979,7 +1979,7 @@ integrity_fail: } else { (void) fprintf(stderr, "\n" -"svc.configd: smf(5) database integrity check of:\n" +"svc.configd: smf(7) database integrity check of:\n" "\n" " %s\n" "\n" @@ -1988,7 +1988,7 @@ integrity_fail: " your service provider%s%s\n" "\n" " The system will not be able to boot until you have restored a working\n" -" database. svc.startd(1M) will provide a sulogin(1M) prompt for recovery\n" +" database. svc.startd(8) will provide a sulogin(8) prompt for recovery\n" " purposes. The command:\n" "\n" " /lib/svc/bin/restore_repository\n" diff --git a/usr/src/cmd/svc/configd/restore_repository.sh b/usr/src/cmd/svc/configd/restore_repository.sh index fa3b5e2e4f..4d7bd233a6 100644 --- a/usr/src/cmd/svc/configd/restore_repository.sh +++ b/usr/src/cmd/svc/configd/restore_repository.sh @@ -87,7 +87,7 @@ fi echo >&2 " See http://illumos.org/msg/SMF-8000-MY for more information on the use of -this script to restore backup copies of the smf(5) repository. +this script to restore backup copies of the smf(7) repository. If there are any problems which need human intervention, this script will give instructions and then exit back to your shell." @@ -97,7 +97,7 @@ if [ "$myroot" = "/" ]; then [ "`/sbin/zonename`" != global ] && system="zone" echo >&2 " Note that upon full completion of this script, the $system will be rebooted -using reboot(1M), which will interrupt any active services. +using reboot(8), which will interrupt any active services. " fi @@ -242,7 +242,7 @@ new="$repo"_old_"`date +%Y''%m''%d'_'%H''%M''%S`" steps= if [ "$myroot" = / ]; then steps="$steps -svc.startd(1M) and svc.configd(1M) will be quiesced, if running." +svc.startd(8) and svc.configd(8) will be quiesced, if running." fi if [ -r $repo ]; then @@ -265,7 +265,7 @@ $file EOF if [ "$myroot" = / ]; then - echo "and the system will be rebooted with reboot(1M)." + echo "and the system will be rebooted with reboot(8)." fi echo @@ -291,11 +291,11 @@ if [ "$myroot" = / ]; then startd="`pgrep -z "$zone" -f svc.startd`" echo - echo "Quiescing svc.startd(1M) and svc.configd(1M): \c" + echo "Quiescing svc.startd(8) and svc.configd(8): \c" if [ -n "$startd" ]; then pstop $startd startd_msg=\ -"To start svc.start(1M) running, do: /usr/bin/prun $startd" +"To start svc.start(8) running, do: /usr/bin/prun $startd" fi pkill -z "$zone" -f svc.configd diff --git a/usr/src/cmd/svc/dtd/service_bundle.dtd.1 b/usr/src/cmd/svc/dtd/service_bundle.dtd.1 index b92b70c6c4..032b77aabe 100644 --- a/usr/src/cmd/svc/dtd/service_bundle.dtd.1 +++ b/usr/src/cmd/svc/dtd/service_bundle.dtd.1 @@ -34,7 +34,7 @@ XInclude support A series of service bundles may be composed via the xi:include tag. - smf(5) tools enforce that all bundles be of the same type. + smf(7) tools enforce that all bundles be of the same type. --> <!-- @@ -67,7 +67,7 @@ stability This element associates an SMI stability level with the parent - element. See attributes(5) for an explanation of interface + element. See attributes(7) for an explanation of interface stability levels. Its attribute is @@ -529,7 +529,7 @@ resource_pool The resource pool name to launch the method on. ":default" can be used as a token to indicate use of the - pool specified in the project(4) entry given in the + pool specified in the project(5) entry given in the "project" attribute above. --> <!ELEMENT method_context @@ -562,7 +562,7 @@ instance of this service is delegated. exec The string identifying the action to take. For - svc.startd(1M), this is a string suitable to pass to + svc.startd(8), this is a string suitable to pass to exec(2). timeout_seconds [integer] Duration, in seconds, to wait for this @@ -668,7 +668,7 @@ Its sole attribute is xml:lang The name of the locale, in the form accepted by LC_ALL, - etc. See locale(5). + etc. See locale(7). --> <!ELEMENT loctext (#PCDATA) > @@ -1017,7 +1017,7 @@ element, a set of dependencies on other services, potentially customized methods or configuration data, an optional method context, and a pointer to its restarter. (If no restarter is - specified, the master restarter, svc.startd(1M), is assumed to be + specified, the master restarter, svc.startd(8), is assumed to be responsible for the service.) Its attributes are diff --git a/usr/src/cmd/svc/lsvcrun/lsvcrun.c b/usr/src/cmd/svc/lsvcrun/lsvcrun.c index 74eeaefe5a..7599766a01 100644 --- a/usr/src/cmd/svc/lsvcrun/lsvcrun.c +++ b/usr/src/cmd/svc/lsvcrun/lsvcrun.c @@ -31,7 +31,7 @@ * group identifies a service, named in the form 'rc2_d_S10foo'. * * Each group has the following properties: name, the script name - * displayed by svcs(1m); state_timestamp; contract, contract ID; + * displayed by svcs(1); state_timestamp; contract, contract ID; * inode, the inode of the script; and suffix, the suffix of the * script name, e.g. 'foo'. * @@ -818,7 +818,7 @@ main(int argc, char *argv[], char *envp[]) /* Make sure we were run by svc.startd. */ if ((restarter = getenv("SMF_RESTARTER")) == NULL || strcmp(restarter, SCF_SERVICE_STARTD) != 0) - uu_die(gettext("invocation outside smf(5) inappropriate\n")); + uu_die(gettext("invocation outside smf(7) inappropriate\n")); while ((o = getopt(argc, argv, "s")) != -1) { switch (o) { diff --git a/usr/src/cmd/svc/milestone/README.share b/usr/src/cmd/svc/milestone/README.share index e69a82cedc..fe16191b42 100644 --- a/usr/src/cmd/svc/milestone/README.share +++ b/usr/src/cmd/svc/milestone/README.share @@ -24,21 +24,21 @@ Use is subject to license terms. /lib/svc/share/README -smf(5): Notes on maintenance mode and recovery +smf(7): Notes on maintenance mode and recovery Failures that bring the system to maintenance mode may include hardware or critical software failures. The procedures below are given so that some software repairs can be made; the recommended exit approach once a repair has been made is to reboot the system. The system can be brought -to maintenance mode deliberately via the '-s' option to boot(1M), or via -the 's' option to init(1M). +to maintenance mode deliberately via the '-s' option to boot(8), or via +the 's' option to init(8). -In failure scenarios, smf(5) may or may not be running, depending on -which component has failed. If smf(5) is running, and the /usr -filesystem is reachable, then the usual svcadm(1M) invocations to clear +In failure scenarios, smf(7) may or may not be running, depending on +which component has failed. If smf(7) is running, and the /usr +filesystem is reachable, then the usual svcadm(8) invocations to clear maintenance state and restart services instances can be used. Otherwise, the following instructions describe the direct execution of -service methods, so that capabilities that svc.startd(1M) would normally +service methods, so that capabilities that svc.startd(8) would normally start automatically can be started manually. In the case that the document recommends an invocation like @@ -85,13 +85,13 @@ to directly execute the corresponding service methods # /lib/svc/method/fs-minimal to mount the various filesystems. In the case that these methods fail, -a direct invocation of mount(1M), and potentially fsck(1M), should be +a direct invocation of mount(8), and potentially fsck(8), should be attempted for file systems required for recovery purposes. /lib/svc/method/fs-usr attempts to remount the root file system read-write, such that persistent changes can be made to the system's configuration. If this method is failing, one can directly remount -using the mount(1M) command via +using the mount(8) command via # /sbin/mount -o rw,remount / @@ -99,44 +99,44 @@ using the mount(1M) command via private use. It may prove a useful location to create mount points if the root file system cannot be remounted read-write. -3. Failure to run svc.configd(1M). +3. Failure to run svc.configd(8). -svc.configd(1M) will give detailed instructions for recovery if the -corruption is detected in the repository. If svc.configd(1M) cannot be +svc.configd(8) will give detailed instructions for recovery if the +corruption is detected in the repository. If svc.configd(8) cannot be run because of missing or corrupt library components, then the affected components will need to be replaced. Components could be copied from a CD-ROM or DVD-ROM, or from another system. -4. Failure to run svc.startd(1M). +4. Failure to run svc.startd(8). -If the inittab(4) line to invoke svc.startd(1M) is missing or incorrect, +If the inittab(5) line to invoke svc.startd(8) is missing or incorrect, it will need to be restored. A valid entry is smf::sysinit:/lib/svc/bin/svc.startd >/dev/msglog 2<>/dev/msglog </dev/console -If svc.startd(1M) cannot be run because of missing or corrupt library +If svc.startd(8) cannot be run because of missing or corrupt library components, then the affected components will need to be replaced, as -for svc.configd(1M) above. +for svc.configd(8) above. 5. Activating basic networking configuration. -If svc.startd(1M) did not execute successfully, it may also be necessary +If svc.startd(8) did not execute successfully, it may also be necessary to activate network interfaces manually, such that other hosts can be contacted. The service methods can be invoked directly as # /lib/svc/method/net-loopback # /lib/svc/method/net-physical -If these methods fail, a direct invocation of ifconfig(1M) can be +If these methods fail, a direct invocation of ifconfig(8) can be attempted. -In some scenarios, one may be able to use routeadm(1M) to activate more +In some scenarios, one may be able to use routeadm(8) to activate more dynamic route management functionality; restoring the default dynamic routing behaviour can be done using the '-u' option. (Invoking routeadm with no arguments will display which commands must be accessible for the current routing configuration to be invoked.) Otherwise, once interfaces are up, a default route can be manually added using the -route(1M) command. On typical IPv4 networks, this invocation would be +route(8) command. On typical IPv4 networks, this invocation would be # /sbin/route add net default _gateway_IP_ diff --git a/usr/src/cmd/svc/milestone/console-login b/usr/src/cmd/svc/milestone/console-login index 8ddaaf29ac..8cc6495b2d 100644 --- a/usr/src/cmd/svc/milestone/console-login +++ b/usr/src/cmd/svc/milestone/console-login @@ -29,7 +29,7 @@ # console login. # # For modifying parameters passed to ttymon, do not edit -# this script. Instead use svccfg(1m) to modify the SMF +# this script. Instead use svccfg(8) to modify the SMF # repository. For example: # # # svccfg diff --git a/usr/src/cmd/svc/milestone/early-manifest-import.xml b/usr/src/cmd/svc/milestone/early-manifest-import.xml index 270ffc8029..f10437c793 100644 --- a/usr/src/cmd/svc/milestone/early-manifest-import.xml +++ b/usr/src/cmd/svc/milestone/early-manifest-import.xml @@ -64,7 +64,7 @@ <!-- Make service transient, so that startd doesn't try to restart - the service when there are no processes associated with it. + the service when there are no processes associated with it. --> <property_group name='startd' type='framework'> <propval name='duration' type='astring' @@ -87,13 +87,13 @@ early manifest import </loctext> </description> <documentation> - <manpage title='svc.startd' section='1M' + <manpage title='svc.startd' section='8' manpath='/usr/share/man' /> - <manpage title='smf_method' section='5' + <manpage title='smf_method' section='7' manpath='/usr/share/man' /> - <manpage title='smf' section='5' + <manpage title='smf' section='7' manpath='/usr/share/man' /> - <manpage title='smf_bootstrap' section='5' + <manpage title='smf_bootstrap' section='7' manpath='/usr/share/man' /> </documentation> diff --git a/usr/src/cmd/svc/milestone/global.xml b/usr/src/cmd/svc/milestone/global.xml index 4ebc6ddaf0..10597f8211 100644 --- a/usr/src/cmd/svc/milestone/global.xml +++ b/usr/src/cmd/svc/milestone/global.xml @@ -68,9 +68,9 @@ system-wide configuration definitions </loctext> </common_name> <documentation> - <manpage title='smf' section='5' + <manpage title='smf' section='7' manpath='/usr/share/man' /> - <manpage title='smf_template' section='5' + <manpage title='smf_template' section='7' manpath='/usr/share/man' /> </documentation> @@ -540,7 +540,7 @@ The project ID in numeric or text form. ":default" can be used as a token to in <description> <loctext xml:lang='C'> The resource pool name in which to launch the method. ":default" can be used -as a token to indicate the pool specified in the project(4) entry given in +as a token to indicate the pool specified in the project(5) entry given in the project attribute. </loctext> </description> @@ -550,7 +550,7 @@ the project attribute. required='false'> <description> <loctext xml:lang='C'> -An optional string specifying the security flags as defined in security-flags(5). +An optional string specifying the security flags as defined in security-flags(7). </loctext> </description> <cardinality min='1' max='1'/> @@ -589,7 +589,7 @@ in numeric or text form. required='false'> <description> <loctext xml:lang='C'> -An optional string specifying the privilege set as defined in privileges(5). +An optional string specifying the privilege set as defined in privileges(7). </loctext> </description> <cardinality min='1' max='1'/> @@ -599,7 +599,7 @@ An optional string specifying the privilege set as defined in privileges(5). <description> <loctext xml:lang='C'> An optional string specifying the limit privilege set as defined in -privileges(5). +privileges(7). </loctext> </description> <cardinality min='1' max='1'/> @@ -621,7 +621,7 @@ user, group, privileges, and limit_privileges properties. <description> <loctext xml:lang='C'> The name of an RBAC (role-based access control) profile which, along with the -method executable, identifies an entry in exec_attr(4). +method executable, identifies an entry in exec_attr(5). </loctext> </description> <cardinality min='1' max='1'/> @@ -649,7 +649,7 @@ Service name </common_name> <description> <loctext xml:lang='C'> -IANA name or RPC name for non-inetd service, equivalent to inetd/name property. For RPC services, the value of this property is not an IANA name but is either an RPC program number or name, see rpc(4). +IANA name or RPC name for non-inetd service, equivalent to inetd/name property. For RPC services, the value of this property is not an IANA name but is either an RPC program number or name, see rpc(5). </loctext> </description> </prop_pattern> diff --git a/usr/src/cmd/svc/milestone/identity.xml b/usr/src/cmd/svc/milestone/identity.xml index 3fdcf56496..140cb562d6 100644 --- a/usr/src/cmd/svc/milestone/identity.xml +++ b/usr/src/cmd/svc/milestone/identity.xml @@ -24,8 +24,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -80,7 +78,7 @@ </loctext> </common_name> <documentation> - <manpage title='nodename' section='4' + <manpage title='nodename' section='5' manpath='/usr/share/man' /> </documentation> </template> @@ -110,9 +108,9 @@ </loctext> </common_name> <documentation> - <manpage title='domainname' section='1M' + <manpage title='domainname' section='8' manpath='/usr/share/man' /> - <manpage title='defaultdomain' section='4' + <manpage title='defaultdomain' section='5' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/svc/milestone/make-console-login-xml b/usr/src/cmd/svc/milestone/make-console-login-xml index 2b78164e78..bcb13c1c7c 100644 --- a/usr/src/cmd/svc/milestone/make-console-login-xml +++ b/usr/src/cmd/svc/milestone/make-console-login-xml @@ -124,7 +124,7 @@ cat >console-login.xml <<EOF <!-- these are passed to ttymon in the method script. note that value_authorization is not passed to ttymon - and it's for smf_security(5). + and it's for smf_security(7). --> <property_group name='ttymon' type='application'> <propval name='value_authorization' type='astring' @@ -239,7 +239,7 @@ Console login </loctext> </common_name> <documentation> - <manpage title='ttymon' section='1M' + <manpage title='ttymon' section='8' manpath='/usr/share/man' /> </documentation> diff --git a/usr/src/cmd/svc/milestone/manifest-import b/usr/src/cmd/svc/milestone/manifest-import index 43fb677b92..b67361183f 100644 --- a/usr/src/cmd/svc/milestone/manifest-import +++ b/usr/src/cmd/svc/milestone/manifest-import @@ -243,13 +243,13 @@ function import_manifests { $X /usr/sbin/svccfg import $dirs > $logf 2>&1 fi - grep "Loaded .*. smf(5) service descriptions" $logf > /dev/null 2>&1 + grep "Loaded .*. smf(7) service descriptions" $logf > /dev/null 2>&1 if [ $? -eq 0 ]; then activity=true fi if [ -s $logf ]; then - grep "smf(5) service descriptions failed to load" $logf > /dev/null 2>&1 + grep "smf(7) service descriptions failed to load" $logf > /dev/null 2>&1 failures=$? if [ $failures -eq 0 ]; then echo "svccfg warnings:" @@ -322,7 +322,7 @@ function apply_profile { # # 4. Upgrade handling. The upgrade file generally consists of a series -# of svcadm(1M) and svccfg(1M) commands. +# of svcadm(8) and svccfg(8) commands. # function handle_upgrade { diff --git a/usr/src/cmd/svc/milestone/manifest-import.xml b/usr/src/cmd/svc/milestone/manifest-import.xml index 2ef9021401..18723d957d 100644 --- a/usr/src/cmd/svc/milestone/manifest-import.xml +++ b/usr/src/cmd/svc/milestone/manifest-import.xml @@ -24,8 +24,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -81,7 +79,7 @@ </loctext> </common_name> <documentation> - <manpage title='smf_bootstrap' section='5' + <manpage title='smf_bootstrap' section='7' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/svc/milestone/multi-user-server.xml b/usr/src/cmd/svc/milestone/multi-user-server.xml index a4e48fd9ac..7c590be9c4 100644 --- a/usr/src/cmd/svc/milestone/multi-user-server.xml +++ b/usr/src/cmd/svc/milestone/multi-user-server.xml @@ -24,8 +24,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -103,7 +101,7 @@ multi-user plus exports milestone </loctext> </common_name> <documentation> - <manpage title='init' section='1M' + <manpage title='init' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/svc/milestone/multi-user.xml b/usr/src/cmd/svc/milestone/multi-user.xml index a5b6698e47..8e59064861 100644 --- a/usr/src/cmd/svc/milestone/multi-user.xml +++ b/usr/src/cmd/svc/milestone/multi-user.xml @@ -24,8 +24,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -135,7 +133,7 @@ multi-user milestone </loctext> </common_name> <documentation> - <manpage title='init' section='1M' + <manpage title='init' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/svc/milestone/net-loc b/usr/src/cmd/svc/milestone/net-loc index e4d0a8c994..b8358b64ff 100644 --- a/usr/src/cmd/svc/milestone/net-loc +++ b/usr/src/cmd/svc/milestone/net-loc @@ -66,12 +66,12 @@ SCRIPT_PATH=/etc/svc/volatile/nwam # # echoes DHCP controlled interfaces separated by commas # -# Don't parse the output of ifconfig(1M) because interfaces that haven't +# Don't parse the output of ifconfig(8) because interfaces that haven't # acquired a DHCP lease also have the DHCP flag set. # get_dhcp_interfaces () { # - # 1. parse netstat(1M) output for v4 interfaces in BOUND + # 1. parse netstat(8) output for v4 interfaces in BOUND # or INFORMATION state # 2. make a space-separated list of interface names # @@ -302,7 +302,7 @@ do_nis () { # # do_ldap <location> # -# Installs LDAP information using ldapclient(1M) for location +# Installs LDAP information using ldapclient(8) for location # # Returns 0 on success, 1 on failure # @@ -334,7 +334,7 @@ do_ldap () { ;; esac - # Use ldapclient(1M) to initialize LDAP client settings. + # Use ldapclient(8) to initialize LDAP client settings. if [ -n "$DEFAULT_DOMAIN" -o -n "$LDAP_SERVERS" ]; then $LDAPCLIENT init -a domainName=$DEFAULT_DOMAIN \ $LDAP_SERVERS @@ -367,9 +367,9 @@ do_ns () { stop_svc $LDAP_CLIENT_FMRI # - # Remove /etc/defaultdomain and unset domainname(1M). If NIS + # Remove /etc/defaultdomain and unset domainname(8). If NIS # and/or LDAP is configured, they will create /etc/defaultdomain - # and set the domainname(1M). + # and set the domainname(8). # $RM -f $ETC_DEFAULT_DOMAIN $DOMAINNAME " " diff --git a/usr/src/cmd/svc/milestone/net-nwam b/usr/src/cmd/svc/milestone/net-nwam index 9f1de2fd76..fb012d7bee 100644 --- a/usr/src/cmd/svc/milestone/net-nwam +++ b/usr/src/cmd/svc/milestone/net-nwam @@ -203,7 +203,7 @@ create_legacy_loc () { done fi - # Gather LDAP info via ldapclient(1M). + # Gather LDAP info via ldapclient(8). if [ -f /var/ldap/ldap_client_file ]; then copy_to_legacy /var/ldap/ldap_client_file NAMESERVICES="${NAMESERVICES}ldap," @@ -350,7 +350,7 @@ revert_to_legacy_loc () { $SVCADM enable dns/client fi - # set /etc/defaultdomain and domainname(1M) + # set /etc/defaultdomain and domainname(8) DEFAULT_DOMAIN=`nwam_get_loc_prop Legacy default-domain` if [ -n "$DEFAULT_DOMAIN" ]; then $DOMAINNAME $DEFAULT_DOMAIN @@ -526,7 +526,7 @@ case "$1" in # # Upgrade handling. The upgrade file consists of a series - # of dladm(1M) commands. Note that after we are done, we + # of dladm(8) commands. Note that after we are done, we # cannot rename the upgrade script file as the file system # is still read-only at this point. Defer this to the # manifest-import service. diff --git a/usr/src/cmd/svc/milestone/net-routing-setup b/usr/src/cmd/svc/milestone/net-routing-setup index 7f6d457b33..3ac6a3f7aa 100644 --- a/usr/src/cmd/svc/milestone/net-routing-setup +++ b/usr/src/cmd/svc/milestone/net-routing-setup @@ -53,7 +53,7 @@ smf_configure_ip || exit $SMF_EXIT_OK /sbin/routeadm -u # -# Are we routing dynamically? routeadm(1M) reports this in the +# Are we routing dynamically? routeadm(8) reports this in the # "current" values of ipv4/6-routing - if either are true, we are running # routing daemons (or at least they are enabled to run). # @@ -177,7 +177,7 @@ else fi # -# Use routeadm(1M) to configure forwarding and launch routing daemons +# Use routeadm(8) to configure forwarding and launch routing daemons # for IPv4 and IPv6 based on preset values. These settings only apply # to the global zone. For IPv4 dynamic routing, the system will default # to disabled if a default route was previously added via BOOTP, DHCP, diff --git a/usr/src/cmd/svc/milestone/net-svc b/usr/src/cmd/svc/milestone/net-svc index 0ede5cfb3f..c7bea42f53 100644 --- a/usr/src/cmd/svc/milestone/net-svc +++ b/usr/src/cmd/svc/milestone/net-svc @@ -123,7 +123,7 @@ dhcp_edits () # it is important to preserve order of domain entries vs. search # entries; the search entries are reserved for administrator # customization and if placed after the domain entry will override -# it. See resolv.conf(4). +# it. See resolv.conf(5). # # The first arg should be the dns servers string, the second # should be the dns domain. diff --git a/usr/src/cmd/svc/milestone/network-initial.xml b/usr/src/cmd/svc/milestone/network-initial.xml index b0f3a9e87b..f4414f18b4 100644 --- a/usr/src/cmd/svc/milestone/network-initial.xml +++ b/usr/src/cmd/svc/milestone/network-initial.xml @@ -85,7 +85,7 @@ initial network services </loctext> </description> <documentation> - <manpage title='ifconfig' section='1M' + <manpage title='ifconfig' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/svc/milestone/network-install.xml b/usr/src/cmd/svc/milestone/network-install.xml index 69e49986f4..461a6c4832 100644 --- a/usr/src/cmd/svc/milestone/network-install.xml +++ b/usr/src/cmd/svc/milestone/network-install.xml @@ -105,7 +105,7 @@ </loctext> </common_name> <documentation> - <manpage title='ipadm' section='1M' + <manpage title='ipadm' section='8' manpath='/usr/share/man' /> </documentation> <pg_pattern name='install_ipv4_interface' type='application' @@ -116,14 +116,14 @@ <prop_pattern name='name' type='astring' required='true'> <description> <loctext xml:lang='C'> - The "addrobj" value to be passed to the ipadm(1M) "create-addr" command. + The "addrobj" value to be passed to the ipadm(8) "create-addr" command. </loctext> </description> <cardinality min='1' max='1'/> </prop_pattern> <prop_pattern name='address_type' type='astring' required='true'> <description> <loctext xml:lang='C'> - The "-T" option value to be passed to the ipadm(1M) "create-addr" command. + The "-T" option value to be passed to the ipadm(8) "create-addr" command. </loctext> </description> <cardinality min='1' max='1'/> <constraints> @@ -142,14 +142,14 @@ <prop_pattern name='static_address' type='net_address_v4' required='false'> <description> <loctext xml:lang='C'> - The "local" address value to be passed to the ipadm(1M) "create-addr" command. Only required if "address_type" has a value of "static". + The "local" address value to be passed to the ipadm(8) "create-addr" command. Only required if "address_type" has a value of "static". </loctext> </description> <cardinality min='1' max='1'/> </prop_pattern> <prop_pattern name='dhcp_wait' type='astring' required='false'> <description> <loctext xml:lang='C'> - The "-w" option value to be passed to the ipadm(1M) "create-addr" command. Represents the maximum time to wait for DHCP offer. + The "-w" option value to be passed to the ipadm(8) "create-addr" command. Represents the maximum time to wait for DHCP offer. </loctext> </description> <units> <loctext xml:lang='C'>seconds</loctext> @@ -159,7 +159,7 @@ <prop_pattern name='default_route' type='net_address_v4' required='false'> <description> <loctext xml:lang='C'> - The default route associated with this interface. Used to add a default route using route(1M). + The default route associated with this interface. Used to add a default route using route(8). </loctext> </description> <cardinality min='1' max='1'/> </prop_pattern> @@ -172,14 +172,14 @@ <prop_pattern name='name' type='astring' required='true'> <description> <loctext xml:lang='C'> - The "addrobj" value to be passed to the ipadm(1M) "create-addr" command. + The "addrobj" value to be passed to the ipadm(8) "create-addr" command. </loctext> </description> <cardinality min='1' max='1'/> </prop_pattern> <prop_pattern name='address_type' type='astring' required='true'> <description> <loctext xml:lang='C'> - The "-T" option value to be passed to the ipadm(1M) "create-addr" command. + The "-T" option value to be passed to the ipadm(8) "create-addr" command. </loctext> </description> <cardinality min='1' max='1'/> <constraints> @@ -198,14 +198,14 @@ <prop_pattern name='static_address' type='net_address_v6' required='false'> <description> <loctext xml:lang='C'> - The "local" address value to be passed to the ipadm(1M) "create-addr" command. Only required if "address_type" has a value of "static". + The "local" address value to be passed to the ipadm(8) "create-addr" command. Only required if "address_type" has a value of "static". </loctext> </description> <cardinality min='1' max='1'/> </prop_pattern> <prop_pattern name='interface_id' type='net_address_v6' required='false'> <description> <loctext xml:lang='C'> - The "-i" token value to be passed to the ipadm(1M) "create-addr" command. Ignored if "address_type" has a value of "static". + The "-i" token value to be passed to the ipadm(8) "create-addr" command. Ignored if "address_type" has a value of "static". </loctext> </description> <cardinality min='1' max='1'/> </prop_pattern> @@ -213,7 +213,7 @@ <prop_pattern name='stateless' type='astring' required='false'> <description> <loctext xml:lang='C'> - The "stateless" value to be passed to the ipadm(1M) "create-addr" command. Ignored if "address_type" has a value of "static". + The "stateless" value to be passed to the ipadm(8) "create-addr" command. Ignored if "address_type" has a value of "static". </loctext> </description> <cardinality min='1' max='1'/> <constraints> @@ -224,7 +224,7 @@ <prop_pattern name='stateful' type='astring' required='false'> <description> <loctext xml:lang='C'> - The "stateful" value to be passed to the ipadm(1M) "create-addr" command. Ignored if "address_type" has a value of "static". + The "stateful" value to be passed to the ipadm(8) "create-addr" command. Ignored if "address_type" has a value of "static". </loctext> </description> <cardinality min='1' max='1'/> <constraints> @@ -235,7 +235,7 @@ <prop_pattern name='default_route' type='net_address_v6' required='false'> <description> <loctext xml:lang='C'> - The default route associated with this interface. Used to add a default route using route(1M). + The default route associated with this interface. Used to add a default route using route(8). </loctext> </description> <cardinality min='1' max='1'/> </prop_pattern> diff --git a/usr/src/cmd/svc/milestone/network-ipqos.xml b/usr/src/cmd/svc/milestone/network-ipqos.xml index c1fcdb0fcd..d8d5e9159e 100644 --- a/usr/src/cmd/svc/milestone/network-ipqos.xml +++ b/usr/src/cmd/svc/milestone/network-ipqos.xml @@ -89,7 +89,7 @@ </loctext> </description> <documentation> - <manpage title='ipqosconf' section='1M' + <manpage title='ipqosconf' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/svc/milestone/network-iptun.xml b/usr/src/cmd/svc/milestone/network-iptun.xml index d55df08553..1bc04d1ae6 100644 --- a/usr/src/cmd/svc/milestone/network-iptun.xml +++ b/usr/src/cmd/svc/milestone/network-iptun.xml @@ -85,7 +85,7 @@ </loctext> </description> <documentation> - <manpage title='dladm' section='1M' + <manpage title='dladm' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/svc/milestone/network-location.xml b/usr/src/cmd/svc/milestone/network-location.xml index 5e23d92481..f669d38d4c 100644 --- a/usr/src/cmd/svc/milestone/network-location.xml +++ b/usr/src/cmd/svc/milestone/network-location.xml @@ -33,8 +33,8 @@ <!-- network/location is used as a medium to refresh and restart SMF - services dependent on network/location whenever nwamd(1M) changes - locations. nwamd(1M) updates the different configuration files + services dependent on network/location whenever nwamd(8) changes + locations. nwamd(8) updates the different configuration files according to the location being (de)activated and refreshes network/location. This causes the services dependent on network/location to restart and read in the updated configuration files. @@ -69,7 +69,7 @@ <instance name='default' enabled='false'> <!-- - nwamd(1M) refreshes network/location when a new location is + nwamd(8) refreshes network/location when a new location is activated, thus the "restart_on none" dependency. --> <dependency @@ -88,7 +88,7 @@ <service_fmri value='svc:/system/filesystem/usr' /> </dependency> - <!-- + <!-- This dependency on system/manifest-import is just for the case of the boot after upgrade. We don't want network/location starting up until network/netcfg has been @@ -149,7 +149,7 @@ </dependent> <!-- - The following three dependents will be refreshed by + The following three dependents will be refreshed by /lib/svc/method/net-loc, rather than restarted, when network/location is refreshed. --> @@ -224,7 +224,7 @@ </loctext> </common_name> <documentation> - <manpage title='nwamd' section='1M' + <manpage title='nwamd' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/svc/milestone/network-loopback.xml b/usr/src/cmd/svc/milestone/network-loopback.xml index bd51e960cd..7388c0651b 100644 --- a/usr/src/cmd/svc/milestone/network-loopback.xml +++ b/usr/src/cmd/svc/milestone/network-loopback.xml @@ -24,8 +24,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -68,7 +66,7 @@ </loctext> </common_name> <documentation> - <manpage title='ifconfig' section='1M' + <manpage title='ifconfig' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/svc/milestone/network-netcfg.xml b/usr/src/cmd/svc/milestone/network-netcfg.xml index edc15da18f..fe7748bad1 100644 --- a/usr/src/cmd/svc/milestone/network-netcfg.xml +++ b/usr/src/cmd/svc/milestone/network-netcfg.xml @@ -93,7 +93,7 @@ </loctext> </common_name> <documentation> - <manpage title='netcfgd' section='1M' + <manpage title='netcfgd' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/svc/milestone/network-netmask.xml b/usr/src/cmd/svc/milestone/network-netmask.xml index 31caeb3f1d..48499f9d8c 100644 --- a/usr/src/cmd/svc/milestone/network-netmask.xml +++ b/usr/src/cmd/svc/milestone/network-netmask.xml @@ -31,7 +31,7 @@ <service_bundle type='manifest' name='SUNWcsr:network-netmask'> -<!-- +<!-- network/netmask service resets the netmask and broadcast address whenever new information is available from NIS. --> @@ -107,7 +107,7 @@ </loctext> </description> <documentation> - <manpage title='ifconfig' section='1M' + <manpage title='ifconfig' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/svc/milestone/network-physical.xml b/usr/src/cmd/svc/milestone/network-physical.xml index f26c9647a1..d0eb7db1b9 100644 --- a/usr/src/cmd/svc/milestone/network-physical.xml +++ b/usr/src/cmd/svc/milestone/network-physical.xml @@ -103,7 +103,7 @@ </loctext> </common_name> <documentation> - <manpage title='ifconfig' section='1M' + <manpage title='ifconfig' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/svc/milestone/network-routing-setup.xml b/usr/src/cmd/svc/milestone/network-routing-setup.xml index 85a74756da..c84a88577e 100644 --- a/usr/src/cmd/svc/milestone/network-routing-setup.xml +++ b/usr/src/cmd/svc/milestone/network-routing-setup.xml @@ -23,8 +23,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents will be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -110,7 +108,7 @@ <instance name='default' enabled='true' > - <!-- Properties in this group are used by routeadm (1M) --> + <!-- Properties in this group are used by routeadm(8) --> <property_group name='routeadm' type='framework'> <stability value='Evolving' /> <!-- set if routeadm -e/d ipv4-routing is explicitly invoked --> @@ -147,7 +145,7 @@ </loctext> </common_name> <documentation> - <manpage title='routeadm' section='1M' + <manpage title='routeadm' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/svc/milestone/network-service.xml b/usr/src/cmd/svc/milestone/network-service.xml index ec12896e53..598d4d99f4 100644 --- a/usr/src/cmd/svc/milestone/network-service.xml +++ b/usr/src/cmd/svc/milestone/network-service.xml @@ -120,7 +120,7 @@ </loctext> </description> <documentation> - <manpage title='ifconfig' section='1M' + <manpage title='ifconfig' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/svc/milestone/process-security.xml b/usr/src/cmd/svc/milestone/process-security.xml index bd4b2ac6b7..bc081692e5 100644 --- a/usr/src/cmd/svc/milestone/process-security.xml +++ b/usr/src/cmd/svc/milestone/process-security.xml @@ -76,7 +76,7 @@ <loctext xml:lang='C'>Security Flag Configuration</loctext> </common_name> <documentation> - <manpage title='security-flags' section='5' + <manpage title='security-flags' section='7' manpath='/usr/share/man' /> <manpage title='psecflags' section='1' manpath='/usr/share/man' /> diff --git a/usr/src/cmd/svc/milestone/restarter.xml b/usr/src/cmd/svc/milestone/restarter.xml index c867736d51..f25d133192 100644 --- a/usr/src/cmd/svc/milestone/restarter.xml +++ b/usr/src/cmd/svc/milestone/restarter.xml @@ -72,11 +72,11 @@ master restarter </loctext> </common_name> <documentation> - <manpage title='svc.startd' section='1M' + <manpage title='svc.startd' section='8' manpath='/usr/share/man' /> - <manpage title='smf_method' section='5' + <manpage title='smf_method' section='7' manpath='/usr/share/man' /> - <manpage title='smf' section='5' + <manpage title='smf' section='7' manpath='/usr/share/man' /> </documentation> @@ -650,7 +650,7 @@ method context resource pool <description> <loctext xml:lang='C'> The resource pool name on which to launch the method. :default can be used -as a token to indicate the pool specified in the project(4) entry given in +as a token to indicate the pool specified in the project(5) entry given in the project attribute. </loctext> </description> @@ -666,7 +666,7 @@ method credential security flags </common_name> <description> <loctext xml:lang='C'> -An optional string specifying the security flags as defined in security-flags(5). +An optional string specifying the security flags as defined in security-flags(7). </loctext> </description> <cardinality min='1' max='1'/> @@ -727,7 +727,7 @@ method credential privileges </common_name> <description> <loctext xml:lang='C'> -An optional string specifying the privilege set as defined in privileges(5). +An optional string specifying the privilege set as defined in privileges(7). </loctext> </description> <cardinality min='1' max='1'/> @@ -743,7 +743,7 @@ method credential limit privilege set <description> <loctext xml:lang='C'> An optional string specifying the limit privilege set as defined in -privileges(5). +privileges(7). </loctext> </description> <cardinality min='1' max='1'/> @@ -771,7 +771,7 @@ method profile RBAC profile specification <description> <loctext xml:lang='C'> The name of an RBAC (role-based access control) profile which, along with the -method executable, identifies an entry in exec_attr(4). +method executable, identifies an entry in exec_attr(5). </loctext> </description> <cardinality min='1' max='1'/> @@ -913,7 +913,7 @@ method context resource pool <description> <loctext xml:lang='C'> The resource pool name on which to launch the method. :default can be used -as a token to indicate the pool specified in the project(4) entry given in +as a token to indicate the pool specified in the project(5) entry given in the project attribute. </loctext> </description> @@ -929,7 +929,7 @@ method credential security flags </common_name> <description> <loctext xml:lang='C'> -An optional string specifying the security flags as defined in security-flags(5). +An optional string specifying the security flags as defined in security-flags(7). </loctext> </description> <cardinality min='1' max='1'/> @@ -990,7 +990,7 @@ method credential privileges </common_name> <description> <loctext xml:lang='C'> -An optional string specifying the privilege set as defined in privileges(5). +An optional string specifying the privilege set as defined in privileges(7). </loctext> </description> <cardinality min='1' max='1'/> @@ -1006,7 +1006,7 @@ method credential limit privilege set <description> <loctext xml:lang='C'> An optional string specifying the limit privilege set as defined in -privileges(5). +privileges(7). </loctext> </description> <cardinality min='1' max='1'/> @@ -1034,7 +1034,7 @@ method profile RBAC profile specification <description> <loctext xml:lang='C'> The name of an RBAC (role-based access control) profile which, along with the -method executable, identifies an entry in exec_attr(4). +method executable, identifies an entry in exec_attr(5). </loctext> </description> <cardinality min='1' max='1'/> @@ -1176,7 +1176,7 @@ method context resource pool <description> <loctext xml:lang='C'> The resource pool name on which to launch the method. :default can be used -as a token to indicate the pool specified in the project(4) entry given in +as a token to indicate the pool specified in the project(5) entry given in the project attribute. </loctext> </description> @@ -1191,7 +1191,7 @@ method security flags </common_name> <description> <loctext xml:lang='C'> -An optional string specifying the security flags as defined in security-flags(5). +An optional string specifying the security flags as defined in security-flags(7). </loctext> </description> <cardinality min='1' max='1'/> @@ -1252,7 +1252,7 @@ method credential privileges </common_name> <description> <loctext xml:lang='C'> -An optional string specifying the privilege set as defined in privileges(5). +An optional string specifying the privilege set as defined in privileges(7). </loctext> </description> <cardinality min='1' max='1'/> @@ -1268,7 +1268,7 @@ method credential limit privilege set <description> <loctext xml:lang='C'> An optional string specifying the limit privilege set as defined in -privileges(5). +privileges(7). </loctext> </description> <cardinality min='1' max='1'/> @@ -1296,7 +1296,7 @@ method profile RBAC profile specification <description> <loctext xml:lang='C'> The name of an RBAC (role-based access control) profile which, along with the -method executable, identifies an entry in exec_attr(4). +method executable, identifies an entry in exec_attr(5). </loctext> </description> <cardinality min='1' max='1'/> diff --git a/usr/src/cmd/svc/milestone/rmtmpfiles b/usr/src/cmd/svc/milestone/rmtmpfiles index f08782a9a8..8c09c0387f 100644 --- a/usr/src/cmd/svc/milestone/rmtmpfiles +++ b/usr/src/cmd/svc/milestone/rmtmpfiles @@ -24,7 +24,7 @@ # Use is subject to license terms. # For modifying the behavior of rmtmpfiles, do not edit this script. -# Instead use svccfg(1m) to modify the SMF repository. To achieve +# Instead use svccfg(8) to modify the SMF repository. To achieve # traditional System V treatment of /var/tmp, invoke the following # commands.: # diff --git a/usr/src/cmd/svc/milestone/single-user.xml b/usr/src/cmd/svc/milestone/single-user.xml index 579ecb5ddd..88b846a2ce 100644 --- a/usr/src/cmd/svc/milestone/single-user.xml +++ b/usr/src/cmd/svc/milestone/single-user.xml @@ -128,7 +128,7 @@ </loctext> </common_name> <documentation> - <manpage title='init' section='1M' + <manpage title='init' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/svc/milestone/vtdaemon.xml b/usr/src/cmd/svc/milestone/vtdaemon.xml index 920792bc5b..6168413d51 100644 --- a/usr/src/cmd/svc/milestone/vtdaemon.xml +++ b/usr/src/cmd/svc/milestone/vtdaemon.xml @@ -101,7 +101,7 @@ vtdaemon for virtual console secure switch </loctext> </common_name> <documentation> - <manpage title='vtdaemon' section='1M' + <manpage title='vtdaemon' section='8' manpath='/usr/share/man' /> </documentation> </template> diff --git a/usr/src/cmd/svc/profile/README b/usr/src/cmd/svc/profile/README index 6e93615b5f..e0f11ab7e4 100644 --- a/usr/src/cmd/svc/profile/README +++ b/usr/src/cmd/svc/profile/README @@ -24,8 +24,6 @@ # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" - Notes Regarding Modification of generic_open.xml Any changes made to generic_open.xml will need to be considered for @@ -35,7 +33,7 @@ in PSARC/2004/781: ... The generic_limited_net profile explicitly disables all - smf(5) converted inetd services that are not required to + smf(7) converted inetd services that are not required to run the window system, SVM, or vold. It retains ssh and X remote login as the remote login methods available. ... diff --git a/usr/src/cmd/svc/profile/generic_limited_net.xml b/usr/src/cmd/svc/profile/generic_limited_net.xml index 44814441e6..a79d59c1f7 100644 --- a/usr/src/cmd/svc/profile/generic_limited_net.xml +++ b/usr/src/cmd/svc/profile/generic_limited_net.xml @@ -44,7 +44,7 @@ <xi:include href='file:/etc/svc/profile/name_service.xml' /> <!-- - svc.startd(1M) services + svc.startd(8) services --> <service name='system/coreadm' version='1' type='service'> <instance name='default' enabled='true'/> @@ -201,7 +201,7 @@ </service> <!-- - default inetd(1M) services + default inetd(8) services --> <service name='network/finger' version='1' type='service'> <instance name='default' enabled='false'/> @@ -220,7 +220,7 @@ </service> <!-- - non-default inetd(1M) services + non-default inetd(8) services --> <service name='network/uucp' version='1' type='service'> <instance name='default' enabled='false'/> @@ -262,7 +262,7 @@ </service> <!-- - default inetd(1M) RPC services enabled + default inetd(8) RPC services enabled --> <service name='network/rpc/gss' version='1' type='service'> <instance name='default' enabled='true'/> @@ -278,7 +278,7 @@ </service> <!-- - default inetd(1M) RPC services disabled + default inetd(8) RPC services disabled --> <service name='network/rpc/rstat' version='1' type='service'> <instance name='default' enabled='false'/> @@ -288,7 +288,7 @@ </service> <!-- - non-default inetd(1M) RPC services disabled + non-default inetd(8) RPC services disabled --> <service name='network/rpc/rex' version='1' type='service'> <instance name='default' enabled='false'/> diff --git a/usr/src/cmd/svc/profile/generic_open.xml b/usr/src/cmd/svc/profile/generic_open.xml index ce23b8efdd..47b00fb4de 100644 --- a/usr/src/cmd/svc/profile/generic_open.xml +++ b/usr/src/cmd/svc/profile/generic_open.xml @@ -41,7 +41,7 @@ <xi:include href='file:/etc/svc/profile/name_service.xml' /> <!-- - svc.startd(1M) services + svc.startd(8) services --> <service name='system/coreadm' version='1' type='service'> <instance name='default' enabled='true'/> @@ -186,7 +186,7 @@ </service> <!-- - Include inetd(1M) services profile. + Include inetd(8) services profile. --> <xi:include href='file:/etc/svc/profile/inetd_services.xml' /> </service_bundle> diff --git a/usr/src/cmd/svc/profile/inetd_generic.xml b/usr/src/cmd/svc/profile/inetd_generic.xml index 8d2df20219..e95a0608ba 100644 --- a/usr/src/cmd/svc/profile/inetd_generic.xml +++ b/usr/src/cmd/svc/profile/inetd_generic.xml @@ -32,7 +32,7 @@ --> <service_bundle type='profile' name='default'> <!-- - inetd(1M) services + inetd(8) services --> <service name='network/finger' version='1' type='service'> <instance name='default' enabled='true'/> @@ -48,7 +48,7 @@ </service> <!-- - inetd(1M) RPC services + inetd(8) RPC services --> <service name='network/nfs/rquota' version='1' type='service'> <instance name='default' enabled='true'/> diff --git a/usr/src/cmd/svc/shell/fs_include.sh b/usr/src/cmd/svc/shell/fs_include.sh index 99810383cc..f0ee2748a7 100644 --- a/usr/src/cmd/svc/shell/fs_include.sh +++ b/usr/src/cmd/svc/shell/fs_include.sh @@ -27,7 +27,6 @@ # All rights reserved. # # -#ident "%Z%%M% %I% %E% SMI" vfstab=${vfstab:=/etc/vfstab} @@ -43,7 +42,7 @@ vfstab=${vfstab:=/etc/vfstab} # fsckdev raw device # mountp mount point (must match $1, if found) # fstype file system type -# fsckpass fsck(1M) pass number +# fsckpass fsck(8) pass number # automnt automount flag (yes or no) # mntopts file system-specific mount options. # @@ -307,7 +306,7 @@ mounted() { # to our service log. # # Arguments: -# $opts - options for mount(1M) [optional] +# $opts - options for mount(8) [optional] # $path - mount point # $type - file system type [optional] # $fsopts - file system specific options (-o) [optional] @@ -315,7 +314,7 @@ mounted() { # # Return codes: # 0 - success. -# otherwise - error code returned by mount(1M). +# otherwise - error code returned by mount(8). # mountfs() { opts="$1" diff --git a/usr/src/cmd/svc/shell/smf_include.sh b/usr/src/cmd/svc/shell/smf_include.sh index 9f8a5f6cd9..7aef5c73a9 100644 --- a/usr/src/cmd/svc/shell/smf_include.sh +++ b/usr/src/cmd/svc/shell/smf_include.sh @@ -243,7 +243,7 @@ smf_kill_contract() { } # -# smf(5) method and monitor exit status definitions +# smf(7) method and monitor exit status definitions # SMF_EXIT_ERR_OTHER, although not defined, encompasses all non-zero # exit status values. # diff --git a/usr/src/cmd/svc/startd/fork.c b/usr/src/cmd/svc/startd/fork.c index 7bce347854..df91d174ca 100644 --- a/usr/src/cmd/svc/startd/fork.c +++ b/usr/src/cmd/svc/startd/fork.c @@ -94,7 +94,7 @@ startd_fork1(int *forkerr) /* * void fork_mount(char *, char *) - * Run mount(1M) with the given options and mount point. (mount(1M) has much + * Run mount(8) with the given options and mount point. (mount(8) has much * hidden knowledge; it's much less correct to reimplement that logic here to * save a fork(2)/exec(2) invocation.) */ @@ -116,7 +116,7 @@ fork_mount(char *path, char *opts) (void) waitpid(pid, &status, 0); /* - * If our mount(1M) invocation exited by peculiar means, or with + * If our mount(8) invocation exited by peculiar means, or with * a non-zero status, our mount likelihood is low. */ if (!WIFEXITED(status) || @@ -183,8 +183,8 @@ fork_common(const char *name, const char *svc_fmri, int retries, ctid_t *ctidp, for (pid = fork1(); pid == -1; pid = fork1()) { if (++tries > retries) { /* - * When we exit the sulogin session, init(1M) - * will restart svc.startd(1M). + * When we exit the sulogin session, init(8) + * will restart svc.startd(8). */ err = errno; (void) ct_tmpl_clear(ctfd); @@ -217,7 +217,7 @@ fork_common(const char *name, const char *svc_fmri, int retries, ctid_t *ctidp, * is ended, we continue. This is the last fallback action for system * maintenance. * - * If immediate is true, fork_sulogin() executes sulogin(1M) directly, without + * If immediate is true, fork_sulogin() executes sulogin(8) directly, without * forking. * * Because fork_sulogin() is needed potentially before we daemonize, we leave diff --git a/usr/src/cmd/svc/startd/graph.c b/usr/src/cmd/svc/startd/graph.c index d514b19c38..685c1c262c 100644 --- a/usr/src/cmd/svc/startd/graph.c +++ b/usr/src/cmd/svc/startd/graph.c @@ -127,8 +127,8 @@ * stn_global for the system-wide set. They are re-read when instances are * refreshed. * - * The GPEC events published by svc.startd are consumed by fmd(1M). After - * processing these events, fmd(1M) publishes the processed events to + * The GPEC events published by svc.startd are consumed by fmd(8). After + * processing these events, fmd(8) publishes the processed events to * notification agents. The notification agents read the notification * parameters from the SMF repository through libscf(3LIB) interfaces and send * the notification, or not, based on those parameters. diff --git a/usr/src/cmd/svc/startd/log.c b/usr/src/cmd/svc/startd/log.c index 7ea39a9a1c..bce86b75fd 100644 --- a/usr/src/cmd/svc/startd/log.c +++ b/usr/src/cmd/svc/startd/log.c @@ -28,13 +28,13 @@ * log.c - debugging and logging functions * * Logging destinations - * svc.startd(1M) supports three logging destinations: the system log, a + * svc.startd(8) supports three logging destinations: the system log, a * daemon-specific log (in the /var/svc/log hierarchy by default), and to the * standard output (redirected to the /var/svc/log/svc.startd.log file by * default). Any or all of these destinations may be used to * communicate a specific message; the audiences for each destination differ. * - * Generic messages associated with svc.startd(1M) are made by the + * Generic messages associated with svc.startd(8) are made by the * log_framework() and log_error() functions. For these messages, svc.startd * logs under its own name and under the LOG_DAEMON facility when issuing * events to the system log. By design, severities below LOG_NOTICE are never @@ -64,30 +64,30 @@ * * LOG_ALERT An unrecoverable operation requiring external * intervention has occurred. Includes an inability to - * write to the smf(5) repository (due to svc.configd(1M) + * write to the smf(7) repository (due to svc.configd(8) * absence, due to permissions failures, etc.). Message * should identify component at fault. * - * LOG_CRIT An unrecoverable operation internal to svc.startd(1M) + * LOG_CRIT An unrecoverable operation internal to svc.startd(8) * has occurred. Failure should be recoverable by restart - * of svc.startd(1M). + * of svc.startd(8). * - * LOG_ERR An smf(5) event requiring administrative intervention + * LOG_ERR An smf(7) event requiring administrative intervention * has occurred. Includes instance being moved to the * maintenance state. * - * LOG_WARNING A potentially destabilizing smf(5) event not requiring + * LOG_WARNING A potentially destabilizing smf(7) event not requiring * administrative intervention has occurred. * - * LOG_NOTICE A noteworthy smf(5) event has occurred. Includes + * LOG_NOTICE A noteworthy smf(7) event has occurred. Includes * individual instance failures. * - * LOG_INFO A noteworthy operation internal to svc.startd(1M) has + * LOG_INFO A noteworthy operation internal to svc.startd(8) has * occurred. Includes recoverable failures or otherwise * unexpected outcomes. * * LOG_DEBUG An internal operation only of interest to a - * svc.startd(1M) developer has occurred. + * svc.startd(8) developer has occurred. * * Logging configuration * The preferred approach is to set the logging property values diff --git a/usr/src/cmd/svc/startd/protocol.c b/usr/src/cmd/svc/startd/protocol.c index e4fc9f73c5..a21e7e709a 100644 --- a/usr/src/cmd/svc/startd/protocol.c +++ b/usr/src/cmd/svc/startd/protocol.c @@ -476,7 +476,7 @@ restarter_protocol_send_event(const char *inst, evchan_t *chan, /* * For the purposes of loading state after interruption, this is - * sufficient, as svc.startd(1M) won't receive events on the contracts + * sufficient, as svc.startd(8) won't receive events on the contracts * associated with each delegate. */ MUTEX_LOCK(&st->st_load_lock); diff --git a/usr/src/cmd/svc/startd/restarter.c b/usr/src/cmd/svc/startd/restarter.c index 70f84a06d6..6003c81c87 100644 --- a/usr/src/cmd/svc/startd/restarter.c +++ b/usr/src/cmd/svc/startd/restarter.c @@ -2272,7 +2272,7 @@ restarter_contracts_event_thread(void *unused) startd_close(sfd); /* - * svc.configd(1M) restart handling performed by the + * svc.configd(8) restart handling performed by the * fork_configd_thread. We don't acknowledge, as that thread * will do so. */ diff --git a/usr/src/cmd/svc/startd/specials.c b/usr/src/cmd/svc/startd/specials.c index 3c8858b527..5f7c328a83 100644 --- a/usr/src/cmd/svc/startd/specials.c +++ b/usr/src/cmd/svc/startd/specials.c @@ -23,12 +23,10 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * specials.c - knowledge of special services * - * svc.startd(1M) has duties that cannot be carried out without knowledge of the + * svc.startd(8) has duties that cannot be carried out without knowledge of the * transition of various services, such as the milestones, to their online * states. Hooks are called with the restarter instance's ri_lock held, so * operations on all instances (or on the graph) should be performed diff --git a/usr/src/cmd/svc/startd/startd.c b/usr/src/cmd/svc/startd/startd.c index d28687e761..ea9c4efbe4 100644 --- a/usr/src/cmd/svc/startd/startd.c +++ b/usr/src/cmd/svc/startd/startd.c @@ -47,16 +47,16 @@ * There are a few different components that make up SMF and are responsible * for different pieces of functionality that are used: * - * svc.startd(1M): A daemon that is in charge of starting, stopping, and + * svc.startd(8): A daemon that is in charge of starting, stopping, and * restarting services and instances. - * svc.configd(1M): A daemon that manages the repository that stores + * svc.configd(8): A daemon that manages the repository that stores * information, property groups, and state of the different services and * instances. * libscf(3LIB): A C library that provides the glue for communicating, * accessing, and updating information about services and instances. - * svccfg(1M): A utility to add and remove services as well as change the + * svccfg(8): A utility to add and remove services as well as change the * properties associated with different services and instances. - * svcadm(1M): A utility to control the different instance of a service. You + * svcadm(8): A utility to control the different instance of a service. You * can use this to enable and disable them among some other useful things. * svcs(1): A utility that reports on the status of various services on the * system. diff --git a/usr/src/cmd/svc/startd/utmpx.c b/usr/src/cmd/svc/startd/utmpx.c index 1b3ca95010..1fd55b6592 100644 --- a/usr/src/cmd/svc/startd/utmpx.c +++ b/usr/src/cmd/svc/startd/utmpx.c @@ -31,7 +31,7 @@ /* * utmpx.c - utmpx utility routines * - * Since svc.startd(1M) places utmpx records for its launched instances, it must + * Since svc.startd(8) places utmpx records for its launched instances, it must * also mark them as dead once completed. */ diff --git a/usr/src/cmd/svc/startd/wait.c b/usr/src/cmd/svc/startd/wait.c index 12856ff639..970bd63f6d 100644 --- a/usr/src/cmd/svc/startd/wait.c +++ b/usr/src/cmd/svc/startd/wait.c @@ -294,7 +294,7 @@ wait_thread(void *args) psi.pr_lwp.pr_lwpid != 0) { /* * We have determined, in accordance with the - * definition in proc(4), this process is not a + * definition in proc(5), this process is not a * zombie. Reassociate. */ if (port_associate(port_fd, PORT_SOURCE_FD, fd, diff --git a/usr/src/cmd/svc/svcadm/svcadm.c b/usr/src/cmd/svc/svcadm/svcadm.c index c5a046565f..0330305c98 100644 --- a/usr/src/cmd/svc/svcadm/svcadm.c +++ b/usr/src/cmd/svc/svcadm/svcadm.c @@ -167,7 +167,7 @@ usage() "\t%1$s clear [<service> ...]\t\t- clear maintenance state\n" "\t%1$s milestone [-d] <milestone>\t- advance to a service milestone\n" "\n\t" - "Services can be specified using an FMRI, abbreviation, or fnmatch(5)\n" + "Services can be specified using an FMRI, abbreviation, or fnmatch(7)\n" "\tpattern, as shown in these examples for svc:/network/smtp:sendmail\n" "\n" "\t%1$s <cmd> svc:/network/smtp:sendmail\n" diff --git a/usr/src/cmd/svc/svccfg/svccfg_engine.c b/usr/src/cmd/svc/svccfg/svccfg_engine.c index d0d690f231..cafaeac254 100644 --- a/usr/src/cmd/svc/svccfg/svccfg_engine.c +++ b/usr/src/cmd/svc/svccfg/svccfg_engine.c @@ -467,13 +467,13 @@ fail: /* * Initialize svccfg state. We recognize four environment variables: * - * SVCCFG_REPOSITORY Create a private instance of svc.configd(1M) to answer + * SVCCFG_REPOSITORY Create a private instance of svc.configd(8) to answer * requests for the specified repository file. * SVCCFG_DOOR_PATH Directory for door creation. * * SVCCFG_DOOR Rendezvous via an alternative repository door. * - * SVCCFG_CONFIGD_PATH Resolvable path to alternative svc.configd(1M) binary. + * SVCCFG_CONFIGD_PATH Resolvable path to alternative svc.configd(8) binary. */ void engine_init() @@ -761,7 +761,7 @@ engine_import(uu_list_t *args) if (progress_out != NULL) (void) fprintf(progress_out, - "Loading smf(5) service descriptions: "); + "Loading smf(7) service descriptions: "); failed_manifests = 0; progress_count = 0; @@ -793,11 +793,11 @@ engine_import(uu_list_t *args) if (dirarg && total_manifests > 0) { char *msg; - msg = "Loaded %d smf(5) service descriptions\n"; + msg = "Loaded %d smf(7) service descriptions\n"; warn(gettext(msg), progress_count); if (failed_manifests) { - msg = "%d smf(5) service descriptions failed to load\n"; + msg = "%d smf(7) service descriptions failed to load\n"; warn(gettext(msg), failed_manifests); } } diff --git a/usr/src/cmd/svc/svccfg/svccfg_libscf.c b/usr/src/cmd/svc/svccfg/svccfg_libscf.c index 1e565d795f..a1a3a44ad2 100644 --- a/usr/src/cmd/svc/svccfg/svccfg_libscf.c +++ b/usr/src/cmd/svc/svccfg/svccfg_libscf.c @@ -756,7 +756,7 @@ remove_tempfile(void) } /* - * Launch private svc.configd(1M) for manipulating alternate repositories. + * Launch private svc.configd(8) for manipulating alternate repositories. */ static void start_private_repository(engine_state_t *est) @@ -832,7 +832,7 @@ void lscf_cleanup(void) { /* - * In the case where we've launched a private svc.configd(1M) + * In the case where we've launched a private svc.configd(8) * instance, we must terminate our child and remove the temporary * rendezvous point. */ diff --git a/usr/src/cmd/svc/svccfg/svccfg_tmpl.c b/usr/src/cmd/svc/svccfg/svccfg_tmpl.c index 2f17e6b85d..e7b71950f5 100644 --- a/usr/src/cmd/svc/svccfg/svccfg_tmpl.c +++ b/usr/src/cmd/svc/svccfg/svccfg_tmpl.c @@ -25,7 +25,7 @@ */ /* - * This file provides the code that allows svccfg(1M) to validate a + * This file provides the code that allows svccfg(8) to validate a * manifest against the template specifications. svccfg uses the * validation facilities for the import and validate subcommands. * diff --git a/usr/src/cmd/svc/svccfg/svccfg_xml.c b/usr/src/cmd/svc/svccfg/svccfg_xml.c index c0810de2ab..70e62a83bd 100644 --- a/usr/src/cmd/svc/svccfg/svccfg_xml.c +++ b/usr/src/cmd/svc/svccfg/svccfg_xml.c @@ -552,7 +552,7 @@ lxml_store_value(value_t *v, element_t type, const xmlChar *value) /* * Although an SC_COUNT represents a uint64_t the use * of a negative value is acceptable due to the usage - * established by inetd(1M). + * established by inetd(8). */ errno = 0; v->sc_u.sc_count = strtoull((char *)value, &endptr, 10); @@ -1085,7 +1085,7 @@ lxml_get_exec_method(entity_t *entity, xmlNodePtr emeth) /* * Although an SC_COUNT represents a uint64_t the use * of a negative value is acceptable due to the usage - * established by inetd(1M). + * established by inetd(8). */ errno = 0; u_timeout = strtoull((char *)timeout, &endptr, 10); diff --git a/usr/src/cmd/svc/svcs/svcs.c b/usr/src/cmd/svc/svcs/svcs.c index 402b40f4ca..9beb62047c 100644 --- a/usr/src/cmd/svc/svcs/svcs.c +++ b/usr/src/cmd/svc/svcs/svcs.c @@ -89,7 +89,7 @@ #define LEGACY_UNKNOWN "unknown" /* - * Per proc(4) when pr_nlwp, pr_nzomb, and pr_lwp.pr_lwpid are all 0, + * Per proc(5) when pr_nlwp, pr_nzomb, and pr_lwp.pr_lwpid are all 0, * the process is a zombie. */ #define IS_ZOMBIE(_psip) \ @@ -1824,7 +1824,7 @@ description_of_column(int c) switch (c) { case 0: - s = gettext("contract ID for service (see contract(4))"); + s = gettext("contract ID for service (see contract(5))"); break; case 1: s = gettext("human-readable description of the service"); @@ -1921,7 +1921,7 @@ print_help(const char *progname) "\t-z from global zone, show services in a specified zone\n" "\t-Z from global zone, show services in all zones\n" "\n\t" - "Services can be specified using an FMRI, abbreviation, or fnmatch(5)\n" + "Services can be specified using an FMRI, abbreviation, or fnmatch(7)\n" "\tpattern, as shown in these examples for svc:/network/smtp:sendmail\n" "\n" "\t%1$s [opts] svc:/network/smtp:sendmail\n" |