aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorShulhan <ms@kilabit.info>2024-12-13 00:43:10 +0700
committerShulhan <ms@kilabit.info>2025-01-12 02:13:39 +0700
commit6df469412b3e08624f41f82d8fb7294f4b1c2bfd (patch)
tree218af8b1daf0bebc0a8dcba46b8376c38e737fc3 /Makefile
parent7211f7597c35b51501e6fba72b864dd0817349be (diff)
downloadawwan-6df469412b3e08624f41f82d8fb7294f4b1c2bfd.tar.xz
all: update machine container setup with latest Arch
The latest mkosi use importctl instead of machinectl to import the image. There is an issue in mkosi.conf where build with Format=tar always get compressed using zstd, but importctl unable to import it, so we need to set CompressOutput=false. The home directory mode needs to be set to open 0755, because now its default to 0700, which makes the test failed to read file on others user's home. The pacman mirror changes to public one that is always available, geo.mirror.pkgbuild.com. The BUG_REPORT_URL in os-release for Arch changes which we need to modify because its included in the test-container.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index e34b225..f2f2ae7 100644
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,9 @@ build-awwan-test:
@echo ">>> Building container awwan-test ..."
sudo mkosi --directory=_ops/awwan-test/ --force build
- sudo machinectl --force import-tar /data/awwan/awwan-test.tar
+ sudo importctl -m import-tar --force /data/awwan/awwan-test.tar
+ sudo mkdir -p /etc/systemd/nspawn
+ sudo cp /data/awwan/awwan-tour.nspawn /etc/systemd/nspawn/
sudo machinectl start awwan-test
## Once the container is imported, we can enable and run them any
@@ -176,7 +178,9 @@ build-tour-local: build-tour
mkdir -p /data/awwan/
ln -sTf $$(pwd) /data/awwan/src
- sudo machinectl --force import-tar /data/awwan/awwan-tour.tar
+ sudo importctl -m import-tar --force /data/awwan/awwan-tour.tar
+ sudo mkdir -p /etc/systemd/nspawn
+ sudo cp /data/awwan/awwan-tour.nspawn /etc/systemd/nspawn/
sudo machinectl start awwan-tour
#}}}