uml: add entropy, fix names

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/Makefile b/Makefile
index be5c6d8f0ad8079b3a82be6ff56fa9742a2c67f0..0cf5f10c5dedea6ccd3ced1826c5c326e45da7e4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ stamp=@mkdir -p stamp; touch $@
 
 all:   cargo-build doc
 
-check: all rndaddtocntent-build
+check: all rndaddtoentcnt-build
 
 cargo-build: stamp/cargo-build
 
@@ -46,10 +46,10 @@ doc:        docs/html/index.html
 docs/html/index.html: docs/conf.py $(wildcard docs/*.md docs/*.rst docs/*.png)
        $(SPHINXBUILD) -M html docs docs $(SPHINXOPTS)
 
-rndaddtocntent-build: uml/rndaddtoentcnt/rndaddtoentcnt
+rndaddtoentcnt-build: uml/rndaddtoentcnt/rndaddtoentcnt
 
 clean:
        rm -rf stamp/* doc/html
        $(NAILING_CARGO) clean
 
-.PHONY: cargo-build rndaddtocntent-build all doc clean
+.PHONY: cargo-build rndaddtoentcnt-build all doc clean

diff --git a/uml/psusan-uml-inside b/uml/psusan-uml-inside
index 24658e31f462e1d786fea473728574aff7d45f76..79a38c90f0774929c9227450af9fed03a01f01ae 100755 (executable)
--- a/uml/psusan-uml-inside
+++ b/uml/psusan-uml-inside
@@ -26,5 +26,6 @@ export HOME
 cd "$HOME"
 
 dd if=random-seed of=/dev/urandom
+src/uml/rndaddtoentcnt/rndaddtoentcnt 4096 >&2
 
 exec psusan

diff --git a/uml/psusan-uml-setup b/uml/psusan-uml-setup
index 7e9da78f6d5874f004f78064d5961c622a8cac92..c249dd28bb6f640c01ce452d55b6a3f1970e97ea 100755 (executable)
--- a/uml/psusan-uml-setup
+++ b/uml/psusan-uml-setup
@@ -4,6 +4,10 @@ set -e
 mkdir -p tmp
 rm -rf tmp/uml
 mkdir -p -m2700 tmp/uml
+
+ln -s "$PWD"/target tmp/uml/target
+ln -s "${0%/*/*}" tmp/uml/src
+
 dd if=/dev/urandom of=tmp/uml/random-seed bs=1k count=4
 
 "${0%/*}"/psusan-uml-run -proxycmd "${0%/*}"/psusan-uml-psusan -N -v -v