Added patch for udhcp support. Patch by Stefan Nickl <snickl@snickl.freaks.de> and submitted to bug #145115.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@450 67a159dc-881f-0410-a524-ba9dfbe2cb84
cleanup-cruft
Chris Gianelloni 19 years ago
parent dc87eb99e4
commit 57097c87f6

@ -2,6 +2,12 @@
# Copyright 2006-2006 Gentoo Foundation; Distributed under the GPL v2 # Copyright 2006-2006 Gentoo Foundation; Distributed under the GPL v2
# $Header: $ # $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: 13 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org> generic/linuxrc:
Allow root= for initramfs, instead of only real_root= to specify the root Allow root= for initramfs, instead of only real_root= to specify the root
volume. Patch by Salah Coronya <salahx@yahoo.com> from bug #142606. volume. Patch by Salah Coronya <salahx@yahoo.com> from bug #142606.

@ -45,6 +45,9 @@ create_busybox_cpio() {
rm -rf "${TEMP}/initramfs-busybox-temp" > /dev/null rm -rf "${TEMP}/initramfs-busybox-temp" > /dev/null
fi fi
mkdir -p "${TEMP}/initramfs-busybox-temp/bin/" 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" || cp "${BUSYBOX_BINCACHE}" "${TEMP}/initramfs-busybox-temp/bin/busybox.bz2" ||
gen_die 'Could not copy busybox from bincache!' gen_die 'Could not copy busybox from bincache!'
bunzip2 "${TEMP}/initramfs-busybox-temp/bin/busybox.bz2" || bunzip2 "${TEMP}/initramfs-busybox-temp/bin/busybox.bz2" ||

@ -79,4 +79,4 @@ CONSOLE="/dev/console"
# Only sections that are in by default or those that # Only sections that are in by default or those that
# are not module groups need to be defined here... # are not module groups need to be defined here...
HWOPTS='usb firewire keymap cache evms2 sata lvm2 dmraid slowusb fs' 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'

@ -155,8 +155,11 @@ union_insert_dir() {
} }
findnfsmount() { findnfsmount() {
if [ "${IP}" != '' ]
if [ "${IP}" != '' ] || busybox udhcpc -R rootpath -n -s /bin/udhcpc.scripts
then then
[ -e /rootpath ] && NFSROOT=`cat /rootpath`
if [ "${NFSROOT}" = '' ] if [ "${NFSROOT}" = '' ]
then then
# Obtain NFSIP # Obtain NFSIP

@ -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

@ -275,7 +275,7 @@ CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
# CONFIG_FTPPUT is not set # CONFIG_FTPPUT is not set
# CONFIG_HOSTNAME is not set # CONFIG_HOSTNAME is not set
# CONFIG_HTTPD is not set # CONFIG_HTTPD is not set
# CONFIG_IFCONFIG is not set CONFIG_IFCONFIG=yes
# CONFIG_IFUPDOWN is not set # CONFIG_IFUPDOWN is not set
# CONFIG_INETD is not set # CONFIG_INETD is not set
# CONFIG_IP is not set # CONFIG_IP is not set
@ -288,7 +288,7 @@ CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
# CONFIG_NC is not set # CONFIG_NC is not set
# CONFIG_NETSTAT is not set # CONFIG_NETSTAT is not set
# CONFIG_NSLOOKUP is not set # CONFIG_NSLOOKUP is not set
# CONFIG_PING is not set CONFIG_PING=y
# CONFIG_ROUTE is not set # CONFIG_ROUTE is not set
# CONFIG_TELNET is not set # CONFIG_TELNET is not set
# CONFIG_TELNETD is not set # CONFIG_TELNETD is not set
@ -301,7 +301,7 @@ CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
# udhcp Server/Client # udhcp Server/Client
# #
# CONFIG_UDHCPD is not set # CONFIG_UDHCPD is not set
# CONFIG_UDHCPC is not set CONFIG_UDHCPC=y
# #
# Process Utilities # Process Utilities

@ -11,6 +11,7 @@ mptspi mptfc 3w-xxxx 3w-9xxx cpqarray cciss DAC960 \
sx8 aacraid megaraid_mbox megaraid_mm megaraid_sas \ sx8 aacraid megaraid_mbox megaraid_mm megaraid_sas \
lpfc scsi_transport_fc" lpfc scsi_transport_fc"
MODULES_NET="e1000"
MODULES_FIREWIRE="ieee1394 ohci1394 sbp2" MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
MODULES_ATARAID="ataraid pdcraid hptraid" MODULES_ATARAID="ataraid pdcraid hptraid"
MODULES_PCMCIA="pcmcia_core yenta_socket i82365 \ MODULES_PCMCIA="pcmcia_core yenta_socket i82365 \

Loading…
Cancel
Save