--- linux/Makefile	2018/04/24 18:10:21	1.1.1.10
+++ linux/Makefile	2018/04/24 18:11:55	1.1.1.11
@@ -34,6 +34,9 @@ KEYBOARD = -DKBD_FINNISH -DKBDFLAGS=0
 # KEYBOARD = -DKBD_DK -DKBDFLAGS=0
 # KEYBOARD = -DKBD_DK_LATIN1 -DKBDFLAGS=0x9F
 # KEYBOARD = -DKBD_DVORAK -DKBDFLAGS=0
+# KEYBOARD = -DKBD_SG -DKBDFLAGS=0
+# KEYBOARD = -DKBD_SG_LATIN1 -DKBDFLAGS=0x9F
+# KEYBOARD = -DKDB_NO
 
 #
 # comment this line if you don't want the emulation-code
@@ -57,6 +60,14 @@ CFLAGS =-Wall -O6 -fomit-frame-pointer
 AS86	=as86 -0 -a
 LD86	=ld86 -0
 
+#
+# If you want to preset the SVGA mode, uncomment the next line and
+# set SVGA_MODE to whatever number you want.
+# Set it to -DSVGA_MODE=NORMAL_VGA if you just want the EGA/VGA mode.
+# The number is the same as you would ordinarily press at bootup.
+#
+#SVGA_MODE=	-DSVGA_MODE=1
+
 AS	=as
 LD	=ld
 HOSTCC	=gcc -static
@@ -66,7 +77,7 @@ CPP	=$(CC) -E
 AR	=ar
 
 ARCHIVES	=kernel/kernel.o mm/mm.o fs/fs.o net/net.o
-FILESYSTEMS	=fs/minix/minix.o fs/ext/ext.o
+FILESYSTEMS	=fs/minix/minix.o fs/ext/ext.o fs/msdos/msdos.o
 DRIVERS		=kernel/blk_drv/blk_drv.a kernel/chr_drv/chr_drv.a \
 		 kernel/blk_drv/scsi/scsi.a
 MATH		=kernel/math/math.a
@@ -84,12 +95,12 @@ KERNELHDRS	=/usr/src/linux/include
 
 all:	Version Image
 
-subdirs: dummy
-	for i in $(SUBDIRS); do (cd $$i; $(MAKE)); done
+linuxsubdirs: dummy
+	@for i in $(SUBDIRS); do (cd $$i; echo $$i; $(MAKE)) || exit; done
 
 Version:
 	@./makever.sh
-	@echo \#define UTS_RELEASE \"0.96c-`cat .version`\" > include/linux/config_rel.h
+	@echo \#define UTS_RELEASE \"0.97-`cat .version`\" > include/linux/config_rel.h
 	@echo \#define UTS_VERSION \"`date +%D`\" > include/linux/config_ver.h
 	touch include/linux/config.h
 
@@ -101,7 +112,7 @@ Image: boot/bootsect boot/setup tools/sy
 	sync
 
 disk: Image
-	dd bs=8192 if=Image of=/dev/PS0
+	dd bs=8192 if=Image of=/dev/fd0
 
 tools/build: tools/build.c
 	$(HOSTCC) $(CFLAGS) \
@@ -109,7 +120,7 @@ tools/build: tools/build.c
 
 boot/head.o: boot/head.s
 
-tools/system:	boot/head.o init/main.o subdirs
+tools/system:	boot/head.o init/main.o linuxsubdirs
 	$(LD) $(LDFLAGS) -M boot/head.o init/main.o \
 		$(ARCHIVES) \
 		$(FILESYSTEMS) \
@@ -123,7 +134,7 @@ boot/setup: boot/setup.s
 	$(LD86) -s -o boot/setup boot/setup.o
 
 boot/setup.s:	boot/setup.S include/linux/config.h
