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

Merge remote-tracking branch 'qubesos/pr/33'

Browse Source 
* qubesos/pr/33:
  And some more quoting to satisfy #1672
  Quoting all `cat`s as proposed in #1672
  Modifying support cpio as proposed in #1672
  Quoting the destination as proposed in #1672
This commit is contained in:
Marek Marczykowski-Górecki 2016-06-30 01:43:52 +02:00
commit 13a463b565
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qvm-tools/qubes-hcl-report
View File

@ -209,7 +209,7 @@ versions:
FIXLINK FIXLINK
--- ---
" >> $HOME/$FILENAME.yml " >> "$HOME/$FILENAME.yml"
if [[ "$SUPPORT_FILES" == 1 ]] if [[ "$SUPPORT_FILES" == 1 ]]
@ -217,7 +217,7 @@ if [[ "$SUPPORT_FILES" == 1 ]]
# cpio # cpio
cd $TEMP_DIR cd $TEMP_DIR
find -print0 |cpio --quiet -o -H crc --null |gzip >$HOME/$FILENAME.cpio.gz find -print0 | cpio --quiet -o -H crc --null | gzip > "$HOME/$FILENAME.cpio.gz"
cd cd
fi fi
@ -225,16 +225,16 @@ fi
if [[ "$COPY2VM" != "dom0" ]] if [[ "$COPY2VM" != "dom0" ]]
then then
# Copy to VM # Copy to VM
qvm-start -q $COPY2VM 2>/dev/null qvm-start -q $COPY2VM 2> /dev/null
if [[ -f "$HOME/$FILENAME.cpio.gz" ]] if [[ -f "$HOME/$FILENAME.cpio.gz" ]]
then then
cat $HOME/$FILENAME.cpio.gz | qvm-run -a -q --pass-io $COPY2VM "cat >/home/user/$FILENAME.cpio.gz" cat "$HOME/$FILENAME.cpio.gz" | qvm-run -a -q --pass-io $COPY2VM "cat > \"/home/user/$FILENAME.cpio.gz\""
fi fi
if [[ -f "$HOME/$FILENAME.yml" ]] if [[ -f "$HOME/$FILENAME.yml" ]]
then then
cat $HOME/$FILENAME.yml | qvm-run -a -q --pass-io $COPY2VM "cat >/home/user/$FILENAME.yml" cat "$HOME/$FILENAME.yml" | qvm-run -a -q --pass-io $COPY2VM "cat > \"/home/user/$FILENAME.yml\""
fi fi
fi fi