Changeset c40f385 in mainline

Timestamp:

2011-12-08T23:00:49Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

89128f3, db8a034

Parents:

38650da (diff), 6f20277 (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:

GRUB 2 does not pass the module filename (path) as the module command line, therefore the filename has to be repeated in grub.cfg

Files:

• boot/Makefile.grub (modified) (1 diff)
• kernel/generic/src/main/main.c (modified) (1 diff)

boot/Makefile.grub

@@ -89 +89 @@
                         echo "  $(MULTIBOOT_CMD) /boot/$$module" >> $(BOOT_CONFIG) ; \
                 else \
-                        echo "  $(MODULE_CMD) /boot/$$module" >> $(BOOT_CONFIG) ; \
+                        echo "  $(MODULE_CMD) /boot/$$module /boot/$$module" >> $(BOOT_CONFIG) ; \
                 fi \
         done

kernel/generic/src/main/main.c

@@ -262 +262 @@
          * Create the first thread.
          */
-        thread_t *kinit_thread
-                = thread_create(kinit, NULL, kernel, 0, "kinit", true);
+        thread_t *kinit_thread =
+            thread_create(kinit, NULL, kernel, 0, "kinit", true);
         if (!kinit_thread)
                 panic("Cannot create kinit thread.");