new targets: "make emu" "make upgrade"

4 files changed, 17 insertions, 2 deletions

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
+Subproject 5961303fc6e8f87e61a7abb1b4c14d24e7e3075