Merge pull request #2761 from jonludlam/refresh-patch

Rebase the NVIDIA-330 patch following reindenting

scripts/0001-Workaround-for-NVIDIA-330.patch

@@ -10,14 +10,11 @@ Fri Jul 03 17:43:32 +0100
 Signed-off-by: Thomas Sanders <[email protected]>
 
 ---
- ocaml/xapi/xapi.ml | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
 diff --git a/ocaml/xapi/xapi.ml b/ocaml/xapi/xapi.ml
-index c9919df..98eaf6d 100644
+index e1f5d30..5aff754 100644
 --- a/ocaml/xapi/xapi.ml
 +++ b/ocaml/xapi/xapi.ml
-@@ -816,8 +816,17 @@ let server_init() =
+@@ -818,8 +818,17 @@ let server_init() =
 
    try
      Server_helpers.exec_with_new_task "server_init" (fun __context ->
@@ -29,12 +26,9 @@ index c9919df..98eaf6d 100644
 +      ignore_exists (fun () -> Unix.mkdir (Filename.dirname dest) 0o700);
 +      ignore_exists (fun () -> Unix.symlink source dest)
 +    in
-     Startup.run ~__context [
-     "XAPI SERVER STARTING", [], print_server_starting_message;
+         Startup.run ~__context [
+           "XAPI SERVER STARTING", [], print_server_starting_message;
 +    "NVIDIA-130 workaround", [], nvidia_130_workaround;
-     "Parsing inventory file", [], Xapi_inventory.read_inventory;
-     "Config (from file) for incoming/outgoing stunnel instances", [], set_stunnel_legacy_inv ~__context;
-     "Setting stunnel timeout", [], set_stunnel_timeout;
--- 
-1.9.1
-
+           "Parsing inventory file", [], Xapi_inventory.read_inventory;
+           "Config (from file) for incoming/outgoing stunnel instances", [], set_stunnel_legacy_inv ~__context;
+           "Setting stunnel timeout", [], set_stunnel_timeout;