Changeset c2a6983 in mainline for uspace/app/init/init.c

Timestamp:

2013-10-13T20:59:33Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

12d6c98

Parents:

820104d (diff), 39bcc99 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/app/init/init.c (modified) (2 diffs)

uspace/app/init/init.c

@@ -360 +360 @@
         srv_start("/srv/udp");
         srv_start("/srv/dnsrsrv");
+        srv_start("/srv/dhcp");
+        srv_start("/srv/nconfsrv");
         
         srv_start("/srv/clipboard");
@@ -384 +386 @@
         srv_start("/srv/input", HID_INPUT);
         srv_start("/srv/output", HID_OUTPUT);
+        srv_start("/srv/hound");
         
         int rc = compositor(HID_INPUT, HID_COMPOSITOR_SERVER);