From 973b7a6676d5aae1a29d7b7567c91108a468b9ac Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sat, 26 Oct 2013 11:27:06 +0100
Subject: [PATCH] builder: Allow --upload to a directory.

Also set the owner and permissions on the destination file correctly.

(cherry picked from commit 10c849ed1cb4375c5ef811197fa0a3206d365b86)
---
 builder/test-virt-builder.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builder/test-virt-builder.sh b/builder/test-virt-builder.sh
index 6f76972..30c3cf8 100755
--- a/builder/test-virt-builder.sh
+++ b/builder/test-virt-builder.sh
@@ -56,7 +56,7 @@ $VG ./virt-builder phony-fedora \
     --root-password password:123456 \
     --mkdir /etc/foo/bar/baz \
     --upload Makefile:/Makefile \
-    --upload Makefile:/etc \
+    --upload Makefile:/etc/foo/bar/baz \
     --delete /Makefile \
     --firstboot Makefile --firstboot-command 'echo "hello"' \
     --firstboot-install "minicom,inkscape"
-- 
1.8.4.2