diff options
| author | Milan Jurik <milan.jurik@xylab.cz> | 2012-04-01 04:26:40 -0500 |
|---|---|---|
| committer | Milan Jurik <milan.jurik@xylab.cz> | 2012-04-01 04:26:40 -0500 |
| commit | 12c67a5977f9e556df6c649fafe45fe905265710 (patch) | |
| tree | dd0a97217d787cfbaa9b1785055b8cc45077aee2 | |
| parent | e1c90a8342ca04681831cdd9879039fd8aaa31b3 (diff) | |
| download | illumos-joyent-12c67a5977f9e556df6c649fafe45fe905265710.tar.gz | |
2576 net-nwam should check if ibd_upgrade is installed
Reviewed by: Gary Mills <gary_mills@fastmail.fm>
Reviewed by: Andrew Stormont <Andrew.Stormont@nexenta.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
| -rw-r--r-- | usr/src/cmd/svc/milestone/net-nwam | 19 | ||||
| -rw-r--r-- | usr/src/cmd/svc/milestone/net-physical | 11 |
2 files changed, 18 insertions, 12 deletions
diff --git a/usr/src/cmd/svc/milestone/net-nwam b/usr/src/cmd/svc/milestone/net-nwam index efc7236e40..9f1de2fd76 100644 --- a/usr/src/cmd/svc/milestone/net-nwam +++ b/usr/src/cmd/svc/milestone/net-nwam @@ -21,6 +21,7 @@ # # # Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2012 Milan Jurik. All rights reserved. # . /lib/svc/share/smf_include.sh @@ -537,15 +538,17 @@ case "$1" in # # Upgrade handling for ibd: - # After we are done with the upgrade handling, we can not set the - # ibd/ibd_upgraded property to "true" as the file system is - # read-only at this point. It will be done later by ibd-post-upgrade - # service. + # After we are done with the upgrade handling, we can not set + # the ibd/ibd_upgraded property to "true" as the file system is + # read-only at this point. It will be done later by + # ibd-post-upgrade service. # - ibd_upgraded=`/bin/svcprop -c -p ibd/ibd_upgraded \ - svc:/network/physical:default 2> /dev/null` - if [ "$ibd_upgraded" != "true" ]; then - /sbin/ibd_upgrade -v + if [ -x /sbin/ibd_upgrade ]; then + ibd_upgraded=`/bin/svcprop -c -p ibd/ibd_upgraded \ + svc:/network/physical:default 2> /dev/null` + if [ "$ibd_upgraded" != "true" ]; then + /sbin/ibd_upgrade -v + fi fi # Bring up simnet instances diff --git a/usr/src/cmd/svc/milestone/net-physical b/usr/src/cmd/svc/milestone/net-physical index 3a873db121..89784dcbbc 100644 --- a/usr/src/cmd/svc/milestone/net-physical +++ b/usr/src/cmd/svc/milestone/net-physical @@ -21,6 +21,7 @@ # # # Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2012 Milan Jurik. All rights reserved. # # Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T. # All rights reserved. @@ -67,10 +68,12 @@ if smf_is_globalzone; then # read-only at this point. It will be done later by ibd-post-upgrade # service. # - ibd_upgraded=`/bin/svcprop -c -p ibd/ibd_upgraded \ - $SMF_FMRI 2> /dev/null` - if [ "$ibd_upgraded" != "true" ]; then - /sbin/ibd_upgrade -v + if [ -x /sbin/ibd_upgrade ]; then + ibd_upgraded=`/bin/svcprop -c -p ibd/ibd_upgraded \ + $SMF_FMRI 2> /dev/null` + if [ "$ibd_upgraded" != "true" ]; then + /sbin/ibd_upgrade -v + fi fi # |