Cos deploy fixups (#603)

* Disable privileged extract on cos-deploy A follow up of #509 Signed-off-by: Ettore Di Giacinto <edigiacinto@suse.com> * Bump cOS Signed-off-by: Ettore Di Giacinto <edigiacinto@suse.com>
rancher · Sep 6, 2021 · a195cd5 · a195cd5
1 parent edbb45e
commit a195cd5
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/packages/cos/collection.yaml b/packages/cos/collection.yaml
@@ -1,23 +1,23 @@
 packages:
   - name: "cos"
     category: "system"
-    version: 0.6.8+2
+    version: 0.6.8+3
     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.8+2
+    version: 0.6.8+3
     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.8+1
+    version: 0.6.8+3
     brand_name: "cOS"
     description: "cOS container image, used to build cOS derivatives from scratch"
     labels:

diff --git a/packages/cos/recovery-img/definition.yaml b/packages/cos/recovery-img/definition.yaml
@@ -1,4 +1,4 @@
 name: "cos-img"
 category: "recovery"
-version: 0.6.8+2
+version: 0.6.8+3
 brand_name: "cOS"
diff --git a/packages/cos/recovery-img/squash/definition.yaml b/packages/cos/recovery-img/squash/definition.yaml
@@ -1,3 +1,3 @@
 name: "cos-squash"
 category: "recovery"
-version: 0.6.8+2
+version: 0.6.8+3
diff --git a/packages/installer/definition.yaml b/packages/installer/definition.yaml
@@ -1,3 +1,3 @@
 name: "installer"
 category: "utils"
-version: 0.16.3+1
+version: "0.16.4"
diff --git a/packages/installer/deploy.sh b/packages/installer/deploy.sh
@@ -130,7 +130,6 @@ upgrade() {
     # FIXME: Define default /var/tmp as tmpdir_base in default luet config file
     export XDG_RUNTIME_DIR=$temp_upgrade
     export TMPDIR=$temp_upgrade
-    export LUET_PRIVILEGED_EXTRACT=true
 
     if [ -n "$CHANNEL_UPGRADES" ] && [ "$CHANNEL_UPGRADES" == true ]; then
         if [ -z "$VERIFY" ]; then
@@ -143,6 +142,10 @@ upgrade() {
         if [ -z "$VERIFY" ]; then
           args="--enable-logfile --logfile /tmp/luet.log --plugin luet-mtree"
         fi
+
+        # unpack doesnt like when you try to unpack to a non existing dir
+        mkdir -p $upgrade_state_dir/tmp/rootfs || true
+
         luet util unpack $args $UPGRADE_IMAGE $upgrade_state_dir/tmp/rootfs
         rsync -aqzAX --exclude='mnt' --exclude='proc' --exclude='sys' --exclude='dev' --exclude='tmp' $upgrade_state_dir/tmp/rootfs/ $TARGET
         rm -rf $upgrade_state_dir/tmp/rootfs