From 3e04540bf7f55debe92d87ede67541823be6619e Mon Sep 17 00:00:00 2001
From: "K. Lange" <klange@toaruos.org>
Date: Tue, 11 Dec 2018 21:00:48 +0900
Subject: [PATCH] boot: switch back to ext2 ramdisks while an issue is
 investigated

---
 Makefile      | 8 ++++++--
 boot/cstuff.c | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 2bf18b80..60d846f9 100644
--- a/Makefile
+++ b/Makefile
@@ -217,8 +217,12 @@ base/bin/%.sh: apps/%.sh
 	chmod +x $@
 
 # Ramdisk
-fatbase/ramdisk.img: ${RAMDISK_FILES} $(shell find base) Makefile util/createramdisk.py | dirs
-	python3 util/createramdisk.py
+
+util/devtable: ${RAMDISK_FILES} $(shell find base) util/update-devtable.py
+	util/update-devtable.py
+
+fatbase/ramdisk.img: ${RAMDISK_FILES} $(shell find base) Makefile util/devtable | dirs
+	genext2fs -B 4096 -d base -D util/devtable -U -b `util/calc-size.sh` -N 2048 $@
 
 # CD image
 
diff --git a/boot/cstuff.c b/boot/cstuff.c
index 9df7359d..06ec465d 100644
--- a/boot/cstuff.c
+++ b/boot/cstuff.c
@@ -34,7 +34,7 @@ EFI_HANDLE ImageHandleIn;
 #define LINK_TEXT "https://toaruos.org - https://gitlab.com/toaruos"
 
 /* Boot command line strings */
-#define DEFAULT_ROOT_CMDLINE "root=/dev/ram0 root_type=tar "
+#define DEFAULT_ROOT_CMDLINE "root=/dev/ram0,nocache root_type=ext2 "
 #define DEFAULT_GRAPHICAL_CMDLINE "start=live-session "
 #define DEFAULT_SINGLE_CMDLINE "start=terminal\037-F "
 #define DEFAULT_TEXT_CMDLINE "start=--vga "