Honor APP_ROOT when installing locally built vminit image.

- Closes #1185.
- Rework `install-init.sh` to accept a `-a` argument to set the app root.

Author: jglogan

Makefile

@@ -36,7 +36,7 @@ CODESIGN_OPTS ?= --force --sign - --timestamp=none
 ifeq ($(strip $(APP_ROOT)),)
 	SYSTEM_START_OPTS :=
 else
-	SYSTEM_START_OPTS := --app-root "$(strip $(APP_ROOT))"
+	SYSTEM_START_OPTS := -a "$(strip $(APP_ROOT))"
 endif
 
 MACOS_VERSION := $(shell sw_vers -productVersion)
@@ -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,43 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+usage() {
+    cat <<EOF
+Usage: $(basename "$0") [-a APP_ROOT] [-h]
+
+Install the init image for container system.
+
+Options:
+    -a APP_ROOT    Install the init image under the APP_ROOT path
+    -h             Show this help message
+
+EOF
+    exit 0
+}
+
+# Parse command line options
+APP_ROOT=""
+while getopts "a:h" opt; do
+    case $opt in
+        a)
+            APP_ROOT="$OPTARG"
+            ;;
+        h)
+            usage
+            ;;
+        \?)
+            echo "Invalid option: -$OPTARG" >&2
+            usage
+            ;;
+        :)
+            echo "Option -$OPTARG requires an argument." >&2
+            usage
+            ;;
+    esac
+done
+
 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 +61,15 @@ 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
+	if [ -n "$APP_ROOT" ]; then
+		bin/container system start --app-root "$APP_ROOT"
+	else
+		bin/container system start
+	fi
+	sleep 3
 	bin/container i load -i /tmp/init.tar
 	rm /tmp/init.tar
 fi