Merge pull request #1899 from jonludlam/udhcpd-xscore

Use busybox for udhcpd

Author: Jon Ludlam

ocaml/xapi/xapi_globs.ml

@@ -731,8 +731,10 @@ let server_cert_path = ref (Filename.concat "/etc/xensource" "xapi-ssl.pem")
 
 let udhcpd_conf = ref (Filename.concat "/etc/xensource" "udhcpd.conf")
 let udhcpd_skel = ref (Filename.concat "/etc/xensource" "udhcpd.skel")
+let udhcpd_leases_db = ref "/var/lib/xcp/dhcp-leases.db"
+let udhcpd_pidfile = ref "/var/run/udhcpd.pid"
 
-let udhcpd = ref "udhcpd"
+let busybox = ref "busybox"
 
 let xe_path = ref "xe"
 
@@ -890,7 +892,7 @@ module Resources = struct
 
 	let essential_executables = [
 		"xapissl", xapissl_path, "Script for starting stunnel";
-		"udhcpd", udhcpd, "DHCP server";
+		"busybox", busybox, "Swiss army knife executable - used as DHCP server";
 		"lw-force-domain-leave-script", lw_force_domain_leave_script, "Executed when likewise domain-leave fails";
 		"redo-log-block-device-io", redo_log_block_device_io, "Used by the redo log for block device I/O";
 		"sparse_dd", sparse_dd, "Path to sparse_dd";

ocaml/xapi/xapi_udhcpd.ml

@@ -26,9 +26,6 @@ let ip_begin_key = "ip_begin"
 let ip_end_key = "ip_end"
 let ip_disable_gw_key = "ip_disable_gw"
 
-let leases_db = Filename.concat "/var/lib/xcp" "dhcp-leases.db"
-let pidfile = "/var/run/udhcpd.pid"
-
 let (|>) x f = f x
 
 module Ip = struct
@@ -95,16 +92,16 @@ let update_db_nolock ~__context =
 
 (** Called on startup to reload the leases database *)
 let load_db_nolock () =
-    let s = Unixext.string_of_file leases_db in
+    let s = Unixext.string_of_file !Xapi_globs.udhcpd_leases_db in
     let rpc = Jsonrpc.of_string s in
     assigned := static_leases_of_rpc rpc;
-	info "Host internal management network successfully loaded DHCP leases db from %s" leases_db
+	info "Host internal management network successfully loaded DHCP leases db from %s" !Xapi_globs.udhcpd_leases_db
 
 (** Called before every update to save the leases database *)
 let save_db_nolock () =
 	let rpc = rpc_of_static_leases !assigned in
     let s = Jsonrpc.to_string rpc in
-    Unixext.write_string_to_file leases_db s
+    Unixext.write_string_to_file !Xapi_globs.udhcpd_leases_db s
 
 module Udhcpd_conf = struct
 	type t = {
@@ -151,9 +148,9 @@ let write_config_nolock ~__context ip_router =
 	Unixext.write_string_to_file !Xapi_globs.udhcpd_conf (Udhcpd_conf.to_string ~__context config)
 
 let restart_nolock () =
-	let pid = try Unixext.pidfile_read pidfile with _ -> None in
+	let pid = try Unixext.pidfile_read !Xapi_globs.udhcpd_pidfile with _ -> None in
 	Opt.iter Unixext.kill_and_wait pid;
-	let (_: string * string) = execute_command_get_output !Xapi_globs.udhcpd [ !Xapi_globs.udhcpd_conf ] in
+	let (_: string * string) = execute_command_get_output !Xapi_globs.busybox [ "udhcpd"; !Xapi_globs.udhcpd_conf ] in
 	()
 
 let find_lease_nolock vif =
@@ -226,6 +223,6 @@ let init () =
 			try
 				load_db_nolock ()
 			with e ->
-				info "Caught exception %s loading %s: creating new empty leases database" (Printexc.to_string e) leases_db;
+				info "Caught exception %s loading %s: creating new empty leases database" (Printexc.to_string e) !Xapi_globs.udhcpd_leases_db;
 				assigned := []
 		)

xapi.spec.in

@@ -20,6 +20,7 @@ XCP toolstack.
 %package core
 Summary: The xapi toolstack
 Group: System/Hypervisor
+Requires: busybox
 
 %description core
 This package contains the xapi toolstack.