From 150e9d9a50a38c6b530fd6bb57b6958e67520503 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Mon, 29 Jun 2026 13:46:35 +0200
Subject: [PATCH] fix: adapt to 7.2 configuration handling see
 https://discuss.linuxcontainers.org/t/incus-7-2-has-been-released/26879#p-91682-better-os-specific-handling-of-cli-configuration-7

also fixate the incus version to 7.2 for now.  We don't need to follow the latest upgrades because incus is not used for production but for CI testing mostly.
---
 .github/workflows/lxc-test.yml | 6 ++++--
 .github/workflows/test.yml     | 8 +++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/lxc-test.yml b/.github/workflows/lxc-test.yml
index 0b9c79d..aa65613 100644
--- a/.github/workflows/lxc-test.yml
+++ b/.github/workflows/lxc-test.yml
@@ -76,7 +76,8 @@ jobs:
           sudo curl -fsSL https://pkgs.zabbly.com/key.asc -o /etc/apt/keyrings/zabbly.asc
           echo "deb [signed-by=/etc/apt/keyrings/zabbly.asc] https://pkgs.zabbly.com/incus/stable $(lsb_release -sc) main" | sudo tee /etc/apt/sources.list.d/zabbly-incus.list
           sudo apt-get update
-          sudo apt-get install -y incus
+          sudo apt-get install -y incus=1:7.2* incus-client=1:7.2* incus-base=1:7.2*
+          incus --version
 
       - name: Initialise Incus
         run: |
@@ -86,6 +87,7 @@ jobs:
           sudo sysctl -w fs.inotify.max_user_watches=65535
           sudo incus admin init --auto
           sudo chmod 666 /var/lib/incus/unix.socket
+          sudo chown -R $USER:$USER ~/.config/incus
 
       - name: Set up Python
         uses: actions/setup-python@v6
@@ -102,7 +104,7 @@ jobs:
         uses: actions/cache@v5
         with:
           path: /tmp/incus-cache
-          key: incus-v4-${{ runner.os }}-${{ hashFiles('cmlxc/src/cmlxc/*.py') }}
+          key: incus-v5-${{ runner.os }}-${{ hashFiles('cmlxc/src/cmlxc/*.py') }}
 
       - name: Import cached images
         run: |
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a461ed1..e97150e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -28,7 +28,8 @@ jobs:
         sudo curl -fsSL https://pkgs.zabbly.com/key.asc -o /etc/apt/keyrings/zabbly.asc
         echo "deb [signed-by=/etc/apt/keyrings/zabbly.asc] https://pkgs.zabbly.com/incus/stable $(lsb_release -sc) main" | sudo tee /etc/apt/sources.list.d/zabbly-incus.list
         sudo apt-get update
-        sudo apt-get install -y incus
+        sudo apt-get install -y incus=1:7.2* incus-client=1:7.2* incus-base=1:7.2*
+        incus --version
 
     - name: Initialise Incus
       run: |
@@ -40,6 +41,7 @@ jobs:
         sudo incus admin init --auto
         # Allow runner to access Incus without 'sg' or 'sudo'
         sudo chmod 666 /var/lib/incus/unix.socket
+        sudo chown -R $USER:$USER ~/.config/incus
 
     - name: Set up Python
       uses: actions/setup-python@v6
@@ -58,9 +60,9 @@ jobs:
       with:
         path: |
           /tmp/incus-cache
-        key: incus-images-v7-${{ runner.os }}-${{ hashFiles('cmlxc/src/cmlxc/incus.py') }}
+        key: incus-images-v8-${{ runner.os }}-${{ hashFiles('cmlxc/src/cmlxc/incus.py') }}
         restore-keys: |
-          incus-images-v7-${{ runner.os }}-
+          incus-images-v8-${{ runner.os }}-
 
     - name: Import cached images
       run: |