aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorficus <ficus@robocracy.org>2012-11-23 04:05:00 +0100
committerficus <ficus@robocracy.org>2012-11-23 04:05:00 +0100
commit04c6a9ea0ec9d589994e141185690ac7d843ba25 (patch)
tree7f61ab67aa263259c312bfa7fce130eb05152c17
parent082711b5cfc3e5a73e1144c628fcf91b7433c8a3 (diff)
downloadtorouter-live-04c6a9ea0ec9d589994e141185690ac7d843ba25.tar.gz
torouter-live-04c6a9ea0ec9d589994e141185690ac7d843ba25.zip
auto-networking now works
-rw-r--r--config/includes.chroot/etc/network/interfaces2
-rw-r--r--doc/dreamplug.txt4
2 files changed, 3 insertions, 3 deletions
diff --git a/config/includes.chroot/etc/network/interfaces b/config/includes.chroot/etc/network/interfaces
index 07ad7f5..3787ff9 100644
--- a/config/includes.chroot/etc/network/interfaces
+++ b/config/includes.chroot/etc/network/interfaces
@@ -27,7 +27,7 @@ iface eth1 inet static
pre-down /etc/init.d/dnsmasq_lan stop
# The magic Tor wireless network
-auto uap0
+# *NOT* auto; gets configured by eth0 post-*
iface uap0 inet static
address 172.16.23.1
netmask 255.255.255.0
diff --git a/doc/dreamplug.txt b/doc/dreamplug.txt
index fd72444..f243f19 100644
--- a/doc/dreamplug.txt
+++ b/doc/dreamplug.txt
@@ -33,7 +33,7 @@ The desired u-boot configuration is:
x_bootcmd_initrd ext2load usb 1:1 0x6900000 live/uInitrd
x_bootargs_root root=/dev/sdb1 rootdelay=4
x_bootargs_console console=ttyS0,115200
- x_bootargs boot=live config username=torouter hostname=torouter live-media=/dev/sdb1 live-media-timeout=10 debug plainroot
+ x_bootargs boot=live config username=torouter hostname=torouter live-media=/dev/sdb1 live-media-timeout=10 debug plainroot nonetworking
HOWTO: flash and configure u-boot
@@ -61,7 +61,7 @@ file size changes from exactly 196076 bytes):
setenv x_bootcmd_initrd ext2load usb 1:1 0x6900000 live/uInitrd
setenv x_bootargs_root root=/dev/sdb1 rootdelay=4
setenv x_bootargs_console console=ttyS0,115200
- setenv x_bootargs boot=live config username=torouter hostname=torouter live-media=/dev/sdb1 live-media-timeout=10 debug plainroot
+ setenv x_bootargs boot=live config username=torouter hostname=torouter live-media=/dev/sdb1 live-media-timeout=10 debug plainroot nonetworking
saveenv
reset