reynir/albatross
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Bos.OS.Cmd.run_out needs to check the exit status (using Bos.OS.Cmd.success)

Browse source
This commit is contained in:
Hannes Mehnert 2020-05-11 13:26:35 +02:00
parent ab76e1ef89
commit 604f3ec52e
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/vmm_unix.ml
View file

@ -12,10 +12,10 @@ type supported = FreeBSD | Linux
let uname = let uname =
let cmd = Bos.Cmd.(v "uname" % "-s") in let cmd = Bos.Cmd.(v "uname" % "-s") in
lazy (match Bos.OS.Cmd.(run_out cmd |> out_string) with lazy (match Bos.OS.Cmd.(run_out cmd |> out_string |> success) with
| Ok (s, _) when s = "FreeBSD" -> FreeBSD | Ok s when s = "FreeBSD" -> FreeBSD
| Ok (s, _) when s = "Linux" -> Linux | Ok s when s = "Linux" -> Linux
| Ok (s, _) -> invalid_arg (Printf.sprintf "OS %s not supported" s) | Ok s -> invalid_arg (Printf.sprintf "OS %s not supported" s)
| Error (`Msg m) -> invalid_arg m) | Error (`Msg m) -> invalid_arg m)
let check_solo5_cmd name = let check_solo5_cmd name =
@ -133,11 +133,11 @@ let create_tap bridge =
match Lazy.force uname with match Lazy.force uname with
| FreeBSD -> | FreeBSD ->
let cmd = Bos.Cmd.(v "ifconfig" % "tap" % "create") in let cmd = Bos.Cmd.(v "ifconfig" % "tap" % "create") in
Bos.OS.Cmd.run_out cmd |> Bos.OS.Cmd.out_string >>= fun (name, _) -> Bos.OS.Cmd.(run_out cmd |> out_string |> success) >>= fun name ->
Bos.OS.Cmd.run Bos.Cmd.(v "ifconfig" % bridge % "addm" % name) >>= fun () -> Bos.OS.Cmd.run Bos.Cmd.(v "ifconfig" % bridge % "addm" % name) >>= fun () ->
Ok name Ok name
| Linux -> | Linux ->
Bos.(OS.Cmd.(run_out Cmd.(v "ip" % "tuntap" % "show") |> out_lines)) >>= fun (taps, _) -> Bos.(OS.Cmd.(run_out Cmd.(v "ip" % "tuntap" % "show") |> out_lines |> success)) >>= fun taps ->
let prefix = "vmmtap" in let prefix = "vmmtap" in
let plen = String.length prefix in let plen = String.length prefix in
let num acc n = let num acc n =
@ -166,7 +166,7 @@ type solo5_target = Spt | Hvt
let solo5_image_target image = let solo5_image_target image =
check_solo5_cmd "solo5-elftool" >>= fun cmd -> check_solo5_cmd "solo5-elftool" >>= fun cmd ->
let cmd = Bos.Cmd.(cmd % "query-abi" % p image) in let cmd = Bos.Cmd.(cmd % "query-abi" % p image) in
Bos.OS.Cmd.(run_out cmd |> out_string) >>= fun (s, _) -> Bos.OS.Cmd.(run_out cmd |> out_string |> success) >>= fun s ->
R.error_to_msg ~pp_error:Jsonm.pp_error R.error_to_msg ~pp_error:Jsonm.pp_error
(Vmm_json.json_of_string s) >>= fun data -> (Vmm_json.json_of_string s) >>= fun data ->
Vmm_json.find_string_value "target" data >>= function Vmm_json.find_string_value "target" data >>= function