Changeset 0928526 in mainline

Timestamp:

2008-08-04T21:15:13Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

677f620

Parents:

6e0e8c9

Message:

Boot infrastructure support for FAT16 init ramdisks.
Only amd64 so far.

Files:

• boot/arch/amd64/Makefile.inc (modified) (4 diffs)
• boot/arch/amd64/grub/menu.lst (modified) (1 diff)
• boot/boot.config (modified) (1 diff)
• uspace/app/init/init.c (modified) (3 diffs)

boot/arch/amd64/Makefile.inc

@@ -33 +33 @@
         $(USPACEDIR)/srv/devmap/devmap \
         $(USPACEDIR)/srv/rd/rd \
-        $(USPACEDIR)/srv/vfs/vfs \
-        $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
+        $(USPACEDIR)/srv/vfs/vfs
+ifeq ($(RDFMT),tmpfs)
+        INIT_TASKS += $(USPACEDIR)/srv/fs/tmpfs/tmpfs
+endif
+ifeq ($(RDFMT),fat)
+        INIT_TASKS += $(USPACEDIR)/srv/fs/fat/fat
+endif
 
 RD_TASKS = \
@@ -41 +46 @@
         $(USPACEDIR)/srv/kbd/kbd \
         $(USPACEDIR)/srv/console/console \
-        $(USPACEDIR)/srv/fs/fat/fat \
         $(USPACEDIR)/app/tetris/tetris \
         $(USPACEDIR)/app/tester/tester \
         $(USPACEDIR)/app/klog/klog \
         $(USPACEDIR)/app/cli/cli
+ifneq ($(RDFMT),tmpfs)
+        RD_TASKS += $(USPACEDIR)/srv/fs/tmpfs/tmpfs
+endif
+ifneq ($(RDFMT),fat)
+        RD_TASKS += $(USPACEDIR)/srv/fs/fat/fat
+endif
 
 build: $(BASE)/image.iso
@@ -52 +62 @@
         mkdir -p arch/$(ARCH)/iso/boot/grub
         cp arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/iso/boot/grub/
-        cp arch/$(ARCH)/grub/menu.lst arch/$(ARCH)/iso/boot/grub/
+ifneq ($(RDFMT),tmpfs)
+        cat arch/$(ARCH)/grub/menu.lst | grep -v "tmpfs" >arch/$(ARCH)/iso/boot/grub/menu.lst
+endif
+ifneq ($(RDFMT),fat)
+        cat arch/$(ARCH)/grub/menu.lst | grep -v "fat" >arch/$(ARCH)/iso/boot/grub/menu.lst
+endif
         cp $(KERNELDIR)/kernel.bin arch/$(ARCH)/iso/boot/
         for task in $(INIT_TASKS) ; do \
@@ -60 +75 @@
                 cp $$task $(USPACEDIR)/dist/sbin/ ; \
         done
+ifeq ($(RDFMT),tmpfs)
         $(BASE)/tools/mktmpfs.py 4096 $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.img
+endif
+ifeq ($(RDFMT),fat)
+        $(BASE)/tools/mkfat.sh $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.img
+endif
         mkisofs -J -r -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table -o $(BASE)/image.iso arch/$(ARCH)/iso/
 

boot/arch/amd64/grub/menu.lst

@@ -11 +11 @@
         module /boot/vfs
         module /boot/tmpfs
+        module /boot/fat
         module /boot/loader
         module /boot/initrd.img

boot/boot.config

@@ -79 +79 @@
 ! [ARCH=mips32] IMAGE (choice)
 
+# Ramdisk format
+@ "tmpfs" TMPFS image
+@ "fat" FAT16 image
+! RDFMT (choice)

uspace/app/init/init.c

@@ -52 +52 @@
 }
 
-static bool mount_tmpfs(void)
+static bool mount_fs(const char *fstype)
 {
         int rc = -1;
         
         while (rc < 0) {
-                rc = mount("tmpfs", "/", "initrd");
+                rc = mount(fstype, "/", "initrd");
                 
                 switch (rc) {
@@ -96 +96 @@
         info_print();
         sleep(5);       // FIXME
+        bool has_tmpfs = false;
+        bool has_fat = false;
         
-        if (!mount_tmpfs()) {
+        if (!(has_tmpfs = mount_fs("tmpfs")) && !(has_fat = mount_fs("fat"))) {
                 printf(NAME ": Exiting\n");
                 return -1;
@@ -110 +112 @@
         version_print();
         
-        spawn("/sbin/fat");
+        /*
+         * Spawn file system servers that were not loaded as init tasks.
+         */
+        if (!has_fat)
+                spawn("/sbin/fat");
+        if (!has_tmpfs)
+                spawn("/sbin/tmpfs");
+                
         spawn("/sbin/tetris");
         spawn("/sbin/cli");