aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/slugos-init/files
diff options
context:
space:
mode:
authorMike Westerhof <mwester@dls.net>2011-02-13 11:07:38 -0600
committerMike Westerhof <mwester@dls.net>2011-02-13 11:07:38 -0600
commitcd58f6ff853e1f96f1995314bcce7dafed8f74b2 (patch)
treea6f1053c2be7e94af66792cdfc192d1aca89eebc /recipes/slugos-init/files
parent2ecf8e932555f4b72fdf004aa4289c933f907f00 (diff)
downloadopenembedded-cd58f6ff853e1f96f1995314bcce7dafed8f74b2.tar.gz
openembedded-cd58f6ff853e1f96f1995314bcce7dafed8f74b2.tar.bz2
openembedded-cd58f6ff853e1f96f1995314bcce7dafed8f74b2.zip
SlugOS: slugos-init - No longer switch to DHCP if static IP==192.168.1.77
This behavior was confusing to users, and was a prime contributor to the "I've lost my Slug!" network problem. This fix ensures that if a user resets their NSLU2 to factory defaults, it will boot up at the expected IP address in all cases.
Diffstat (limited to 'recipes/slugos-init/files')
-rw-r--r--recipes/slugos-init/files/sysconf5
1 files changed, 3 insertions, 2 deletions
diff --git a/recipes/slugos-init/files/sysconf b/recipes/slugos-init/files/sysconf
index 6a9c70d300..8df6c903d4 100644
--- a/recipes/slugos-init/files/sysconf
+++ b/recipes/slugos-init/files/sysconf
@@ -57,13 +57,14 @@ sysconf_read(){
# slugos, eth0. The bootproto, which LinkSys sets to static in
# manufacturing, is reset to dhcp if the IP is still the
# original (192.168.1.77)
+ # Note: SlugOS 5.8 - Due to mass confusion, the bootproto is no
+ # longer changed if it is set to static with ip=192.168.1.77.
sedcmd='/^\[[^][]*\]$/p;'
# only do the ip_addr and lan_interface fixups on NSLU2
if test "$(machine)" = nslu2
then
sedcmd="$sedcmd"'
- s/^lan_interface=ixp0$/lan_interface=eth0/;
- /^ip_addr=192\.168\.1\.77$/,/^bootproto/s/^bootproto=static$/bootproto=dhcp/;'
+ s/^lan_interface=ixp0$/lan_interface=eth0/;'
fi
# always fix up the hardware addr if it is present
mac="$(config mac)"