Changeset cebab351 in mainline

Timestamp:

2008-08-15T15:38:29Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

3d7e19f

Parents:

874a0e8

Message:

Enable booting from FAT on ia32.

Location:

boot/arch/ia32

Files:

• Makefile.inc (modified) (3 diffs)
• grub/menu.lst (modified) (1 diff)

boot/arch/ia32/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 = \
@@ -52 +57 @@
         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 +70 @@
                 cp $$task $(USPACEDIR)/dist/sbin/ ; \
         done
+ifeq ($(RDFMT),tmpfs)
         $(BASE)/tools/mktmpfs.py $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.fs
+endif
+ifeq ($(RDFMT),fat)
+        $(BASE)/tools/mkfat.sh $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.fs
+endif
         $(BASE)/tools/mkhord.py 4096 arch/$(ARCH)/iso/boot/initrd.fs arch/$(ARCH)/iso/boot/initrd.img
         rm arch/$(ARCH)/iso/boot/initrd.fs

boot/arch/ia32/grub/menu.lst

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