Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset c40f385 in mainline


Ignore:
Timestamp:
2011-12-08T23:00:49Z (10 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master
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:
2 edited

Legend:

Unmodified
Added
Removed
  • boot/Makefile.grub

    r38650da rc40f385  
    8989                        echo "  $(MULTIBOOT_CMD) /boot/$$module" >> $(BOOT_CONFIG) ; \
    9090                else \
    91                         echo "  $(MODULE_CMD) /boot/$$module" >> $(BOOT_CONFIG) ; \
     91                        echo "  $(MODULE_CMD) /boot/$$module /boot/$$module" >> $(BOOT_CONFIG) ; \
    9292                fi \
    9393        done
  • kernel/generic/src/main/main.c

    r38650da rc40f385  
    262262         * Create the first thread.
    263263         */
    264         thread_t *kinit_thread
    265                 = thread_create(kinit, NULL, kernel, 0, "kinit", true);
     264        thread_t *kinit_thread =
     265            thread_create(kinit, NULL, kernel, 0, "kinit", true);
    266266        if (!kinit_thread)
    267267                panic("Cannot create kinit thread.");
Note: See TracChangeset for help on using the changeset viewer.