From e6d4f095e61d0c875a11cec57302db9f2fd5838f Mon Sep 17 00:00:00 2001
From: ficus <ficus@robocracy.org>
Date: Sun, 16 Sep 2012 03:48:28 +0200
Subject: back up WIP

---
 README                                 |  9 +++++++++
 TODO                                   |  7 +------
 freedom-maker/Makefile                 |  4 ++--
 freedom-maker/mk_dreamplug_rootfs      | 24 ++++++++++++++++++++----
 packages/README                        |  7 +++----
 packages/torouter-web/debian/changelog |  6 ++++++
 6 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/README b/README
index 7522bf6..8ba5f55 100644
--- a/README
+++ b/README
@@ -22,3 +22,12 @@ To create a Torouter from this repository you'll want to clone it:
 Please see the freedom-maker/README if you wish to create a bootable USB disk.
 You will want a USB disk and the DreamPlug JTAG for reflashing, reinstalling,
 and development related activities.
+
+-----------------------------------------------------------------------------
+
+If you wish to turn a DreamPlug into a Torouter simply follow these steps:
+
+scp torouter_easy_setup.sh DreamPlug:/tmp/
+ssh DreamPlug torouter_easy_setup.sh
+
+The DreamPlug should now be configured as a Torouter.
diff --git a/TODO b/TODO
index 2dca3b7..1a13573 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1 @@
-The main thing remaining to be done is to produce a USB disk or a script used in conjunction with a usb disk
-that when run on a DreamPlug will preare the system as expected. We should be
-able to produce a Torouter with only a single command.
-
-Everything else is bug hunting and improving the web ui.
-
+- fix signing key for torrouter.torproject.org (should have a keyring .deb)
diff --git a/freedom-maker/Makefile b/freedom-maker/Makefile
index 5adc490..4b5a7f7 100644
--- a/freedom-maker/Makefile
+++ b/freedom-maker/Makefile
@@ -8,11 +8,11 @@ MACHINE = dreamplug
 DESTINATION = card
 BUILD = $(MACHINE)-$(ARCHITECTURE)-$(DESTINATION)
 BUILD_DIR = build/$(ARCHITECTURE)
-MOUNTPOINT = /media/freedom
+MOUNTPOINT = /media/
 BOOTPOINT = $(MOUNTPOINT)/boot
 DEVICE = /dev/sdb
 TODAY = `date +%Y.%m%d`
-NAME = freedombox-unstable_$(TODAY)_$(BUILD)
+NAME = torouter-unstable_$(TODAY)_$(BUILD)
 IMAGE = $(NAME).img
 ARCHIVE = $(NAME).tar.bz2
 LOOP = /dev/loop0
diff --git a/freedom-maker/mk_dreamplug_rootfs b/freedom-maker/mk_dreamplug_rootfs
index 5b56e08..bc75855 100755
--- a/freedom-maker/mk_dreamplug_rootfs
+++ b/freedom-maker/mk_dreamplug_rootfs
@@ -41,17 +41,17 @@ then
     architecture=$1
 fi
 
-config=multistrap-configs/fbx-$architecture.conf
+config=multistrap-configs/torouter-$architecture.conf
 if [ -n "$2" ]
 then
     config=$2
 fi
 
 # users
-hostname='freedombox'
+hostname='torouter'
 rootpassword='freedom'
 user='fbx'
-userpassword='frdm'
+userpassword='freedom'
 export hostname
 export rootpassword
 export user
@@ -71,6 +71,12 @@ export tmpdir
 export pkgcache
 export homedir
 
+# clear any old cruft
+if (mount | grep $target/var/cache/apt) 
+then
+    umount $target/var/cache/apt/
+fi
+
 # make the directories we'll need.
 mkdir -p $target
 rm -rf $target/*
@@ -82,7 +88,9 @@ mkdir -p $target/usr/bin
 
 # multistrap
 echo "Multistrapping..."
-multistrap -f $config -d $target
+# XXX: DEATH: work around torrouter.torproject.org GPG key issue
+# multistrap -f $config -d $target
+multistrap --no-auth -f $config -d $target
 rm -f $target/etc/apt/sources.list.d/multistrap-debian.list
 
 # un-do the bind mount so we don't trip over it later
@@ -95,7 +103,15 @@ rsync -av $source/ $target
 # add projects to the image to make it a useful FreedomBox.
 bin/projects
 
+# torouter!
+echo "Copying torouter-specific files..."
+# Override the above stuff - we know better
+cp ../packages/torouter-prep/configs/interfaces $target/etc/network/interfaces
+# Stop the libertas module from loading
+cp ../packages/torouter-prep/configs/modprobe.d-blacklist.conf $target/etc/modprobe.d/blacklist.conf
+
 # cleanup and finalize the image so it boots correctly.
+echo "Finalizing..."
 bin/finalize
 
 # finish!
diff --git a/packages/README b/packages/README
index ad953f6..0e357ee 100644
--- a/packages/README
+++ b/packages/README
@@ -1,6 +1,5 @@
-If you wish to turn a DreamPlug into a Torouter simply follow these steps:
 
-scp torouter_easy_setup.sh DreamPlug:/tmp/
-ssh DreamPlug torouter_easy_setup.sh
+= HOWTO Build All Packages (on debian) = 
 
-The DreamPlug should now be configured as a Torouter.
+Just run "make"; you'll probably need at least devscripts, debhelper, python,
+and build-essentials.
diff --git a/packages/torouter-web/debian/changelog b/packages/torouter-web/debian/changelog
index 0dda21c..3522869 100644
--- a/packages/torouter-web/debian/changelog
+++ b/packages/torouter-web/debian/changelog
@@ -1,3 +1,9 @@
+torouter-tui (0.0.1-2) unstable; urgency=low
+
+  * Fix python-daemon dependancy problem
+
+ -- Bryan Newbold <bnewbold@robocracy.org>  Tue, 11 Sep 2012 14:47:35 +0200
+
 torouter-tui (0.0.1-1) unstable; urgency=low
 
   * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>
-- 
cgit v1.2.3