merged with upstreamHEADmaster

1 files changed, 12 insertions, 9 deletions

diff --git a/src/mkarchroot.in b/src/mkarchroot.in
index 2abe001..c59c26c 100644
--- a/src/mkarchroot.in
+++ b/src/mkarchroot.in
@@ -22,13 +22,14 @@ nspawn_args=()
 usage() {
 	echo "Usage: ${0##*/} [options] working-dir package-list..."
 	echo ' options:'
-	echo '    -U            Use pacman -U to install packages'
-	echo '    -C <file>     Location of a pacman config file'
-	echo '    -M <file>     Location of a makepkg config file'
-	echo '    -c <dir>      Set pacman cache'
-	echo '    -f <file>     Copy file from the host to the chroot'
-	echo '    -s            Do not run setarch'
-	echo '    -h            This message'
+	echo '    -U                  Use pacman -U to install packages'
+	echo '    -C <file>           Location of a pacman config file'
+	echo '    -M <file>           Location of a makepkg config file'
+	echo '    -c <dir>            Set pacman cache'
+	echo '    -f <src>[:<dst>]    Copy src file from the host to the chroot.'
+	echo '                        If dst file is not provided, it defaults to src'
+	echo '    -s                  Do not run setarch'
+	echo '    -h                  This message'
 	exit 1
 }
 
@@ -84,8 +85,10 @@ if is_btrfs "$working_dir"; then
 fi
 
 for file in "${files[@]}"; do
-	mkdir -p "$(dirname "$working_dir$file")"
-	cp "$file" "$working_dir$file"
+	src="${file%%:*}"
+	dst="${file#*:}"
+	mkdir -p "$(dirname "$working_dir$dst")"
+	cp "$src" "$working_dir$dst"
 done
 
 unshare --mount pacstrap -${umode}Mc ${pac_conf:+-C "$pac_conf"} "$working_dir" \