Commit e0f7c21a authored by Dave Reisner's avatar Dave Reisner Committed by Pierre Schmitz
Browse files

arch-nspawn: avoid escaping mount_args 



eval is no longer involved in the execution of systemd-nspawn, so we no
longer need a layer of escaping on the arguments.

Signed-off-by: default avatarDave Reisner <dreisner@archlinux.org>
Signed-off-by: default avatarPierre Schmitz <pierre@archlinux.de>
parent 8dbb02de

arch-nspawn.in

+3 −7
Original line number Diff line number Diff line
@@ -56,20 +56,16 @@ host_mirror=$(pacman -Sddp extra/devtools 2>/dev/null | sed -r 's#(.*/)extra/os/ 


# {{{ functions

build_mount_args() {

	local p

	declare -g mount_args=()



	if [[ -n $host_mirror_path ]]; then

		printf -v p '%q' "$host_mirror_path"

		mount_args+=(--bind-ro="$p")

		mount_args+=(--bind-ro="$host_mirror_path")

	fi



	printf -v p '%q' "${cache_dirs[0]}"

	mount_args+=(--bind="$p")

	mount_args+=(--bind="${cache_dirs[0]}")



	for cache_dir in ${cache_dirs[@]:1}; do

		printf -v p '%q' "$cache_dir"

		mount_args+=(--bind-ro="$p")

		mount_args+=(--bind-ro="$cache_dir")

	done

}