diff --git a/GNUmakefile b/GNUmakefile index 2d1e22ce..297198ca 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -5,7 +5,7 @@ vendor_list := \ base32 cohttp mirage-mtime mirage-ptime secmod_fat=secrets/secmod.fat -tap_device=tap-mte +tap_device=tap0 check-kvm: $(if $(wildcard /dev/kvm),,$(error KVM support not enabled)) diff --git a/network.sh b/network.sh index f2eb77f2..0b0632e6 100755 --- a/network.sh +++ b/network.sh @@ -1,11 +1,9 @@ #!/bin/bash set -e -sudo ip link add name bridge-mte type bridge -sudo ip addr add 10.0.0.1/24 dev bridge-mte -sudo ip tuntap add name tap-mte mode tap -sudo ip link set tap-mte master bridge-mte -sudo ip link set bridge-mte up -sudo ip link set tap-mte up - -# TODO setup postgresql +sudo ip link add br0 type bridge +sudo ip addr add 10.0.0.1/24 dev br0 +sudo ip tuntap add tap0 mode tap +sudo ip link set tap0 master br0 +sudo ip link set br0 up +sudo ip link set tap0 up diff --git a/src/global.ml b/src/global.ml index 30006f70..04a76dfb 100644 --- a/src/global.ml +++ b/src/global.ml @@ -8,8 +8,9 @@ let db_conn = | Error err -> Fmt.failwith "Database connection failure: %a." Caqti_error.pp err | Ok conn -> - let () = Pg.preflight conn in Logs.info (fun m -> m "... connection done."); + let () = Pg.preflight conn in + Logs.info (fun m -> m "Preflight done."); conn in let finally (module Conn : Pg.CONN) = Conn.disconnect () in diff --git a/src/mte.ml b/src/mte.ml index a13c7d28..50e9cfd5 100644 --- a/src/mte.ml +++ b/src/mte.ml @@ -76,7 +76,8 @@ let () = let storage = Mkernel.block "storage" in let service = let ipv4 = Ipaddr.V4.Prefix.of_string_exn "10.0.0.2/24" in - Mnet.stack ~name:"service" ipv4 + Mnet.stack ~name:"service" + ipv4 in Mkernel.(run [ rng; storage; service ]) @@ fun rng storage (stack, tcp, udp) () ->