rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-20 10:03:59 +00:00
Code Issues Releases Wiki Activity

updates for latest moby changes

Browse Source 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
Sven Dowideit
2017-07-13 20:06:34 +10:00
parent 03f90fd748
commit a4e7036086
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/build-moby
View File

@@ -8,6 +8,6 @@ docker build -t zombie/os - < scripts/moby/Dockerfile
cd dist cd dist
mkdir -p moby mkdir -p moby
cd moby cd moby
moby build ../../scripts/moby/rancheros moby build -output kernel+initrd -output iso-bios ../../scripts/moby/rancheros.yml

6
scripts/moby/rancheros.yml
View File

@@ -7,8 +7,8 @@ init:
- zombie/os - zombie/os
# - rancher/os-installer # - rancher/os-installer
# - rancher/os-initrd # - rancher/os-initrd
outputs: #outputs:
- format: kernel+initrd # - format: kernel+initrd
- format: iso-bios # - format: iso-bios
# - format: iso-efi # - format: iso-efi
# - format: gcp-img # - format: gcp-img

6
scripts/run-moby
View File

@@ -2,7 +2,7 @@
cd $(dirname $0)/../dist/moby cd $(dirname $0)/../dist/moby
if [ "1" == "1" ]; then if [ "1" == "2" ]; then
linuxkit run -mem 2048 rancheros linuxkit run -mem 2048 rancheros
else else
qemu-system-x86_64 \ qemu-system-x86_64 \
@@ -10,6 +10,10 @@ else
-kernel ./rancheros-kernel \ -kernel ./rancheros-kernel \
-initrd ./rancheros-initrd.img \ -initrd ./rancheros-initrd.img \
-m 2048 \ -m 2048 \
-device virtio-rng-pci \
-smp 1 \
-enable-kvm \
-machine q35,accel=kvm:tcg \
-net nic,vlan=0,model=virtio \ -net nic,vlan=0,model=virtio \
-net user,vlan=0,hostfwd=tcp::3333-:22,hostname=rancher-moby \ -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' -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'