diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index 349339866..63900f2c9 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -1,7 +1,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" -init: "mobylinux/init:3024f1eaf8779691229d661791607aade4df855d" +init: "mobylinux/init:5770b8f1c72d3b9da43951d4ce3b53d473e3dc8b" system: - name: sysctl image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" diff --git a/projects/miragesdk/pkg/init/Makefile b/projects/miragesdk/pkg/init/Makefile index cc0353dca..363940806 100644 --- a/projects/miragesdk/pkg/init/Makefile +++ b/projects/miragesdk/pkg/init/Makefile @@ -1,7 +1,7 @@ CONTAINERD_IMAGE=mobylinux/containerd:a688df6aee1e3700eb8d54dbc81070361df397a2@sha256:59ee3da05fe4dad4fbecff582c86fc30ce75e19a225eeeb07e203c9cc36fe34f CONTAINERD_BINARIES=usr/bin/containerd usr/bin/containerd-shim usr/bin/ctr usr/bin/dist -RUNC_IMAGE=mobylinux/runc:94c54debf9a3ebb6d31311bdddb881ea07486dcd@sha256:13cabc1017c6448498e74bae9892ebc9dbad9e5d68f7df6b3855a15522e3a86b +RUNC_IMAGE=mobylinux/runc:45884ad2bfad045cbf35f2b78b4c82f75fb19854@sha256:d7c4576405f2318d329f538f847927018d4e8497d7968bd3323ff047e2ffe257 RUNC_BINARY=usr/bin/runc C_COMPILE=mobylinux/c-compile:81a6bd8ff45d769b60a2ee1acdaccda11ab835c8@sha256:eac250997a3b9784d3285a03c0c8311d4ca6fb63dc75164c987411ba93006487 @@ -9,11 +9,11 @@ START_STOP_DAEMON=sbin/start-stop-daemon default: push -$(RUNC_BINARY): +$(RUNC_BINARY): Makefile mkdir -p $(dir $@) docker run --rm --net=none $(RUNC_IMAGE) tar cf - $@ | tar xf - -$(CONTAINERD_BINARIES): +$(CONTAINERD_BINARIES): Makefile mkdir -p $(dir $@) docker run --rm --net=none $(CONTAINERD_IMAGE) tar cf - $@ | tar xf - diff --git a/projects/miragesdk/pkg/init/init b/projects/miragesdk/pkg/init/init index 46c52bceb..f27b647b0 100755 --- a/projects/miragesdk/pkg/init/init +++ b/projects/miragesdk/pkg/init/init @@ -14,9 +14,10 @@ setup_console() { line="-L" term="vt100" ;; - tty0) - # skip current console - return 0 + tty?) + line="" + speed="38400" + term="" ;; esac # skip consoles already in inittab