diff options
| author | Rod Whitby <rod@whitby.id.au> | 2007-11-30 12:37:26 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2007-11-30 12:37:26 +0000 |
| commit | afe44a1b179786201362ed9c5a9e3cb93ba5d88f (patch) | |
| tree | f9caf9035c3d753b90b1daf3233baadbb405f0bd | |
| parent | e2eeb4244cee6d046602182b4d9c95bbfb18ba80 (diff) | |
| parent | df583e53b537df5d9becc184789d641ec0788c11 (diff) | |
merge of '6b94c6eeda0e3ff2069f19a1f393df67d80bebe9'
and 'f7531c375389681cc06ea3169fea009301b94267'
| -rw-r--r-- | packages/images/nslu2-minimal-image.bb | 3 | ||||
| -rw-r--r-- | packages/netbase/netbase/interfaces | 1 | ||||
| -rw-r--r-- | packages/netbase/netbase_4.21.bb | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/packages/images/nslu2-minimal-image.bb b/packages/images/nslu2-minimal-image.bb new file mode 100644 index 0000000000..db2312c613 --- /dev/null +++ b/packages/images/nslu2-minimal-image.bb @@ -0,0 +1,3 @@ +require minimal-image.bb + +INHERIT += nslu2-image diff --git a/packages/netbase/netbase/interfaces b/packages/netbase/netbase/interfaces index c9b2faf3f8..ca449168a9 100644 --- a/packages/netbase/netbase/interfaces +++ b/packages/netbase/netbase/interfaces @@ -41,6 +41,7 @@ iface wlan0 inet dhcp iface atml0 inet dhcp # Wired or wireless interfaces +auto eth0 iface eth0 inet dhcp iface eth1 inet dhcp diff --git a/packages/netbase/netbase_4.21.bb b/packages/netbase/netbase_4.21.bb index 289e9bbc05..82464d82c6 100644 --- a/packages/netbase/netbase_4.21.bb +++ b/packages/netbase/netbase_4.21.bb @@ -2,7 +2,7 @@ DESCRIPTION = "This package provides the necessary \ infrastructure for basic TCP/IP based networking." SECTION = "base" LICENSE = "GPL" -PR = "r24" +PR = "r25" inherit update-rc.d |