Merge.

Makefile

@@ -2,7 +2,7 @@ all:
 	bazel test -c dbg //...
 	bazel build -c opt //:diskimages
 	for a in $$(dirname bazel-bin/arch/*/diskimage.img bazel-bin/arch/*/*/diskimage.img); do \
-		f=$$(basename $$a); ln -sf $$a $$f.img; done
+		f=$$(basename $$a); ln -sf $$a/diskimage.img $$f.img; done
 
 verbose:
 	bazel test -s -c dbg //...