From 3703cd13a2bc3d0f8ddde4ffebf7150342fe360c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 22 Mar 2008 16:05:01 +0000
Subject: [PATCH] * Quick hack to make HAL start properly.

svn path=/nixos/trunk/; revision=11262
---
 upstart-jobs/dbus.nix | 32 ++++++++++++++++----------------
 upstart-jobs/hal.nix  | 21 ++++++++++++---------
 2 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/upstart-jobs/dbus.nix b/upstart-jobs/dbus.nix
index a2893d42ecf..a8ce1fddf06 100644
--- a/upstart-jobs/dbus.nix
+++ b/upstart-jobs/dbus.nix
@@ -35,28 +35,28 @@ in
   
   extraPath = [dbus.daemon dbus.tools];
   
-  job = "
-description \"D-Bus system message bus daemon\"
+  job = ''
+    description "D-Bus system message bus daemon"
 
-start on startup
-stop on shutdown
+    start on startup
+    stop on shutdown
 
-start script
+    start script
 
-    mkdir -m 0755 -p ${homeDir}
-    chown messagebus ${homeDir}
+        mkdir -m 0755 -p ${homeDir}
+        chown messagebus ${homeDir}
 
-    mkdir -m 0755 -p /var/lib/dbus
-    ${dbus.tools}/bin/dbus-uuidgen --ensure
+        mkdir -m 0755 -p /var/lib/dbus
+        ${dbus.tools}/bin/dbus-uuidgen --ensure
 
-end script
+    end script
 
-respawn
+    respawn
 
-script
-    rm -f ${homeDir}/pid
-    exec ${dbus}/bin/dbus-daemon --config-file=${configFile}/system.conf
-end script
-  ";
+    script
+        rm -f ${homeDir}/pid
+        exec ${dbus}/bin/dbus-daemon --config-file=${configFile}/system.conf
+    end script
+  '';
   
 }
diff --git a/upstart-jobs/hal.nix b/upstart-jobs/hal.nix
index 0770ba3ce31..d6094d5bfa3 100644
--- a/upstart-jobs/hal.nix
+++ b/upstart-jobs/hal.nix
@@ -18,19 +18,22 @@
 
   extraPath = [hal];
   
-  job = "
-description \"HAL daemon\"
+  job = ''
+    description "HAL daemon"
 
-start on dbus
-stop on shutdown
+    start on dbus
+    stop on shutdown
 
-start script
+    start script
 
-    mkdir -m 0755 -p /var/cache/hald
+        # !!! quick hack: wait until dbus has started
+        sleep 3
 
-end script
+        mkdir -m 0755 -p /var/cache/hald
 
-respawn ${hal}/sbin/hald --daemon=no --verbose=yes
-  ";
+    end script
+
+    respawn ${hal}/sbin/hald --daemon=no --verbose=yes
+  '';
   
 }