From 7a5f63c4818bdaa9589ebb0564af8c4edb4dcdc3 Mon Sep 17 00:00:00 2001
From: Andrew Cady <d@cryptonomic.net>
Date: Tue, 23 Feb 2021 20:55:34 -0500
Subject: new targets: "make emu" "make upgrade"

---
 .gitmodules         | 3 +++
 Makefile            | 9 +++++++++
 partitions/Makefile | 7 +++++--
 tuntox              | 1 +
 4 files changed, 18 insertions(+), 2 deletions(-)
 create mode 160000 tuntox

diff --git a/.gitmodules b/.gitmodules
index fa1f7a0..502863e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,3 +10,6 @@
 [submodule "cryptonomic-dyndns-server"]
 	path = cryptonomic-dyndns-server
 	url = d@cryptonomic.net:public_git/cryptonomic-dyndns-server.git
+[submodule "tuntox"]
+	path = tuntox
+	url = ./tuntox
diff --git a/Makefile b/Makefile
index 45a122f..58b7aa6 100644
--- a/Makefile
+++ b/Makefile
@@ -348,5 +348,14 @@ install-stamp: install-bin-programs samizdat-paths.sh ${compiled_programs}
 	$(CP) ${isolinux_files} ${instdir}${samizdat_isolinux_dir}
 	touch $@
 
+emu:
+	make -C partitions emu
+
 bootclean:
 	rm -f samizdat.disk.img boot-disk.template.img boot-disk.img
+
+upgrade:
+	make install-submodules
+	make install
+	./src/mkinitramfs-samizdat
+	make key
diff --git a/partitions/Makefile b/partitions/Makefile
index da25615..cf8ac28 100644
--- a/partitions/Makefile
+++ b/partitions/Makefile
@@ -6,9 +6,12 @@ all: whole.img
 whole.img:
 	partvi
 
-.PHONY: usb
+.PHONY: usb emu
 usb: whole.img
-	usb=$$(usb) && dd status=progress if=$< of="$$usb"
+	usb=$$(usb) && dd status=progress if="$<" of="$$usb"
+
+emu: whole.img
+	qemu-system-x86_64 -m 800 -enable-kvm -boot c "$<"
 
 clean:
 	rm -rf _build whole.img
diff --git a/tuntox b/tuntox
new file mode 160000
index 0000000..5961303
--- /dev/null
+++ b/tuntox
@@ -0,0 +1 @@
+Subproject commit 5961303fc6e8f87e61a7abb1b4c14d24e7e30758
-- 
cgit v1.2.3