oSoWoSo/DistroHopper
1
0
Fork 0
mirror of https://github.com/oSoWoSo/DistroHopper.git synced 2024-08-14 22:46:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Only expose ~/Public on the host to to guests

Browse source 
Not actually ~/Public but XDG PUBLICSHARE
This commit is contained in:
Martin Wimpress 2021-09-29 03:27:28 +01:00
parent bc2680c198
commit d63a57a26f
No known key found for this signature in database
GPG key ID: 61DF940515E06DA3
1 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

22
quickemu
View file

@ -455,13 +455,17 @@ function vm_boot() {
if [ "${OUTPUT}" == "spice-app" ]; then if [ "${OUTPUT}" == "spice-app" ]; then
echo " - SPICE: Enabled" echo " - SPICE: Enabled"
else else
echo " - SPICE: ${SPICE_PORT}/tcp is connected. Login via 'spicy --title \"${VMNAME}\" --port ${SPICE_PORT} --spice-shared-dir ${HOME}' ${FULLSPICY}" echo -n " - SPICE: spicy --title \"${VMNAME}\" --port ${SPICE_PORT}"
if [ "${guest_os}" != "macos" ]; then
echo -n " --spice-shared-dir ${PUBLIC}"
fi
echo ${FULLSPICY}
SPICE="${SPICE},port=${SPICE_PORT}" SPICE="${SPICE},port=${SPICE_PORT}"
fi fi
# Reference: https://gitlab.gnome.org/GNOME/phodav/-/issues/5 # Reference: https://gitlab.gnome.org/GNOME/phodav/-/issues/5
if [ "${guest_os}" != "macos" ]; then if [ "${guest_os}" != "macos" ]; then
echo " - WebDAV: ${HOME} will be exported to ${VMNAME} via dav://localhost:9843/" echo " - WebDAV: ${PUBLIC} via: dav://localhost:9843/"
fi fi
fi fi
@ -575,7 +579,7 @@ function vm_boot() {
# If output is 'none' then SPICE was requested. # If output is 'none' then SPICE was requested.
if [ ${OUTPUT} == "none" ]; then if [ ${OUTPUT} == "none" ]; then
spicy --title "${VMNAME}" --port "${SPICE_PORT}" "${FULLSPICY}" --spice-shared-dir "${HOME}" >/dev/null 2>&1 spicy --title "${VMNAME}" --port "${SPICE_PORT}" "${FULLSPICY}" --spice-shared-dir "${PUBLIC}" >/dev/null 2>&1
fi fi
} }
@ -637,6 +641,7 @@ DELETE=0
FULLSCREEN="" FULLSCREEN=""
FULLSPICY="" FULLSPICY=""
OUTPUT="sdl" OUTPUT="sdl"
PUBLIC=""
SCREEN="" SCREEN=""
SHORTCUT=0 SHORTCUT=0
SNAPSHOT_ACTION="" SNAPSHOT_ACTION=""
@ -649,6 +654,17 @@ readonly LAUNCHER=$(basename "${0}")
readonly DISK_MIN_SIZE=$((197632 * 8)) readonly DISK_MIN_SIZE=$((197632 * 8))
readonly VERSION="2.1.0" readonly VERSION="2.1.0"
# PUBLICSHARE is the only directory exposed to guest VMs for file
# sharing via 9P and spice-webdavd. This path is not configurable.
PUBLIC=$(xdg-user-dir PUBLICSHARE)
if [ "${PUBLIC}" != ${HOME} ]; then
if [ ! -d "${PUBLIC}" ]; then
mkdir -p "${PUBLIC}"
fi
else
PUBLIC=""
fi
# TODO: Make this run the native architecture binary # TODO: Make this run the native architecture binary
QEMU=$(which qemu-system-x86_64) QEMU=$(which qemu-system-x86_64)
QEMU_IMG=$(which qemu-img) QEMU_IMG=$(which qemu-img)