From 693fc7c68889917378f1fa0cb6bfc74eccb97b5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alfonso=20S=C3=A1nchez-Beato?= Date: Wed, 4 Sep 2024 14:58:53 -0400 Subject: [PATCH 1/2] static: mount some directories from initramfs We want to mount some folders from the initramfs as they are a requisite to mount the kernel snap from initramfs: - /snap is the root of the mountpoints for the kernel snap and kernel-modules components - /var/lib/snapd contains the drivers tree and the snap and component files - /var/snap might contain dynamically generated kernel modules, and we want the links from the drivers tree to be valid since the moment we switch root. --- static/etc/system-image/writable-paths | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/static/etc/system-image/writable-paths b/static/etc/system-image/writable-paths index 3a862a84..0d22931f 100644 --- a/static/etc/system-image/writable-paths +++ b/static/etc/system-image/writable-paths @@ -8,13 +8,13 @@ # See writable-paths(5) for full details. # -------------------------------------------------------------------- /home user-data persistent transition none -/snap auto persistent none none +/snap auto persistent none x-initrd.mount # snappy security policy, etc -/var/lib/snapd auto persistent transition none +/var/lib/snapd auto persistent transition x-initrd.mount # snap catalogue (sections, pkgnames) /var/cache/snapd auto persistent transition none # snap data -/var/snap auto persistent transition none +/var/snap auto persistent transition x-initrd.mount # generic /media none temporary none defaults /mnt none temporary none defaults From b758dc6ae619a0662c39938bd9fd4b00bf0995f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alfonso=20S=C3=A1nchez-Beato?= Date: Fri, 20 Sep 2024 13:21:47 -0400 Subject: [PATCH 2/2] .github,tests: update to non-deprected github actions --- .github/workflows/lxd-image.yaml | 2 +- .../external/snapd-testing-tools/.github/workflows/tests.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/lxd-image.yaml b/.github/workflows/lxd-image.yaml index 6cfe5846..c89d302a 100644 --- a/.github/workflows/lxd-image.yaml +++ b/.github/workflows/lxd-image.yaml @@ -10,7 +10,7 @@ jobs: run: | rm -rf "${{ github.workspace }}" mkdir "${{ github.workspace }}" - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install spread run: curl -s https://storage.googleapis.com/snapd-spread-tests/spread/spread-amd64.tar.gz | sudo tar xzv -C /usr/bin - name: Run tests diff --git a/tests/lib/external/snapd-testing-tools/.github/workflows/tests.yaml b/tests/lib/external/snapd-testing-tools/.github/workflows/tests.yaml index e28b2e09..29d644e4 100644 --- a/tests/lib/external/snapd-testing-tools/.github/workflows/tests.yaml +++ b/tests/lib/external/snapd-testing-tools/.github/workflows/tests.yaml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Run shellCheck for tools run: | @@ -23,7 +23,7 @@ jobs: runs-on: self-hosted steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Run test run: |