diff options
| -rwxr-xr-x | tools/create-image.sh | 2 | ||||
| -rw-r--r-- | vm/qemu/qemu.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/create-image.sh b/tools/create-image.sh index 7aa4a20de..78120e67d 100755 --- a/tools/create-image.sh +++ b/tools/create-image.sh @@ -13,7 +13,7 @@ sudo debootstrap --include=openssh-server wheezy wheezy # Set some defaults and enable promtless ssh to the machine for root. sudo sed -i '/^root/ { s/:x:/::/ }' wheezy/etc/passwd -echo 'V0:23:respawn:/sbin/getty 115200 hvc0' | sudo tee -a wheezy/etc/inittab +echo 'T0:23:respawn:/sbin/getty -L ttyS0 115200 vt100' | sudo tee -a wheezy/etc/inittab printf '\nauto eth0\niface eth0 inet dhcp\n' | sudo tee -a wheezy/etc/network/interfaces echo 'debugfs /sys/kernel/debug debugfs defaults 0 0' | sudo tee -a wheezy/etc/fstab echo 'debug.exception-trace = 0' | sudo tee -a wheezy/etc/sysctl.conf diff --git a/vm/qemu/qemu.go b/vm/qemu/qemu.go index 87a075c00..cef95b645 100644 --- a/vm/qemu/qemu.go +++ b/vm/qemu/qemu.go @@ -190,7 +190,7 @@ func (inst *instance) Boot() error { } if inst.cfg.Kernel != "" { cmdline := "console=ttyS0 vsyscall=native rodata=n oops=panic panic_on_warn=1 panic=-1" + - " ftrace_dump_on_oops=orig_cpu earlyprintk=serial slub_debug=UZ " + " ftrace_dump_on_oops=orig_cpu earlyprintk=serial slub_debug=UZ net.ifnames=0 biosdevname=0 " if inst.cfg.Image == "9p" { cmdline += "root=/dev/root rootfstype=9p rootflags=trans=virtio,version=9p2000.L,cache=loose " cmdline += "init=" + filepath.Join(inst.cfg.Workdir, "init.sh") + " " |