Added patch for udhcp support. Patch by Stefan Nickl <snickl@snickl.freaks.de> and...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@450 67a159dc-881f-0410-a524-ba9dfbe2cb84

diff --git a/ChangeLog b/ChangeLog
index e38affe3fbf96b600f0955822bbdf9e421b316c7..83def010dfe4da9c3340ca399793dacfdd70d3d8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 2006-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org> gen_initramfs.sh,
+  generic/initrd.defaults, generic/initrd.scripts, +generic/udhcpc.scripts,
+  x86/busy-config, x86/modules_load:
+  Added patch for udhcp support. Patch by Stefan Nickl
+  <snickl@snickl.freaks.de> and submitted to bug #145115.
+
   13 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org> generic/linuxrc:
   Allow root= for initramfs, instead of only real_root= to specify the root
   volume. Patch by Salah Coronya <salahx@yahoo.com> from bug #142606.

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 210e1552b9b52dc48a4dc18f2b740c52a0ba8469..c8c7b0e2177b56887d17dcfea3ec8a5d949737be 100644 (file)
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -45,6 +45,9 @@ create_busybox_cpio() {
                rm -rf "${TEMP}/initramfs-busybox-temp" > /dev/null
        fi
        mkdir -p "${TEMP}/initramfs-busybox-temp/bin/" 
+
+       cp "${GK_SHARE}/generic/udhcpc.scripts" ${TEMP}/initramfs-busybox-temp/bin/
+       chmod +x "${TEMP}/initramfs-busybox-temp/bin/udhcpc.scripts"
        cp "${BUSYBOX_BINCACHE}" "${TEMP}/initramfs-busybox-temp/bin/busybox.bz2" ||
                gen_die 'Could not copy busybox from bincache!'
        bunzip2 "${TEMP}/initramfs-busybox-temp/bin/busybox.bz2" ||

diff --git a/generic/initrd.defaults b/generic/initrd.defaults
index b6e83671621136750b9ac178f66724ac04f29f9a..6453c37a00360d9663ecf5c43c546c9352e6895a 100644 (file)
--- a/generic/initrd.defaults
+++ b/generic/initrd.defaults
@@ -79,4 +79,4 @@ CONSOLE="/dev/console"
 # Only sections that are in by default or those that
 # are not module groups need to be defined here...
 HWOPTS='usb firewire keymap cache evms2 sata lvm2 dmraid slowusb fs'
-MY_HWOPTS='usb firewire sata dmraid fs'
+MY_HWOPTS='usb firewire sata dmraid fs net'

diff --git a/generic/initrd.scripts b/generic/initrd.scripts
index ca331c5f3601eabaff0a938a0d6575d1f6474b33..4a609bc67fd025cc120d92f62f67d55f5e8aecab 100644 (file)
--- a/generic/initrd.scripts
+++ b/generic/initrd.scripts
@@ -155,8 +155,11 @@ union_insert_dir() {
 }
 
 findnfsmount() {
-       if [ "${IP}" != '' ]
+
+       if [ "${IP}" != '' ] || busybox udhcpc -R rootpath -n -s /bin/udhcpc.scripts
        then
+               [ -e /rootpath ] && NFSROOT=`cat /rootpath`
+
                if [ "${NFSROOT}" = '' ]
                then
                        # Obtain NFSIP  

diff --git a/generic/udhcpc.scripts b/generic/udhcpc.scripts
new file mode 100644 (file)
index 0000000..a108a8b
--- /dev/null
+++ b/generic/udhcpc.scripts
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+case ${1} in
+       bound)
+               [ -n "$broadcast" ] && BROADCAST="broadcast $broadcast"
+               [ -n "$subnet" ] && NETMASK="netmask $subnet"
+               [ -n "$rootpath" ] && echo "$rootpath" > /rootpath
+               #[ -n "$router" ] && echo "$router" > /router
+               #[ -n "$dns" ] && echo "$dns" > /dns
+
+               busybox ifconfig $interface $ip $BROADCAST $NETMASK
+       ;;
+       deconfig)
+               busybox ifconfig $interface 0.0.0.0
+       ;;
+esac
+

diff --git a/x86/busy-config b/x86/busy-config
index 6459a7e27af5feadcb8498231a8f89acad9439cc..e4f9b2893a160afeb5f0c8e8f830113e44a97061 100644 (file)
--- a/x86/busy-config
+++ b/x86/busy-config
@@ -275,7 +275,7 @@ CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
 # CONFIG_FTPPUT is not set
 # CONFIG_HOSTNAME is not set
 # CONFIG_HTTPD is not set
-# CONFIG_IFCONFIG is not set
+CONFIG_IFCONFIG=yes
 # CONFIG_IFUPDOWN is not set
 # CONFIG_INETD is not set
 # CONFIG_IP is not set
@@ -288,7 +288,7 @@ CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
 # CONFIG_NC is not set
 # CONFIG_NETSTAT is not set
 # CONFIG_NSLOOKUP is not set
-# CONFIG_PING is not set
+CONFIG_PING=y
 # CONFIG_ROUTE is not set
 # CONFIG_TELNET is not set
 # CONFIG_TELNETD is not set
@@ -301,7 +301,7 @@ CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
 # udhcp Server/Client
 #
 # CONFIG_UDHCPD is not set
-# CONFIG_UDHCPC is not set
+CONFIG_UDHCPC=y
 
 #
 # Process Utilities

diff --git a/x86/modules_load b/x86/modules_load
index 51286d8d929a9ccd4f1059bba9348b7b5db7e1a5..06d359a2cfd9fd3b5965b519e15d62463d9b0d00 100644 (file)
--- a/x86/modules_load
+++ b/x86/modules_load
@@ -11,6 +11,7 @@ mptspi mptfc 3w-xxxx 3w-9xxx cpqarray cciss DAC960 \
 sx8 aacraid megaraid_mbox megaraid_mm megaraid_sas \
 lpfc scsi_transport_fc"
 
+MODULES_NET="e1000"
 MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
 MODULES_ATARAID="ataraid pdcraid hptraid"
 MODULES_PCMCIA="pcmcia_core yenta_socket i82365 \