Skip to content

Commit

Permalink
Merge pull request #2095 from ghaerr/romfs
Browse files Browse the repository at this point in the history
[kernel] Fix mount ignoring passed device on ROM/ROMFS systems
  • Loading branch information
ghaerr authored Nov 5, 2024
2 parents 3c2b190 + aed466d commit 6ce8caa
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions elks/fs/romfs/romfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include <linuxmt/mm.h>
#include <linuxmt/string.h>
#include <linuxmt/debug.h>
#include <linuxmt/devnum.h>
#include <arch/segment.h>


Expand Down Expand Up @@ -320,6 +321,8 @@ static struct super_block * romfs_read_super (struct super_block * s, void * dat
struct romfs_super_mem rsm;
struct inode * i;

if (s->s_dev != DEV_ROM)
return NULL;
while (1) {
lock_super (s);

Expand Down
2 changes: 1 addition & 1 deletion emu86.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
exec emu86 -w 0xe0000 -f image/rom-8088.bin -w 0x80000 -f image/romfs-8088.bin ${1+"$@"}

# just built ROM version using 'make'
#exec emu86 -w 0xe0000 -f elks/arch/i86/boot/Image -w 0x80000 -f image/romfs.bin ${1+"$@"}
#exec emu86 -w 0xe0000 -f elks/arch/i86/boot/Image -w 0x80000 -f image/romfs.bin -I image/fd1440.img ${1+"$@"}

# For ELKS Full ROM Configuration:
# ELKS must be configured minimally with 'cp emu86-rom-full.config .config'
Expand Down

0 comments on commit 6ce8caa

Please sign in to comment.