Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote branch 'rafal/master'

Browse Source
This commit is contained in:
Joanna Rutkowska 2010-05-13 16:19:29 +02:00
commit 496c3be50a
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
appvm/fstab
View File

@ -15,3 +15,4 @@ sysfs /sys sysfs defaults 0 0
proc /proc proc defaults 0 0 proc /proc proc defaults 0 0
/dev/xvdg /mnt/outgoing vfat noauto,user,rw 0 0 /dev/xvdg /mnt/outgoing vfat noauto,user,rw 0 0
/dev/xvdh /mnt/incoming 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

2
appvm/qvm-copy-to-vm
View File

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

7
appvm/qvm-copy-to-vm.kde
View File

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

2
rpm_spec/core-appvm.spec
View File

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