Commit 5de55ee0 authored by Kroese's avatar Kroese Committed by GitHub
Browse files

Sync

parent c39f22e7

run/run.sh

+6 −6
Original line number Diff line number Diff line
@@ -6,9 +6,9 @@ set -eu 
: ${BOOT:=''}.                  # URL of the ISO file

: ${DEBUG:=''}.               # Enable debug mode

: ${ALLOCATE:='Y'}       # Preallocate diskspace

: ${CPU_CORES:='1'}     # vCPU count

: ${DISK_SIZE:='16G'}    # Initial disk size

: ${RAM_SIZE:='512M'} # Amount of RAM

: ${CPU_CORES:='1'}     # Amount of CPU cores

: ${DISK_SIZE:='16G'}    # Initial data disk size

: ${RAM_SIZE:='512M'} # Maximum RAM amount



echo "Starting QEMU for Docker v${VERSION}..."
@@ -32,7 +32,7 @@ fi 
KVM_OPTS=""



if [ -e /dev/kvm ] && sh -c 'echo -n > /dev/kvm' &> /dev/null; then

  if [[ $(grep -e vmx -e svm /proc/cpuinfo) ]]; then

  if grep -q -e vmx -e svm /proc/cpuinfo; then

    KVM_OPTS=",accel=kvm -enable-kvm -cpu host"

  fi

fi
@@ -52,7 +52,7 @@ ARGS="${DEF_OPTS} ${CPU_OPTS} ${RAM_OPTS} ${KVM_OPTS} ${MON_OPTS} ${SERIAL_OPTS} 


set -m

(

  qemu-system-x86_64 ${ARGS} & echo $! > ${_QEMU_PID}

  qemu-system-x86_64 ${ARGS:+ $ARGS} & echo $! > "${_QEMU_PID}"

)

set +m