diff -r 61ea578f8715 usr/src/cmd/svc/shell/netservices.sh --- a/usr/src/cmd/svc/shell/netservices.sh Mon Aug 30 23:48:20 2010 -0700 +++ b/usr/src/cmd/svc/shell/netservices.sh Mon Sep 06 14:16:09 2010 +0400 @@ -26,7 +26,6 @@ DT_CHANGED=0 LOG_FMRI=svc:/system/system-log -CMSD_FMRI=svc:/network/rpc/cde-calendar-manager BIND_FMRI=svc:/network/rpc/bind XSERVER_FMRI=svc:/application/x11/x11-server SENDMAIL_FMRI=svc:/network/smtp:sendmail @@ -36,9 +35,6 @@ CUPSRFC1179_FMRI=svc:/application/cups/in-lpd IPPLISTENER_FMRI=svc:/application/print/ipp-listener TTDB_FMRI=svc:/network/rpc/cde-ttdbserver -DTLOGIN_FMRI=svc:/application/graphical-login/cde-login -WEBCONSOLE_FMRI=svc:/system/webconsole -SMCWBEM_FMRI=svc:/application/management/wbem usage() { @@ -87,19 +83,6 @@ svcadm refresh $LOG_FMRI } -set_cmsd() -{ - svcprop -q $CMSD_FMRI:default || return - if [ "$1" = "local" ]; then - proto="ticlts" - else - proto="udp" - fi - - inetadm -m $CMSD_FMRI:default proto=$proto - svcadm refresh $CMSD_FMRI:default -} - set_rpcbind() { svcprop -q $BIND_FMRI || return @@ -150,62 +133,6 @@ svcadm refresh $TTDB_FMRI:tcp } -set_dtlogin() -{ - svcprop -q $DTLOGIN_FMRI || return - - eval args=`svcprop -p dtlogin/args $DTLOGIN_FMRI` - - if echo $args | egrep -s udpPort - then - old_port=`echo $args | - sed 's/.*-udpPort [ ]*\([0-9][0-9]*\).*/\1/'` - new_args=`echo $args | - sed 's/\(.*\)-udpPort [0-9][0-9]*\(.*\)/\1\2/'` - else - old_port=-1 - new_args=$args - fi - - if [ "$1" = "local" ]; then - args="$new_args -udpPort 0" - DT_CHANGED=1 - else - # remove '-udpPort 0' argument. Leave intact if port != 0. - if [ $old_port -eq 0 ]; then - args="$new_args" - DT_CHANGED=1 - fi - fi - - svccfg -s $DTLOGIN_FMRI setprop dtlogin/args = "\"$args\"" - svcadm refresh $DTLOGIN_FMRI -} - -set_webconsole() { - svcprop -q $WEBCONSOLE_FMRI:console || return - if [ "$1" = "local" ]; then - val=false - else - val=true - fi - - set_property $WEBCONSOLE_FMRI options tcp_listen $val - svcadm refresh $WEBCONSOLE_FMRI -} - -set_smcwbem() { - svcprop -q $SMCWBEM_FMRI:default || return - if [ "$1" = "local" ]; then - val=false - else - val=true - fi - - set_property $SMCWBEM_FMRI options tcp_listen $val - svcadm refresh $SMCWBEM_FMRI -} - set_printing() { use_cups=`svcprop -C -p general/active $CUPSSERVER_FMRI:default \ 2>/dev/null` @@ -270,14 +197,10 @@ # set services # set_system_log $keyword -set_cmsd $keyword set_rpcbind $keyword set_xserver $keyword set_sendmail $keyword set_ttdbserver $keyword -set_dtlogin $keyword -set_webconsole $keyword -set_smcwbem $keyword set_printing $keyword # @@ -314,31 +237,3 @@ echo "restarting sendmail" svcadm restart $SENDMAIL_FMRI fi - -if [ "`svcprop -p restarter/state $SMCWBEM_FMRI:default`" = "online" ] -then - # need restart since refresh won't pick up new command-line - echo "restarting wbem" - svcadm restart $SMCWBEM_FMRI:default -fi - -if [ $DT_CHANGED -eq 1 ]; then - if [ "`svcprop -p restarter/state $DTLOGIN_FMRI:default`" = "online" ] - then - r="y" - if tty -s ; then - printf \ - "dtlogin needs to be restarted. Restart now? [Y] " - read r - fi - if [ "$r" = "" -o "$r" = "y" -o "$r" = "Y" ]; then - # Make sure we survive killing dtlogin... - trap "" 15 - svcadm restart $DTLOGIN_FMRI - echo "restarting dtlogin" - else - printf "dtlogin not restarted. " - printf "Restart it to put it in ${keyword}-mode.\n" - fi - fi -fi