commit 3ea39b588da17b93f9d50ea134890bc25e4fd0a9
from: Benjamin Stürz <benni@stuerz.xyz>
date: Wed Nov 16 20:11:39 2022 UTC

Minor changes

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>

commit - cfbb5b1b813c421d5044d1be3b9c05f0a324375b
commit + 3ea39b588da17b93f9d50ea134890bc25e4fd0a9
blob - 9a252fec0b73d338f4b657ab5b1f7df6392961e5
blob + 777c22b9ed12b930deb8833b52f944ed6a5163fb
--- Makefile
+++ Makefile
@@ -16,8 +16,8 @@ remote-flash: build/floppy.img
 	scp $< data/flash $(FLASHER_SSH):/tmp/
 	ssh $(FLASHER_SSH) sh /tmp/flash /tmp/floppy.img $(FLASHER_DEV)
 
-upload:
-	nc -q 0 $(LOADER_HOST) 1234 < build/stage2.img
+upload: build/stage2.img
+	nc -q 0 $(LOADER_HOST) 1234 < $<
 
 save-configs:
 	cp -v build/linux/.config data/kconfig
@@ -209,7 +209,7 @@ build/.stamp.rootfs: build/.stamp.busybox build/.stamp
 	[ -e "$(ROOTFS)/dev/null" ] || $(SUDO) mknod $(ROOTFS)/dev/null c 1 3
 	touch $@
 
-build/.stamp.stage2: build/.stamp.linux
+build/.stamp.stage2: build/.stamp.linux $(IMAGE)
 	@mkdir -p $(STAGE2)/sbin
 	$(MAKE) -C build/linux ARCH=$(ARCH) CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(STAGE2) modules_install
 	cp build/kexec-tools/build/sbin/kexec $(STAGE2)/sbin/
blob - 93ce414e168d0e6517b0841a6580f33ed73f918f
blob + 932d9dfb5908475c1c9b4e7e32d834f337f1cb08
--- config.mk
+++ config.mk
@@ -37,4 +37,4 @@ SIZE=1440
 #SIZE=2880
 
 # Image
-IMAGE=kernel.bin
+IMAGE=../myos/kernel.bin
blob - 349b64fe80bf5b28b4f796da231f9dbfbce94387
blob + 5b24e4f0686c9c297928e2e4523e62cdc3a9298e
--- data/initrd/etc/rc
+++ data/initrd/etc/rc
@@ -2,4 +2,9 @@
 mount -t proc none /proc
 mount -t sysfs none /sys
 
-/bin/sh
+/boot &
+sleep 1
+
+while true; do
+	/bin/sh
+done
blob - ad13d3008c1ecca33228684fcee928a160dc1471 (mode 120000)
blob + /dev/null
--- kernel.bin
+++ /dev/null
@@ -1 +0,0 @@
-../myos/kernel.bin
\ No newline at end of file