Merge pull request #87 from rafalmiel/systemd-cp-15132

CP-15132: Systemd conversion

Author: robhoes

_oasis

@@ -26,7 +26,8 @@ Library networklibs
     rpclib,
     stdext,
     xcp-inventory,
-    xcp.network
+    xcp.network,
+    systemd
   CSources:           link_stubs.c, netdev.h
   CCOpt:              -Wno-unused-function -g -ggdb
 
@@ -48,7 +49,8 @@ Executable xcp_networkd
     xen-api-client,
     xcp,
     xcp.network,
-    netlink
+    netlink,
+    systemd
 
 Executable networkd_db
   CompiledObject:     best

_tags

@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: 6a8937157d81341f64a601d75a86be7f)
+# DO NOT EDIT (digest: f215aeb9d2f9547603c4304cd27da833)
 # Ignore VCS directories, you can use the same kind of rule outside
 # OASIS_START/STOP if you want to exclude directories that contains
 # useless stuff for the build process
@@ -24,12 +24,14 @@ true: annot, bin_annot
 <lib/*.ml{,i,y}>: pkg_forkexec
 <lib/*.ml{,i,y}>: pkg_rpclib
 <lib/*.ml{,i,y}>: pkg_stdext
+<lib/*.ml{,i,y}>: pkg_systemd
 <lib/*.ml{,i,y}>: pkg_threads
 <lib/*.ml{,i,y}>: pkg_xcp-inventory
 <lib/*.ml{,i,y}>: pkg_xcp.network
 "lib/link_stubs.c": pkg_forkexec
 "lib/link_stubs.c": pkg_rpclib
 "lib/link_stubs.c": pkg_stdext
+"lib/link_stubs.c": pkg_systemd
 "lib/link_stubs.c": pkg_threads
 "lib/link_stubs.c": pkg_xcp-inventory
 "lib/link_stubs.c": pkg_xcp.network
@@ -39,6 +41,7 @@ true: annot, bin_annot
 <networkd/networkd.{native,byte}>: pkg_rpclib
 <networkd/networkd.{native,byte}>: pkg_rpclib.unix
 <networkd/networkd.{native,byte}>: pkg_stdext
+<networkd/networkd.{native,byte}>: pkg_systemd
 <networkd/networkd.{native,byte}>: pkg_threads
 <networkd/networkd.{native,byte}>: pkg_xcp
 <networkd/networkd.{native,byte}>: pkg_xcp-inventory
@@ -51,6 +54,7 @@ true: annot, bin_annot
 <networkd/*.ml{,i,y}>: pkg_rpclib
 <networkd/*.ml{,i,y}>: pkg_rpclib.unix
 <networkd/*.ml{,i,y}>: pkg_stdext
+<networkd/*.ml{,i,y}>: pkg_systemd
 <networkd/*.ml{,i,y}>: pkg_threads
 <networkd/*.ml{,i,y}>: pkg_xcp
 <networkd/*.ml{,i,y}>: pkg_xcp-inventory
@@ -63,6 +67,7 @@ true: annot, bin_annot
 <networkd_db/networkd_db.{native,byte}>: pkg_forkexec
 <networkd_db/networkd_db.{native,byte}>: pkg_rpclib
 <networkd_db/networkd_db.{native,byte}>: pkg_stdext
+<networkd_db/networkd_db.{native,byte}>: pkg_systemd
 <networkd_db/networkd_db.{native,byte}>: pkg_threads
 <networkd_db/networkd_db.{native,byte}>: pkg_xcp-inventory
 <networkd_db/networkd_db.{native,byte}>: pkg_xcp.network
@@ -71,6 +76,7 @@ true: annot, bin_annot
 <networkd_db/*.ml{,i,y}>: pkg_forkexec
 <networkd_db/*.ml{,i,y}>: pkg_rpclib
 <networkd_db/*.ml{,i,y}>: pkg_stdext
+<networkd_db/*.ml{,i,y}>: pkg_systemd
 <networkd_db/*.ml{,i,y}>: pkg_threads
 <networkd_db/*.ml{,i,y}>: pkg_xcp-inventory
 <networkd_db/*.ml{,i,y}>: pkg_xcp.network
@@ -82,6 +88,7 @@ true: annot, bin_annot
 <test/network_test.{native,byte}>: pkg_oUnit
 <test/network_test.{native,byte}>: pkg_rpclib
 <test/network_test.{native,byte}>: pkg_stdext
+<test/network_test.{native,byte}>: pkg_systemd
 <test/network_test.{native,byte}>: pkg_threads
 <test/network_test.{native,byte}>: pkg_xcp-inventory
 <test/network_test.{native,byte}>: pkg_xcp.network
@@ -91,6 +98,7 @@ true: annot, bin_annot
 <test/*.ml{,i,y}>: pkg_oUnit
 <test/*.ml{,i,y}>: pkg_rpclib
 <test/*.ml{,i,y}>: pkg_stdext
+<test/*.ml{,i,y}>: pkg_systemd
 <test/*.ml{,i,y}>: pkg_threads
 <test/*.ml{,i,y}>: pkg_xcp-inventory
 <test/*.ml{,i,y}>: pkg_xcp.network
@@ -101,6 +109,7 @@ true: annot, bin_annot
 <cli/network_cli.{native,byte}>: pkg_forkexec
 <cli/network_cli.{native,byte}>: pkg_rpclib
 <cli/network_cli.{native,byte}>: pkg_stdext
+<cli/network_cli.{native,byte}>: pkg_systemd
 <cli/network_cli.{native,byte}>: pkg_threads
 <cli/network_cli.{native,byte}>: pkg_xcp
 <cli/network_cli.{native,byte}>: pkg_xcp-inventory
@@ -111,6 +120,7 @@ true: annot, bin_annot
 <cli/*.ml{,i,y}>: pkg_forkexec
 <cli/*.ml{,i,y}>: pkg_rpclib
 <cli/*.ml{,i,y}>: pkg_stdext
+<cli/*.ml{,i,y}>: pkg_systemd
 <cli/*.ml{,i,y}>: pkg_threads
 <cli/*.ml{,i,y}>: pkg_xcp
 <cli/*.ml{,i,y}>: pkg_xcp-inventory

lib/META

@@ -1,8 +1,9 @@
 # OASIS_START
-# DO NOT EDIT (digest: de99a9d89799ce8282274091a7a1fc5b)
+# DO NOT EDIT (digest: 15141d14f3a161ffac233e3e5d89f7eb)
 version = "0.10.0"
 description = "XCP Network Daemon"
-requires = "forkexec stdext threads rpclib stdext xcp-inventory xcp.network"
+requires =
+"forkexec stdext threads rpclib stdext xcp-inventory xcp.network systemd"
 archive(byte) = "networklibs.cma"
 archive(byte, plugin) = "networklibs.cma"
 archive(native) = "networklibs.cmxa"

networkd/network_server.ml

@@ -30,7 +30,7 @@ let backend_kind = ref Openvswitch
 
 let legacy_management_interface_start () =
 	try
-		ignore (call_script "/etc/init.d/management-interface" ["start"]);
+		ignore (call_script "/opt/xensource/libexec/legacy-management-interface" ["start"]);
 		debug "Upgrade: brought up interfaces using the old script. Xapi will sync up soon."
 	with e ->
 		debug "Error while configuring the management interface using the old script: %s\n%s"

networkd/networkd.ml

@@ -108,6 +108,8 @@ let _ =
 		Debug.with_thread_associated "main" start server
 	) ();
 
+	ignore (Daemon.notify Daemon.State.Ready);
+
 	while true do
 		Thread.delay 300.;
 		Network_server.on_timer ()

opam

@@ -7,6 +7,7 @@ build: [
 remove: [make "uninstall" "BINDIR=%{bin}%" "SBINDIR=%{bin}%" "LIBEXECDIR=%{bin}%" "SCRIPTSDIR=%{bin}%" "ETCDIR=%{prefix}%/etc"]
 depends: [
   "ocamlfind"
+  "systemd"
   "xapi-idl"
   "xapi-libs-transitional"
   "xen-api-client"

setup.ml

@@ -1,7 +1,7 @@
 (* setup.ml generated for the first time by OASIS v0.4.4 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 4f31dde1aa43f140b1636f49feb27ed0) *)
+(* DO NOT EDIT (digest: e88d0ea8e077829e068fc22c3f10f7eb) *)
 (*
    Regenerated by OASIS v0.4.5
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -6953,7 +6953,8 @@ let setup_t =
                            FindlibPackage ("rpclib", None);
                            FindlibPackage ("stdext", None);
                            FindlibPackage ("xcp-inventory", None);
-                           FindlibPackage ("xcp.network", None)
+                           FindlibPackage ("xcp.network", None);
+                           FindlibPackage ("systemd", None)
                         ];
                       bs_build_tools = [ExternalTool "ocamlbuild"];
                       bs_c_sources = ["link_stubs.c"; "netdev.h"];
@@ -7001,7 +7002,8 @@ let setup_t =
                            FindlibPackage ("xen-api-client", None);
                            FindlibPackage ("xcp", None);
                            FindlibPackage ("xcp.network", None);
-                           FindlibPackage ("netlink", None)
+                           FindlibPackage ("netlink", None);
+                           FindlibPackage ("systemd", None)
                         ];
                       bs_build_tools = [ExternalTool "ocamlbuild"];
                       bs_c_sources = [];
@@ -7139,14 +7141,14 @@ let setup_t =
        };
      oasis_fn = Some "_oasis";
      oasis_version = "0.4.5";
-     oasis_digest = Some "}\206D\135\159U\248\t\220\245MT)\183S\020";
+     oasis_digest = Some "\n\160_\159\237\2314&\159U\152l%\br{";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false
   };;
 
 let setup () = BaseSetup.setup setup_t;;
 
-# 7151 "setup.ml"
+# 7153 "setup.ml"
 (* OASIS_STOP *)
 let () = setup ();;