Skip to content

Commit aed466d

Browse files
committed
[kernel] Fix mount ignoring passed device on ROM/ROMFS systems
1 parent 3c2b190 commit aed466d

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

elks/fs/romfs/romfs.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <linuxmt/mm.h>
1111
#include <linuxmt/string.h>
1212
#include <linuxmt/debug.h>
13+
#include <linuxmt/devnum.h>
1314
#include <arch/segment.h>
1415

1516

@@ -320,6 +321,8 @@ static struct super_block * romfs_read_super (struct super_block * s, void * dat
320321
struct romfs_super_mem rsm;
321322
struct inode * i;
322323

324+
if (s->s_dev != DEV_ROM)
325+
return NULL;
323326
while (1) {
324327
lock_super (s);
325328

emu86.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
exec emu86 -w 0xe0000 -f image/rom-8088.bin -w 0x80000 -f image/romfs-8088.bin ${1+"$@"}
1717

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

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

0 commit comments

Comments
 (0)