diff --git a/scripts/moby/rancheros.yml b/scripts/moby/rancheros.yml index c9ad2c48..e984a345 100644 --- a/scripts/moby/rancheros.yml +++ b/scripts/moby/rancheros.yml @@ -1,5 +1,6 @@ kernel: - image: "linuxkit/kernel:4.9.x" +# image: "linuxkit/kernel:4.9.x" + image: "rancher/os-kernel:4.9.26-rancher" # cmdline: "debug ignore_loglevel log_buf_len=10M print_fatal_signals=1 LOGLEVEL=8 earlyprintk sched_debug initcall_debug option.debug=Y break=y console=ttyS0 console=tty0 console=tty1 page_poison=1 printk.devkmsg=on rancher.debug=true rancher.password=rancher rancher.autologin=ttyS0 rancher.autologin=tty0 rancher.autologin=tty1" cmdline: 'printk.devkmsg=on rancher.debug=true rancher.password=rancher console=ttyS0 rancher.autologin=ttyS0 console=tty0 rancher.autologin=tty0 console=tty1 rancher.autologin=tty1 rancher.state.dev=LABEL=RANCHER_STATE rancher.state.autoformat=[/dev/sda,/dev/vda] rancher.rm_usr' init: diff --git a/scripts/run-moby b/scripts/run-moby index e0f39274..73752eee 100755 --- a/scripts/run-moby +++ b/scripts/run-moby @@ -1,7 +1,11 @@ #!/bin/bash cd $(dirname $0)/../dist/moby -qemu-system-x86_64 \ + +if [ "1" == "1" ]; then + linuxkit run -mem 2048 rancheros +else + qemu-system-x86_64 \ -nographic \ -kernel ./rancheros-kernel \ -initrd ./rancheros-initrd.img \ @@ -9,3 +13,4 @@ qemu-system-x86_64 \ -net nic,vlan=0,model=virtio \ -net user,vlan=0,hostfwd=tcp::3333-:22,hostname=rancher-moby \ -append 'printk.devkmsg=on rancher.debug=true rancher.password=rancher console=ttyS0 rancher.autologin=ttyS0 console=tty0 rancher.autologin=tty0 console=tty1 rancher.autologin=tty1 rancher.state.dev=LABEL=RANCHER_STATE rancher.state.autoformat=[/dev/sda,/dev/vda] rancher.rm_usr' +fi