-	$(CPP) -traditional boot/setup.S -o boot/setup.s
+	$(CPP) -traditional $(SVGA_MODE) boot/setup.S -o boot/setup.s
 
 boot/bootsect.s:	boot/bootsect.S include/linux/config.h
 	$(CPP) -traditional boot/bootsect.S -o boot/bootsect.s
@@ -132,6 +143,9 @@ boot/bootsect:	boot/bootsect.s
 	$(AS86) -o boot/bootsect.o boot/bootsect.s
 	$(LD86) -s -o boot/bootsect boot/bootsect.o
 
+fs: dummy
+	$(MAKE) linuxsubdirs SUBDIRS=fs
+
 clean:
 	rm -f Image System.map tmp_make core boot/bootsect boot/setup \
 		boot/bootsect.s boot/setup.s init/main.s
@@ -146,18 +160,19 @@ depend dep:
 	sed '/\#\#\# Dependencies/q' < Makefile > tmp_make
 	for i in init/*.c;do echo -n "init/";$(CPP) -M $$i;done >> tmp_make
 	cp tmp_make Makefile
-	for i in $(SUBDIRS); do (cd $$i; $(MAKE) dep); done
+	for i in $(SUBDIRS); do (cd $$i; $(MAKE) dep) || exit; done
 
 dummy:
 
 ### Dependencies:
-init/main.o : init/main.c /usr/src/linux/include/stddef.h /usr/src/linux/include/stdarg.h \
-  /usr/src/linux/include/time.h /usr/src/linux/include/sys/types.h /usr/src/linux/include/asm/system.h \
-  /usr/src/linux/include/asm/io.h /usr/src/linux/include/linux/fcntl.h /usr/src/linux/include/linux/config.h \
-  /usr/src/linux/include/linux/config_rel.h /usr/src/linux/include/linux/config_ver.h \
-  /usr/src/linux/include/linux/config.dist.h /usr/src/linux/include/linux/sched.h \
-  /usr/src/linux/include/linux/head.h /usr/src/linux/include/linux/fs.h /usr/src/linux/include/sys/dirent.h \
-  /usr/src/linux/include/limits.h /usr/src/linux/include/sys/vfs.h /usr/src/linux/include/linux/mm.h \
-  /usr/src/linux/include/linux/kernel.h /usr/src/linux/include/signal.h /usr/src/linux/include/sys/param.h \
-  /usr/src/linux/include/sys/time.h /usr/src/linux/include/sys/resource.h /usr/src/linux/include/linux/tty.h \
-  /usr/src/linux/include/termios.h /usr/src/linux/include/linux/unistd.h 
+init/main.o : init/main.c /usr/src/linux/include/stdarg.h /usr/src/linux/include/time.h \
+  /usr/src/linux/include/asm/system.h /usr/src/linux/include/asm/io.h /usr/src/linux/include/linux/types.h \
+  /usr/src/linux/include/linux/fcntl.h /usr/src/linux/include/linux/config.h /usr/src/linux/include/linux/config_rel.h \
+  /usr/src/linux/include/linux/config_ver.h /usr/src/linux/include/linux/config.dist.h \
+  /usr/src/linux/include/linux/sched.h /usr/src/linux/include/linux/head.h /usr/src/linux/include/linux/fs.h \
+  /usr/src/linux/include/linux/limits.h /usr/src/linux/include/linux/wait.h /usr/src/linux/include/linux/dirent.h \
+  /usr/src/linux/include/linux/vfs.h /usr/src/linux/include/linux/minix_fs_sb.h \
+  /usr/src/linux/include/linux/ext_fs_sb.h /usr/src/linux/include/linux/msdos_fs_sb.h \
+  /usr/src/linux/include/linux/mm.h /usr/src/linux/include/linux/kernel.h /usr/src/linux/include/linux/signal.h \
+  /usr/src/linux/include/linux/time.h /usr/src/linux/include/linux/param.h /usr/src/linux/include/linux/resource.h \
+  /usr/src/linux/include/linux/tty.h /usr/src/linux/include/linux/termios.h /usr/src/linux/include/linux/unistd.h