Merge remote branch 'rafal/master'

appvm/fstab

@@ -15,3 +15,4 @@ sysfs                   /sys                    sysfs   defaults        0 0
 proc                    /proc                   proc    defaults        0 0
 /dev/xvdg	/mnt/outgoing	vfat noauto,user,rw 0 0
 /dev/xvdh	/mnt/incoming	vfat noauto,user,rw 0 0
+/dev/xvdi	/mnt/removable	auto noauto,user,rw 0 0

appvm/qvm-copy-to-vm

@@ -34,7 +34,7 @@ echo " received"
 mount /mnt/outgoing 
 VMNAME=$1
 shift
-cp -v -a $* /mnt/outgoing
+cp -v -a "$@" /mnt/outgoing
 #sometimes Dolphin lags a bit
 umount /mnt/outgoing || (sleep 1; umount /mnt/outgoing) || exit 1
 qubes_penctl send $VMNAME || exit 1

appvm/qvm-copy-to-vm.kde

@@ -20,15 +20,14 @@
 #
 #
 
-FILES="$*"
-VM=$(kdialog -inputbox "Enter the VM name to send $FILE to:")
+VM=$(kdialog -inputbox "Enter the VM name to send files to:")
 if [ X$VM = X ] ; then exit 0 ; fi
 DEST=/mnt/outgoing
-SIZE=$(du -c $FILES | tail -1 | cut -f 1)
+SIZE=$(du -c "$@" | tail -1 | cut -f 1)
 REF=$(kdialog --progressbar "Copy progress")
 qdbus $REF org.freedesktop.DBus.Properties.Set "" maximum $SIZE
 FLAG=$(mktemp)
-(qvm-copy-to-vm $VM $FILES ; rm $FLAG)  &
+(qvm-copy-to-vm $VM "$@" ; rm $FLAG)  &
 while ! grep -q $DEST /proc/mounts && [ -f $FLAG ] ; do
 	sleep 0.1
 done

rpm_spec/core-appvm.spec

@@ -66,6 +66,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
 cp iptables $RPM_BUILD_ROOT/etc/sysconfig/
 mkdir -p $RPM_BUILD_ROOT/mnt/incoming
 mkdir -p $RPM_BUILD_ROOT/mnt/outgoing
+mkdir -p $RPM_BUILD_ROOT/mnt/removable
 
 %post
 
@@ -160,3 +161,4 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/qubes
 %dir /mnt/incoming
 %dir /mnt/outgoing
+%dir /mnt/removable