Honor APP_ROOT when installing locally built vminit image.

Author: jglogan

Makefile

@@ -77,7 +77,7 @@ release: all
 
 .PHONY: init-block
 init-block:
-	@scripts/install-init.sh
+	scripts/install-init.sh $(SYSTEM_START_OPTS)
 
 .PHONY: install
 install: installer-pkg

scripts/install-init.sh

@@ -13,10 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# Args for this script are used as the options for "container system start"
+
 SWIFT="/usr/bin/swift"
 IMAGE_NAME="vminit:latest"
-DEST_DIR="${1:-$(git rev-parse --show-toplevel)/bin}"
-mkdir -p "${DEST_DIR}"
 
 CONTAINERIZATION_VERSION="$(${SWIFT} package show-dependencies --format json | jq -r '.dependencies[] | select(.identity == "containerization") | .version')"
 if [ "${CONTAINERIZATION_VERSION}" == "unspecified" ] ; then
@@ -28,8 +28,9 @@ if [ "${CONTAINERIZATION_VERSION}" == "unspecified" ] ; then
 	echo "Creating InitImage"
 	make -C ${CONTAINERIZATION_PATH} init
 	${CONTAINERIZATION_PATH}/bin/cctl images save -o /tmp/init.tar ${IMAGE_NAME}
+
 	# Sleep because commands after stop and start are racy.
-	bin/container system stop && sleep 3 && bin/container system start && sleep 3
+	bin/container system stop && sleep 3 && bin/container system start "$@" && sleep 3
 	bin/container i load -i /tmp/init.tar
 	rm /tmp/init.tar
 fi