diff options
| author | gd78059 <none@none> | 2007-05-15 11:07:06 -0700 |
|---|---|---|
| committer | gd78059 <none@none> | 2007-05-15 11:07:06 -0700 |
| commit | 2cca2978a83271b2d8c8b112df6e9fb487de47b1 (patch) | |
| tree | d3bdded14df3c3d3610905f61db0592204eb021b /usr/src | |
| parent | 4fa4b40c293f36427faa4e3a8b0a4a82f3cb96cc (diff) | |
| download | illumos-joyent-2cca2978a83271b2d8c8b112df6e9fb487de47b1.tar.gz | |
6556092 Fix for 4698338 causes system to hang for ever after upgrade to snv_64.
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/svc/profile/generic_limited_net.xml | 3 | ||||
| -rw-r--r-- | usr/src/cmd/svc/prophist/prophist.SUNWcsr | 4 | ||||
| -rw-r--r-- | usr/src/pkgdefs/SUNWcsr/postinstall | 3 |
3 files changed, 3 insertions, 7 deletions
diff --git a/usr/src/cmd/svc/profile/generic_limited_net.xml b/usr/src/cmd/svc/profile/generic_limited_net.xml index f8e6357a89..bb2b56d345 100644 --- a/usr/src/cmd/svc/profile/generic_limited_net.xml +++ b/usr/src/cmd/svc/profile/generic_limited_net.xml @@ -209,9 +209,6 @@ <!-- non-default inetd(1M) services --> - <service name='network/tname' version='1' type='service'> - <instance name='default' enabled='false'/> - </service> <service name='network/uucp' version='1' type='service'> <instance name='default' enabled='false'/> </service> diff --git a/usr/src/cmd/svc/prophist/prophist.SUNWcsr b/usr/src/cmd/svc/prophist/prophist.SUNWcsr index 77bf3a49a8..51113a3218 100644 --- a/usr/src/cmd/svc/prophist/prophist.SUNWcsr +++ b/usr/src/cmd/svc/prophist/prophist.SUNWcsr @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" @@ -625,7 +625,7 @@ instance_refresh svc:/milestone/multi-user-server:default # Add inetd_offline methods for some services for svc in chargen comsat daytime discard echo nfs/rquota rpc/gss rpc/rex \ rpc/ocfserv rpc/rstat rpc/rusers rpc/smserver rpc/spray rpc/wall \ - security/ktkt_warn talk time tname; do + security/ktkt_warn talk time; do prophist_addmeth svc:/network/$svc inetd_offline :kill_process 0 instance_refresh svc:/network/$svc:default done diff --git a/usr/src/pkgdefs/SUNWcsr/postinstall b/usr/src/pkgdefs/SUNWcsr/postinstall index f656b500d2..35a879e28c 100644 --- a/usr/src/pkgdefs/SUNWcsr/postinstall +++ b/usr/src/pkgdefs/SUNWcsr/postinstall @@ -108,8 +108,7 @@ _DEL_BIND8 cat >> $BASEDIR/var/svc/profile/upgrade <<\_DEL_TNAME svcs svc:/network/tname > /dev/null 2>&1 if [ "$?" = 0 ]; then - svcadm disable -s svc:/network/tname - svccfg delete svc:/network/tname + svccfg delete -f svc:/network/tname fi _DEL_TNAME |