Mount COS_PERSISTENT in cos-deploy (#511)

Signed-off-by: Ettore Di Giacinto <[email protected]>

Co-authored-by: Ettore Di Giacinto <[email protected]>

Author: mudlers

packages/cos/collection.yaml

@@ -1,23 +1,23 @@
 packages:
   - name: "cos"
     category: "system"
-    version: 0.6.3+5
+    version: "0.6.4"
     description: "cOS base image, used to build cOS live ISOs"
     brand_name: "cOS"
     labels:
       autobump.revdeps: "true"
       autobump.revbump_related: "recovery/cos-img recovery/cos-squash"
   - name: "cos"
     category: "recovery"
-    version: 0.6.3+5
+    version: "0.6.4"
     brand_name: "cOS recovery"
     description: "cOS recovery image, used to boot cOS for troubleshooting"
     labels:
       autobump.revdeps: "true"
       autobump.revbump_related: "recovery/cos-img recovery/cos-squash"
   - name: "cos-container"
     category: "system"
-    version: 0.6.3+5
+    version: "0.6.4"
     brand_name: "cOS"
     description: "cOS container image, used to build cOS derivatives from scratch"
     labels:

packages/cos/recovery-img/definition.yaml

@@ -1,4 +1,4 @@
 name: "cos-img"
 category: "recovery"
-version: 0.6.3+5
+version: "0.6.4"
 brand_name: "cOS"

packages/cos/recovery-img/squash/definition.yaml

@@ -1,3 +1,3 @@
 name: "cos-squash"
 category: "recovery"
-version: 0.6.3+5
+version: "0.6.4"

packages/installer/definition.yaml

@@ -1,3 +1,3 @@
 name: "installer"
 category: "utils"
-version: "0.12"
+version: "0.13"

packages/installer/deploy.sh

@@ -73,6 +73,10 @@ mount_state() {
     mount ${STATE} ${STATEDIR}
 }
 
+is_mounted() {
+    mountpoint -q "$1"
+}
+
 mount_image() {
     STATEDIR=/run/initramfs/cos-state
     TARGET=/tmp/upgrade
@@ -89,6 +93,8 @@ mount_image() {
         mount_state
     fi
 
+    is_mounted /usr/local || mount ${PERSISTENT} /usr/local
+
     prepare_target
 }