[vfs] Fix VFS and add the initrd to the disk image and grub menu

This commit is contained in:
Kevin Lange 2011-01-22 01:22:46 -06:00
parent a4050593b5
commit f6c73d0229
5 changed files with 4 additions and 3 deletions

View File

@ -10,6 +10,7 @@ install: kernel
cp bootdisk.src.img bootdisk.img
mount bootdisk.img /mnt -o loop
cp kernel /mnt/kernel
cp initrd /mnt/initrd
umount /mnt
cp kernel /boot/toaruos-kernel

Binary file not shown.

View File

@ -1,7 +1,7 @@
include ../Makefile.inc
.PHONY: all clean install core
all: gdt.o idt.o irq.o isrs.o kbd.o kprintf.o timer.o vga.o mem.o panic.o alloc.o
all: gdt.o idt.o irq.o isrs.o kbd.o kprintf.o timer.o vga.o mem.o panic.o alloc.o vfs.o
%.o: %.c
${CC} ${CFLAGS} -I../include -c -o $@ $<

View File

@ -11,7 +11,7 @@
typedef uint32_t (*read_type_t)(struct fs_node*, uint32_t, uint32_t, uint8_t *);
typedef uint32_t (*write_type_t)(struct fs_node*, uint32_t, uint32_t, uint8_t *);
typedef void (*open_type_t)(struct fs_node*);
typedef void (*open_type_t)(struct fs_node*, uint8_t read, uint8_t write);
typedef void (*close_type_t)(struct fs_node*);
typedef struct dirent * (*readdir_type_t)(struct fs_node*, uint32_t);
typedef struct fs_node * (*finddir_type_t)(struct fs_node*, char *name);
@ -39,7 +39,7 @@ typedef struct fs_node {
struct fs_node *ptr;
} fs_node_t;
extern *fs_root = 0;
extern fs_node_t *fs_root;
uint32_t read_fs(fs_node_t *node, uint32_t offset, uint32_t size, uint8_t *buffer);
uint32_t write_fs(fs_node_t *node, uint32_t offset, uint32_t size, uint8_t *buffer);

BIN
initrd Normal file

Binary file not shown.