diff options
| author | James Carlson <james.d.carlson@sun.com> | 2008-09-19 16:27:53 -0400 |
|---|---|---|
| committer | James Carlson <james.d.carlson@sun.com> | 2008-09-19 16:27:53 -0400 |
| commit | b00044a2eb43864b8718585d21949611a2ee59ef (patch) | |
| tree | a53823fd16a577e94a5ce5b708d46d557ff943df /usr/src/cmd/svc/shell | |
| parent | 0ea48bbf7e086befa73c3f191a062c3a82cc5397 (diff) | |
| download | illumos-joyent-b00044a2eb43864b8718585d21949611a2ee59ef.tar.gz | |
PSARC 2008/482 NWAM Phase 0.5 (picea)
6648862 nwam is annoying when no network is available
6642066 NWAM Phase 0 needs better observability
6604418 weak interfaces turn nwam into a bouncing dog that misses its master
6745880 starting or restarting nwam always costs a link reinit
Diffstat (limited to 'usr/src/cmd/svc/shell')
| -rw-r--r-- | usr/src/cmd/svc/shell/net_include.sh | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/usr/src/cmd/svc/shell/net_include.sh b/usr/src/cmd/svc/shell/net_include.sh index 989a780384..51c87a40a8 100644 --- a/usr/src/cmd/svc/shell/net_include.sh +++ b/usr/src/cmd/svc/shell/net_include.sh @@ -23,8 +23,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T. # All rights reserved. # @@ -595,8 +593,8 @@ net_reconfigure () # Is this a reconfigure boot? If not, then there's nothing # for us to do. # - svcprop -q -p system/reconfigure system/svc/restarter:default - if [ $? -ne 0 ]; then + reconfig=`svcprop -c -p system/reconfigure system/svc/restarter:default` + if [ $? -ne 0 -o "$reconfig" = false ]; then return 0 fi |