X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=mclu_console.ml;h=dfe012b0787fbc7ecb339070739ca4c2c457af91;hb=c0d86b007d1dccfe41c1480479191024217769d5;hp=5a1d3cbb5741230b74cf92561ac9210637567a3c;hpb=925be79f3065e383cbc532ebd637652999a9671e;p=mclu.git

diff --git a/mclu_console.ml b/mclu_console.ml
index 5a1d3cb..dfe012b 100644
--- a/mclu_console.ml
+++ b/mclu_console.ml
@@ -25,32 +25,7 @@ open Utils
 let get_arg_speclist () = []
 
 let console ~verbose ?host name =
-  let nodes = Mclu_conf.nodes () in
-  let node =
-    match host with
-    | Some host ->
-      (try List.find (fun n -> host = n.Mclu_conf.hostname) nodes
-       with Not_found ->
-         eprintf "mclu: host '%s' not found\n" host;
-         exit 1)
-    | None ->
-      (* No 'host:' prefix given, so we need to find the host. *)
-      let guests = Mclu_list.active_guests ~verbose ~nodes () in
-      let node, _ =
-        try
-          List.find (
-            fun (node, doms) ->
-              List.exists (
-                fun dom ->
-                  name = dom.Mclu_list.dom_name
-              ) doms
-          ) guests
-        with
-          Not_found ->
-            eprintf "mclu: guest '%s' not found\n" name;
-            exit 1 in
-      node in
-
+  let node, name = Mclu_list.find_guest ~verbose name in
   let uri = node.Mclu_conf.libvirt_uri in
 
   let cmd = sprintf "virsh -c %s console %s" (quote uri) (quote name) in
@@ -61,9 +36,7 @@ let console ~verbose ?host name =
   )
 
 let run ~verbose = function
-  | [ name ] ->
-    let host, name = name_parse name in
-    console ~verbose ?host name
+  | [ name ] -> console ~verbose name
   | _ ->
-    eprintf "Usage: mclu boot <template> <[host:]name>\n";
+    eprintf "Usage: mclu console <[host:]name>\n";
     exit 1