aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArturo Filastò€ <hellais@torproject.org>2011-08-26 00:54:10 +0200
committerArturo Filastò€ <hellais@torproject.org>2011-08-26 00:54:10 +0200
commitb3f4d69254943b65a482c85a4d85b351af1e2712 (patch)
tree128d73982989e30770a339e4afd00f227960774f
parent9ac2c7a00186e1b0daf527cadf94b1f104fc3e14 (diff)
parent6657b82c3eec9026967c98961f30a0e946ba5ec9 (diff)
downloadtorouter-b3f4d69254943b65a482c85a4d85b351af1e2712.tar.gz
torouter-b3f4d69254943b65a482c85a4d85b351af1e2712.zip
Merge branch 'master' of ssh://git-rw.torproject.org/torouter
-rw-r--r--freedom-maker/README20
-rw-r--r--packages/torouter-prep/src/torouter_config.sh3
2 files changed, 20 insertions, 3 deletions
diff --git a/freedom-maker/README b/freedom-maker/README
index 215f56e..15a1c50 100644
--- a/freedom-maker/README
+++ b/freedom-maker/README
@@ -8,8 +8,8 @@ To build for a DreamPlug, use
sudo ./mk_dreamplug_rootfs
This will yield a file tree under build/dreamplug, representing the
-contents of a root file system. Get that onto a USB stick with something
-like
+contents of a root file system. Get that onto a USB stick with a Linux
+friendly file system (ext3 and not vfat) with something like
sudo mount /dev/sdc1 /media/freedom
sudo rsync -atvz --progress build/dreamplug/ /media/freedom/
@@ -19,11 +19,15 @@ Move the USB stick to the DreamPlug, and arrange to boot the existing kernel
from internal microSD pointing to our new root filesystem by interrupting the
boot to talk to U-Boot:
+ screen /dev/ttyUSB0 115200
+# Reboot the DreamPlug
+# You should see "Hit any key to stop autoboot: " - hit a key, any key
setenv x_bootargs_root root=/dev/sdc1 rootdelay=10
saveenv
reset
-The system should boot to a login prompt.
+The system should boot to a login prompt and the default password is
+'freedom' for the root user.
- - - - -
@@ -32,6 +36,16 @@ you're logged into the system booted from root on USB stick you can use:
sh /boot/copy2dream.sh
+If you choose to to reflash the device entirely you'll want to do the
+following to switch the root filesystem back to the internal microSD card:
+
+ screen /dev/ttyUSB0 115200
+# Reboot the DreamPlug
+# You should see "Hit any key to stop autoboot: " - hit a key, any key
+ setenv x_bootargs_root root=/dev/sda2 rootdelay=10
+ saveenv
+ reset
+
- - - - -
Be aware that this is an imcomplete solution for now .. you will want to at
diff --git a/packages/torouter-prep/src/torouter_config.sh b/packages/torouter-prep/src/torouter_config.sh
index e5a3391..8449eec 100644
--- a/packages/torouter-prep/src/torouter_config.sh
+++ b/packages/torouter-prep/src/torouter_config.sh
@@ -80,6 +80,9 @@ apt-get -y install ttdnsd
# Install a normal dns cache for eth1
apt-get -y install dnsmasq
+# install the best dhcp client we're gonna get in debian land
+apt-get -y install isc-dhcp-client
+
##
## Configuration stage of the script
##