aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/slugos-init
diff options
context:
space:
mode:
Diffstat (limited to 'recipes/slugos-init')
-rw-r--r--recipes/slugos-init/files/sysconf5
-rw-r--r--recipes/slugos-init/slugos-init_5.0.bb2
2 files changed, 4 insertions, 3 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)"
diff --git a/recipes/slugos-init/slugos-init_5.0.bb b/recipes/slugos-init/slugos-init_5.0.bb
index 5b823b3d32..dcf184aae8 100644
--- a/recipes/slugos-init/slugos-init_5.0.bb
+++ b/recipes/slugos-init/slugos-init_5.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
LICENSE = "GPL"
DEPENDS = "base-files devio"
RDEPENDS_${PN} = "busybox devio"
-PR = "r14"
+PR = "r15"
SRC_URI = "file://boot/flash \
file://boot/disk \