1
0
mirror of https://github.com/rancher/os.git synced 2025-07-16 16:11:03 +00:00

use the rancher/os-kernel built kernel

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
Sven Dowideit 2017-05-04 11:54:16 +10:00
parent a366336895
commit 4fc82b69ef
2 changed files with 8 additions and 2 deletions

View File

@ -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:

View File

@ -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