Merge branch 'run-inside-service' into 'master'

feat(arch-nspawn): use --keep-unit when running inside a service See merge request archlinux/devtools!197
fix(license): add .gitignore to REUSE defaults
2025-09-12 17:36:18 +02:00 · 2025-08-11 01:49:16 +00:00 · 2025-08-08 14:13:32 +02:00 · 2024-04-28 11:28:11 +08:00
2 changed files with 10 additions and 2 deletions
--- a/src/arch-nspawn.in
+++ b/src/arch-nspawn.in
@@ -61,13 +61,20 @@ nspawn_args=(
 	--directory="$working_dir"
 	--setenv="PATH=/usr/local/sbin:/usr/local/bin:/usr/bin"
 	--register=no
-	--slice="devtools-$(systemd-escape "${SUDO_USER:-$USER}")"
-	--machine="arch-nspawn-$$"
 	--as-pid2
 	--console=autopipe
 	--timezone=off
 )

+if [[ ${DEVTOOLS_KEEP_UNIT:-0} == 1 ]]; then
+	nspawn_args+=(--keep-unit)
+else
+	nspawn_args+=(
+		--slice="devtools-$(systemd-escape "${SUDO_USER:-$USER}")"
+		--machine="arch-nspawn-$$"
+	)
+fi
+
 if (( ${#cache_dirs[@]} == 0 )); then
 	mapfile -t cache_dirs < <(pacman-conf --config "${pac_conf:-$working_dir/etc/pacman.conf}" CacheDir)
 fi
--- a/src/lib/license/setup.sh
+++ b/src/lib/license/setup.sh
@@ -188,6 +188,7 @@ path = [
    "README.md",
    "keys/**",
    ".SRCINFO",
+    ".gitignore",
    ".nvchecker.toml",
    "*.install",
    "*.sysusers",
Author	SHA1	Message	Date
lilydjwg lilydjwg	b9bb0ac37e	Merge branch 'run-inside-service' into 'master' feat(arch-nspawn): use --keep-unit when running inside a service See merge request archlinux/devtools!197	2025-08-11 01:49:16 +00:00
Aaron Liu	3f0ebbc6d2	fix(license): add .gitignore to REUSE defaults 36 packages use this while 26 use .pam and 21 use .logrotate. Seems anecdotally common enough to add this here.	2025-08-08 14:13:32 +02:00
lilydjwg	2c792e44aa	feat(arch-nspawn): use --keep-unit when $DEVTOOLS_KEEP_UNIT is set to 1	2024-04-28 11:28:11 +08:00