1
0
mirror of https://github.com/rancher/os.git synced 2025-08-31 22:32:14 +00:00

Revert "4.9.3"

This commit is contained in:
Sven Dowideit
2017-01-16 09:33:27 +10:00
committed by GitHub
parent 6a1b3697fe
commit 1ca021fc6f
2 changed files with 6 additions and 13 deletions

View File

@@ -5,7 +5,6 @@ set -e
cd $(dirname $0)/..
source ./scripts/run-common
MEMORY=2048
while [ "$#" -gt 0 ]; do
case $1 in
@@ -33,10 +32,6 @@ while [ "$#" -gt 0 ]; do
--second-drive)
SECOND_DRIVE=1
;;
--memory)
shift 1
MEMORY="$1"
;;
--arch)
shift 1
ARCH="$1"
@@ -75,7 +70,6 @@ while [ "$#" -gt 0 ]; do
done
if [ "$QEMU" == "1" ] && ! which qemu-system-${QEMUARCH}; then
echo "ERROR: qemu not found - do you need to install it?"
QEMU=0
fi
@@ -160,7 +154,7 @@ if [ "$QEMU" == "1" ]; then
${KVM_ENABLE} \
${CPU} \
${machine["$ARCH"]} \
-m $MEMORY \
-m 2048 \
${network["$ARCH"]} \
$(eval "${hd["$ARCH"]} ${HD}") \
${SECOND_DRIVE_ENABLE} \
@@ -182,7 +176,7 @@ elif [ "$BOOT_ISO" == "1" ]; then
${KVM_ENABLE} \
${CPU} \
${machine["$ARCH"]} \
-m $MEMORY \
-m 2048 \
${network["$ARCH"]} \
$(eval "${hd["$ARCH"]} ${HD}") \
${SECOND_DRIVE_ENABLE} \