rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-06-30 00:31:49 +00:00
Code Issues Releases Wiki Activity

Merge pull request #455 from ibuildthecloud/fix-linux-run

Browse Source 
Fix script/run on Linux
This commit is contained in:
Ivan Mikushin 2015-07-28 09:37:13 +05:00
commit e812e7960a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/run
View File

@ -114,7 +114,7 @@ if [ "$UNAME" == "Darwin" ] && [ -x $(which xhyve) ]; then
-U a01fb25c-3a19-4759-a47a-2e353e51807d \ -U a01fb25c-3a19-4759-a47a-2e353e51807d \
-f kexec,${KERNEL},${INITRD_TEST},"earlyprintk=serial acpi=off elevator=noop ${KERNEL_ARGS}" -f kexec,${KERNEL},${INITRD_TEST},"earlyprintk=serial acpi=off elevator=noop ${KERNEL_ARGS}"
elif ["$UNAME" == "Linux"] && [ -x $(which qemu-system-x86_64) ]; then elif [ "$UNAME" == "Linux" ] && [ -x $(which qemu-system-x86_64) ]; then
exec qemu-system-x86_64 -serial stdio \ exec qemu-system-x86_64 -serial stdio \
-kernel ${KERNEL} \ -kernel ${KERNEL} \
-initrd ${INITRD_TEST} \ -initrd ${INITRD_TEST} \
@ -129,6 +129,7 @@ elif ["$UNAME" == "Linux"] && [ -x $(which qemu-system-x86_64) ]; then
-device virtio-9p-pci,fsdev=conf,mount_tag=config-2 \ -device virtio-9p-pci,fsdev=conf,mount_tag=config-2 \
-append "${KERNEL_ARGS}" \ -append "${KERNEL_ARGS}" \
-serial mon:telnet:localhost:4444,server,nowait \ -serial mon:telnet:localhost:4444,server,nowait \
-nographic \
${QEMU_ARGS} "${@}" ${QEMU_ARGS} "${@}"
else else
exit 42 exit 42