Merge pull request #119 from jandryuk/config-install

part2: Allow installing into /config

Author: crogers1

part2/stages/Functions/install-main

@@ -496,7 +496,10 @@ mount_dom0()
 mount_config()
 {
     # mount /config in the proper place if we can, bind it if already mounted
-    if is_mounted /config ; then
+    if is_mounted "${DOM0_MOUNT}/config" ; then
+        echo "mount_config: skipping - \"${DOM0_MOUNT}/config\" already mounted" >&2
+        return 0
+    elif is_mounted /config ; then
         echo "mount_config: /config mounted, binding to ${DOM0_MOUNT}/config" >&2
         do_mount -o bind /config ${DOM0_MOUNT}/config
         return $?
@@ -872,16 +875,27 @@ install_file()
     local SRC="$1"
     local DST="$2"
     local PACKAGE_TYPE="$3"
+    local config_mounted="0"
+    local RET="0"
 
-    mkdir -p $(dirname "${DOM0_MOUNT}/${DST}") || return 1
+    if [ "$( expr substr "${DST}" 1 8 )" = "/config/" ] ; then
+        mount_config || return 1
+        config_mounted="1"
+    fi
+
+    mkdir -p $(dirname "${DOM0_MOUNT}/${DST}") || RET="1"
     rm -f "${DOM0_MOUNT}/${DST}.new" 2>/dev/null # ignore errors on this command.
     if [ "${PACKAGE_TYPE}" = "gz" ] ; then
-        do_cmd gunzip -c "${SRC}" > "${DOM0_MOUNT}/${DST}.new" || return 1
+        do_cmd gunzip -c "${SRC}" > "${DOM0_MOUNT}/${DST}.new" || RET="1"
     else
-        cp "${SRC}" "${DOM0_MOUNT}/${DST}.new" || return 1
+        cp "${SRC}" "${DOM0_MOUNT}/${DST}.new" || RET="1"
     fi
 
-    return 0
+    if [ "$config_mounted" = "1" ] ; then
+        do_umount "${DOM0_MOUNT}/config"
+    fi
+
+    return "${RET}"
 }
 
 commit_file()
@@ -891,11 +905,22 @@ commit_file()
     # the system may be left in a broken state.
 
     local DST="$1"
+    local RET=0
+    local config_mounted=0
+
+    if [ "$( expr substr "${DST}" 1 8 )" = "/config/" ] ; then
+        mount_config || return 1
+        config_mounted="1"
+    fi
 
     rm -f "${DOM0_MOUNT}/${DST}"
-    mv "${DOM0_MOUNT}/${DST}.new" "${DOM0_MOUNT}/${DST}" || return 1
+    mv "${DOM0_MOUNT}/${DST}.new" "${DOM0_MOUNT}/${DST}" || RET=1
 
-    return 0
+    if [ "$config_mounted" = "1" ] ; then
+        do_umount "${DOM0_MOUNT}/config"
+    fi
+
+    return "${RET}"
 }
 
 exec_install_file()