Sync
This commit is contained in:
parent
c39f22e7c1
commit
5de55ee04a
1 changed files with 6 additions and 6 deletions
12
run/run.sh
12
run/run.sh
|
@ -3,12 +3,12 @@ set -eu
|
||||||
|
|
||||||
# Docker environment variabeles
|
# Docker environment variabeles
|
||||||
|
|
||||||
: ${BOOT:=''}. # URL of the ISO file
|
: ${BOOT:=''}. # URL of the ISO file
|
||||||
: ${DEBUG:=''}. # Enable debug mode
|
: ${DEBUG:=''}. # Enable debug mode
|
||||||
: ${ALLOCATE:='Y'} # Preallocate diskspace
|
: ${ALLOCATE:='Y'} # Preallocate diskspace
|
||||||
: ${CPU_CORES:='1'} # vCPU count
|
: ${CPU_CORES:='1'} # Amount of CPU cores
|
||||||
: ${DISK_SIZE:='16G'} # Initial disk size
|
: ${DISK_SIZE:='16G'} # Initial data disk size
|
||||||
: ${RAM_SIZE:='512M'} # Amount of RAM
|
: ${RAM_SIZE:='512M'} # Maximum RAM amount
|
||||||
|
|
||||||
echo "Starting QEMU for Docker v${VERSION}..."
|
echo "Starting QEMU for Docker v${VERSION}..."
|
||||||
|
|
||||||
|
@ -32,7 +32,7 @@ fi
|
||||||
KVM_OPTS=""
|
KVM_OPTS=""
|
||||||
|
|
||||||
if [ -e /dev/kvm ] && sh -c 'echo -n > /dev/kvm' &> /dev/null; then
|
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"
|
KVM_OPTS=",accel=kvm -enable-kvm -cpu host"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
@ -52,7 +52,7 @@ ARGS="${DEF_OPTS} ${CPU_OPTS} ${RAM_OPTS} ${KVM_OPTS} ${MON_OPTS} ${SERIAL_OPTS}
|
||||||
|
|
||||||
set -m
|
set -m
|
||||||
(
|
(
|
||||||
qemu-system-x86_64 ${ARGS} & echo $! > ${_QEMU_PID}
|
qemu-system-x86_64 ${ARGS:+ $ARGS} & echo $! > "${_QEMU_PID}"
|
||||||
)
|
)
|
||||||
set +m
|
set +m
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue