* Quick hack to make HAL start properly.

svn path=/nixos/trunk/; revision=11262

upstart-jobs/dbus.nix

@@ -35,8 +35,8 @@ 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
@@ -57,6 +57,6 @@ script
         rm -f ${homeDir}/pid
         exec ${dbus}/bin/dbus-daemon --config-file=${configFile}/system.conf
     end script
-  ";
+  '';
   
 }

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 script
 
+        # !!! quick hack: wait until dbus has started
+        sleep 3
+
         mkdir -m 0755 -p /var/cache/hald
 
     end script
 
     respawn ${hal}/sbin/hald --daemon=no --verbose=yes
-  ";
+  '';
   
 }