Merge branch 'nspawn_args_feature' into 'master'

feat(archroot): add support for systemd-nspawn args

See merge request archlinux/devtools!201

contrib/completion/bash/devtools.in

@@ -150,6 +150,7 @@ _pkgctl_cmds=(
 	db
 	diff
 	issue
+	license
 	release
 	repo
 	search

doc/man/makechrootpkg.1.asciidoc

@@ -79,6 +79,9 @@ Options
 *-x* <when>::
 	Inspect chroot after build, possible modes are 'never' (default), 'always' or 'failure'
 
+*-s* <args>::
+	Additional systemd-nspawn args (comma-separated) for the arch-nspawn build phase
+
 See Also
 --------
 

src/commitpkg.in

@@ -155,7 +155,7 @@ if (( ${#needsversioning[*]} )); then
 		if [[ ! -f "${file}" ]]; then
 			continue
 		fi
-		if ! git ls-files --error-unmatch "$file"; then
+		if ! git ls-files --error-unmatch "$file" >/dev/null; then
 			die "%s is not under version control" "$file"
 		fi
 	done

src/lib/license/setup.sh

@@ -191,7 +191,9 @@ path = [
     ".nvchecker.toml",
     "*.install",
     "*.sysusers",
+    "*sysusers.conf",
     "*.tmpfiles",
+    "*tmpfiles.conf",
     "*.logrotate",
     "*.pam",
     "*.service",

src/makechrootpkg.in

@@ -39,6 +39,7 @@ inspect=never
 bindmounts_ro=()
 bindmounts_rw=()
 bindmounts_tmpfs=()
+nspawn_add_args=()
 
 copy=$USER
 [[ -n ${SUDO_USER:-} ]] && copy=$SUDO_USER
@@ -84,6 +85,8 @@ usage() {
 	echo '-T                Build in a temporary directory'
 	echo '-U                Run makepkg as a specified user'
 	echo '-x <when>         Inspect chroot after build (never, always, failure)'
+	echo '-s <args>         Additional systemd-nspawn args (comma-separated) for'
+	echo '                  the arch-nspawn build phase'
 	exit 1
 }
 
@@ -293,7 +296,7 @@ move_products() {
 }
 # }}}
 
-while getopts 'hcur:I:l:nCTD:d:U:x:t:' arg; do
+while getopts 'hcur:I:l:nCTD:d:U:x:t:s:' arg; do
 	case "$arg" in
 		c) clean_first=1 ;;
 		D) bindmounts_ro+=("--bind-ro=$OPTARG") ;;
@@ -308,6 +311,7 @@ while getopts 'hcur:I:l:nCTD:d:U:x:t:' arg; do
 		T) temp_chroot=1; copy+="-$$" ;;
 		U) makepkg_user="$OPTARG" ;;
 		x) inspect="$OPTARG" ;;
+		s) IFS=, read -ra nspawn_add_args <<< "$OPTARG" ;;
 		h|*) usage ;;
 	esac
 done
@@ -394,6 +398,7 @@ nspawn_build_args=(
 	"${bindmounts_ro[@]}"
 	"${bindmounts_rw[@]}"
 	"${bindmounts_tmpfs[@]}"
+	"${nspawn_add_args[@]}"
 )
 
 if arch-nspawn "$copydir" \