Changeset 80cd7cd in mainline for uspace/app/init/init.c

Timestamp:

2011-01-13T20:58:24Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

87e373b

Parents:

eaef141 (diff), a613fea1 (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

@@ -61 +61 @@
 
 #define DATA_FS_TYPE      "fat"
-#define DATA_DEVICE       "bd/disk0"
+#define DATA_DEVICE       "bd/ata1disk0"
 #define DATA_MOUNT_POINT  "/data"
 
@@ -273 +273 @@
         mount_tmpfs();
         
+        spawn("/srv/apic");
+        spawn("/srv/i8259");
         spawn("/srv/fhc");
         spawn("/srv/obio");