From 9389f79a2e66551bf84bd4caa781a352ccf6bf95 Mon Sep 17 00:00:00 2001 From: Neale Pickett Date: Wed, 17 Aug 2011 14:45:07 -0600 Subject: [PATCH] Fix up inferno package, add poster --- doc/2011-09-Inferno/disco-gal.svg | 76 ++++++ doc/2011-09-Inferno/disco-guy.svg | 246 +++++++++++++++++++ doc/2011-09-Inferno/poster.svg | 341 +++++++++++++++++++++++++++ packages/inferno/inferno.mk | 1 - packages/inferno/service/httpd/run | 4 +- packages/inferno/service/inferno/run | 9 +- 6 files changed, 670 insertions(+), 7 deletions(-) create mode 100644 doc/2011-09-Inferno/disco-gal.svg create mode 100644 doc/2011-09-Inferno/disco-guy.svg create mode 100644 doc/2011-09-Inferno/poster.svg diff --git a/doc/2011-09-Inferno/disco-gal.svg b/doc/2011-09-Inferno/disco-gal.svg new file mode 100644 index 0000000..07a69ef --- /dev/null +++ b/doc/2011-09-Inferno/disco-gal.svg @@ -0,0 +1,76 @@ + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/doc/2011-09-Inferno/disco-guy.svg b/doc/2011-09-Inferno/disco-guy.svg new file mode 100644 index 0000000..537fe83 --- /dev/null +++ b/doc/2011-09-Inferno/disco-guy.svg @@ -0,0 +1,246 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/doc/2011-09-Inferno/poster.svg b/doc/2011-09-Inferno/poster.svg new file mode 100644 index 0000000..637cd1d --- /dev/null +++ b/doc/2011-09-Inferno/poster.svg @@ -0,0 +1,341 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Tracer + Inferno + + + + + + + + diff --git a/packages/inferno/inferno.mk b/packages/inferno/inferno.mk index c15a101..192765f 100644 --- a/packages/inferno/inferno.mk +++ b/packages/inferno/inferno.mk @@ -24,6 +24,5 @@ inferno-install: $(INFERNO_BUILDDIR)/build inferno-clean: rm -rf $(INFERNO_PKGDIR) $(INFERNO_BUILDDIR) - $(MAKE) -C packages/inferno/src clean PACKAGES += inferno \ No newline at end of file diff --git a/packages/inferno/service/httpd/run b/packages/inferno/service/httpd/run index b3291e7..e04f932 100755 --- a/packages/inferno/service/httpd/run +++ b/packages/inferno/service/httpd/run @@ -1,8 +1,8 @@ -#! /bin/sh +#! /bin/sh -e exec 2>&1 cd /var/www -exec tcpsvd -u localhost 0 80 /opt/inferno/bin/fnord-idx . . +exec tcpsvd -l localhost 0 80 /opt/inferno/bin/fnord-idx . . diff --git a/packages/inferno/service/inferno/run b/packages/inferno/service/inferno/run index 162df77..e926337 100755 --- a/packages/inferno/service/inferno/run +++ b/packages/inferno/service/inferno/run @@ -1,11 +1,12 @@ -#! /bin/sh +#! /bin/sh -e exec 2>&1 mkdir -p /mnt/inferno -mount -o ro LABEL=inferno /mnt/inferno -ln -s /mnt/inferno /var/www +fgrep -q /mnt/inferno /proc/mounts || mount -o ro LABEL=inferno /mnt/inferno +test -e /var/www || ln -s /mnt/inferno /var/www -ip addr add eth0 10.0.0.2/24 +ip addr add 10.0.0.2/24 dev eth0 +ip link set dev eth0 up exec inotifyd true $PWD