equal
deleted
inserted
replaced
118 install_media="-" |
118 install_media="-" |
119 |
119 |
120 trap trap_cleanup INT |
120 trap trap_cleanup INT |
121 trap trap_exit EXIT |
121 trap trap_exit EXIT |
122 |
122 |
123 <<<<<<< local |
|
124 PKG=pkg |
|
125 ======= |
|
126 #set -o xtrace |
123 #set -o xtrace |
127 |
124 |
128 PKG="/usr/bin/pkg" |
125 PKG="/usr/bin/pkg" |
129 >>>>>>> other |
|
130 KEYDIR=/var/pkg/ssl |
126 KEYDIR=/var/pkg/ssl |
131 |
127 |
132 # If we weren't passed at least two arguments, exit now. |
128 # If we weren't passed at least two arguments, exit now. |
133 (( $# < 2 )) && exit $ZONE_SUBPROC_USAGE |
129 (( $# < 2 )) && exit $ZONE_SUBPROC_USAGE |
134 |
130 |
162 # incorporations. |
158 # incorporations. |
163 |
159 |
164 typeset gz_incorporations="" |
160 typeset gz_incorporations="" |
165 |
161 |
166 # |
162 # |
167 <<<<<<< local |
|
168 verbose="" |
|
169 ======= |
|
170 # Gather the zone publisher details. $1 is the location of the image we |
163 # Gather the zone publisher details. $1 is the location of the image we |
171 # are processing and $2 is an associative array used to store publisher |
164 # are processing and $2 is an associative array used to store publisher |
172 # details. |
165 # details. |
173 # |
166 # |
174 gather_zone_publisher_details() { |
167 gather_zone_publisher_details() { |
339 fi |
332 fi |
340 |
333 |
341 echo "$args" |
334 echo "$args" |
342 } |
335 } |
343 |
336 |
344 >>>>>>> other |
|
345 # Other brand attach options are invalid for this brand. |
337 # Other brand attach options are invalid for this brand. |
346 while getopts "a:d:n:r:uv" opt; do |
338 while getopts "a:d:n:r:uv" opt; do |
347 case $opt in |
339 case $opt in |
348 a) |
340 a) |
349 if [[ -n "$inst_type" ]]; then |
341 if [[ -n "$inst_type" ]]; then |