From 0ac3fb9c6e6556cfa733c7db37411ffb6292d7ff Mon Sep 17 00:00:00 2001 From: John Bowler Date: Sun, 3 Jul 2005 18:35:01 +0000 Subject: Make a raw, unconfigured, NSLU2 default to DHCP boot proto --- packages/openslug-init/openslug-init-0.10/initscripts/sysconfsetup | 4 +++- packages/openslug-init/openslug-init_0.10.bb | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/openslug-init/openslug-init-0.10/initscripts/sysconfsetup b/packages/openslug-init/openslug-init-0.10/initscripts/sysconfsetup index 1940b00ff8..31ff38d7ee 100644 --- a/packages/openslug-init/openslug-init-0.10/initscripts/sysconfsetup +++ b/packages/openslug-init/openslug-init-0.10/initscripts/sysconfsetup @@ -60,9 +60,11 @@ then # is removed (to be exact, the sed script selects only lines # which match one of the two above). The lan interface, which # defaults to ixp0, is changed to the correct value for openslug, - # eth0 + # 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) devio "<<$sysdev" cpb fb1,10 | sed -n '/^\[[^][]*\]$/p; s/^lan_interface=ixp0$/lan_interface=eth0/; + /^ip_addr=192\.168\.1\.77$/,/^bootproto/s/^bootproto=static$/bootproto=dhcp/; /^[-a-zA-Z0-9_][-a-zA-Z0-9_]*=/p' >/etc/default/sysconf # # The SysConf must have a hardware id, if it doesn't it has diff --git a/packages/openslug-init/openslug-init_0.10.bb b/packages/openslug-init/openslug-init_0.10.bb index 76bd00754a..bf43759aa7 100644 --- a/packages/openslug-init/openslug-init_0.10.bb +++ b/packages/openslug-init/openslug-init_0.10.bb @@ -3,7 +3,7 @@ SECTION = "console/network" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r31" +PR = "r32" SRC_URI = "file://linuxrc \ file://boot/flash \ -- cgit v1.2.3 From e97ed1e62518273ae89bdf32cc65f2caa3c050df Mon Sep 17 00:00:00 2001 From: John Bowler Date: Sun, 3 Jul 2005 18:49:38 +0000 Subject: Enable 2.6.12[.*] kernel --- conf/distro/openslug.conf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf index e4b20c0e5f..22e835e257 100644 --- a/conf/distro/openslug.conf +++ b/conf/distro/openslug.conf @@ -91,9 +91,12 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" # Select the correct versions of the kernel and modules -PREFERRED_PROVIDER_virtual/kernel ?= "openslug-kernel" +PREFERRED_PROVIDER_virtual/kernel ?= "nslu2-kernel" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" PREFERRED_VERSION_openslug-kernel ?= "2.6.11.2" +# The nslu2-kernel version is currently tracking the latest +# Change before release! +#PREFERRED_VERSION_nslu2-kernel ?= "2.6.12.2" PREFERRED_VERSION_ixp4xx-csr ?= "1.4" PREFERRED_VERSION_ixp425-eth ?= "1.1" -- cgit v1.2.3