diff options
| author | Sebastien Roy <Sebastien.Roy@Sun.COM> | 2009-05-19 13:41:33 -0400 |
|---|---|---|
| committer | Sebastien Roy <Sebastien.Roy@Sun.COM> | 2009-05-19 13:41:33 -0400 |
| commit | efa39fc653b61b21d59f6ac13c2431c9e5cbc2fc (patch) | |
| tree | 71cabbf26e3999248f3c86d661ae069c1d0b612c | |
| parent | c076b414ebb6fd85c5818858ff8c826ef9457449 (diff) | |
| download | illumos-joyent-efa39fc653b61b21d59f6ac13c2431c9e5cbc2fc.tar.gz | |
6650942 svc:/network/routing/route:default fails to accept log_file property
| -rw-r--r-- | usr/src/cmd/svc/shell/routing_include.sh | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/usr/src/cmd/svc/shell/routing_include.sh b/usr/src/cmd/svc/shell/routing_include.sh index 1f9495de40..79206b38f8 100644 --- a/usr/src/cmd/svc/shell/routing_include.sh +++ b/usr/src/cmd/svc/shell/routing_include.sh @@ -213,7 +213,7 @@ get_routeadm_property() propval=`/sbin/routeadm -l $1 | /usr/bin/nawk -v PROP=$2 \ '($1 == PROP) { for (i = 3; i < NF; i++) printf $i" "; \ if (NF >= 3) {printf $NF}}'` - echo "$propval" + echo "$propval" } # @@ -240,28 +240,7 @@ get_daemon_option_from_property() { propval=`get_routeadm_property $1 $2` if [ "$propval" != "$4" ]; then - echo "-${3} \"$propval\"" - fi -} - -# -# get_daemon_ordered_multivalue_option_from_property_quoted inst_fmri prop -# option -# -# Returns appropriate daemon option and associated values. Values are -# quoted, i.e. -A "value1 has spaces" -A "value2 has spaces" -# -get_daemon_ordered_multivalue_option_from_property_quoted() -{ - # get property values, removing trailing delimiter. - propvals=`get_routeadm_property $1 $2 | \ - /usr/bin/nawk '{sub(/;[ \t]*$/, ""); print }'` - # Substitute switch for internal delimiters, quoting values. - fixed_propvals=`/usr/bin/echo $propvals | \ - /usr/bin/nawk -v SWITCH="\" -${3} \"" \ - '{sub(/;/, SWITCH); print }'` - if [ -n "$fixed_propvals" ]; then - echo "-${3} \"$fixed_propvals\"" + echo "-${3} $propval" fi } |