Skip to content
Snippets Groups Projects
Commit 05f25a59 authored by ulisse's avatar ulisse
Browse files

vm-setup now generates a valid MAC address

vm-start: fixed fullscreen variable check
parent 11474a82
No related branches found
No related tags found
No related merge requests found
......@@ -66,6 +66,7 @@ sed -i 's@\(Machine.*name="\)\([^"]*\)\("\)@\1'"`echo "${VM_NAME}"`"'\3@g' "${VM
sed -i 's@\(Machine.*snapshotFolder="\)\([^"]*\)\("\)@\1'"`echo "${TMP_DIR}"`"'\3@g' "${VM_DIR}/${VM_NAME}.vbox"
sed -i 's@\(SharedFolder.*name="'"`echo "${SF_LINUX_NAME}"`"'".*hostPath="\)\([^"]*\)\("\)@\1'"`echo "${SF_LINUX_TARGET}"`"'\3@g' "${VM_DIR}/${VM_NAME}.vbox"
sed -i 's@\(SharedFolder.*name="'"`echo "${SF_MEDIA_NAME}"`"'".*hostPath="\)\([^"]*\)\("\)@\1'"`echo "${SF_MEDIA_TARGET}"`"'\3@g' "${VM_DIR}/${VM_NAME}.vbox"
sed -i 's@\(MACAddress="\)\([^"]*\)\("\)@\1'"`printf '080027%02X%02X%02X' $[RANDOM%256] $[RANDOM%256] $[RANDOM%256]`"'\3@g' "${VM_DIR}/${VM_NAME}.vbox"
if [ "${DIFF_DISK_FILE}" != "" ]; then
sed -i 's@\(HardDisk.*location="\)\([^"]*diff_[^"]*\)\("\)@\1'"`echo "${TMP_DIR}/${DIFF_DISK_FILE}"`"'\3@g' "${VM_DIR}/${VM_NAME}.vbox"
......
......@@ -42,7 +42,7 @@ eval set -- "$OPTS"
while true ; do
case "$1" in
-f|--fullscreen) FULLSCREEN="1" ; shift ;;
-g|--gui) FULLSCREEN="" ; shift ;;
-g|--gui) FULLSCREEN="0" ; shift ;;
-r|--no-run) NO_RUN="1" ; shift ;;
-i|--no-init) NO_INIT="1"; shift ;;
--) shift ; break ;;
......@@ -119,7 +119,7 @@ vm_start_init () {
vm_start_run() {
# --fullscreen?
if [ "${FULLSCREEN}" != "" ]; then
if [ "${FULLSCREEN}" == "1" ]; then
# VBoxManage has no option for fullscreen mode, use VBoxSDL (no menu available in fullscreen)
VBoxSDL --startvm "${VM_NAME}" --fullscreen &
# options below could be useful in setting the fullscreen resolution, when known
......@@ -137,7 +137,6 @@ if [ $DEBUG -eq 1 ]; then
echo "fullscreen = $FULLSCREEN"
echo "no-init = $NO_INIT"
echo "no-run = $NO_RUN"
exit 1
fi
# check if vm exists
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment