From a65be0607afabd8f89392ccc2b95edbc526a2ef9 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Fri, 3 Aug 2007 13:44:16 +0000
Subject: Started on the cdboot/init and fixed a setting in mkdxsinitrd.

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1312 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initramfs/cdboot/init | 22 ++++++++++++----------
 initramfs/mkdxsinitrd | 10 ++++------
 2 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'initramfs')

diff --git a/initramfs/cdboot/init b/initramfs/cdboot/init
index 8a93d052..eb95c8fe 100755
--- a/initramfs/cdboot/init
+++ b/initramfs/cdboot/init
@@ -1,6 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2003 - 2006 - RZ Uni Freiburg
-# Copyright (c) 2006, 2007 - OpenSLX GmbH
+# Copyright (c) 2007 - OpenSLX GmbH
 #
 # This program is free software distributed under the GPL version 2.
 # See http://openslx.org/COPYING
@@ -107,7 +106,7 @@ if [ -n "${essid}" ] ; then
   :
 else
   # check here for the active ethernet link
-  ip link show dev eth1 >/dev/null 2>&1 && error "$init_2eif" nonfatal
+  ip link show dev eth1 >/dev/null 2>&1 && echo "more than one nw if found"
 fi
 
 # set up loopback networking
@@ -117,13 +116,16 @@ ip addr add 127.0.0.1/8 dev lo
 ip link set dev $nwif up || echo "noeth"
 
 # start udhcpc here
-
-[ -f /tmp/confviadhcp ] && . /tmp/confviadhcp
-    [ -z "$clientip" -o -z "$subnet_mask" -o -z "$gateway" \
-      -o -z "$broadcast_address" ] && error "$init_errdhcp"
-    ip addr add $clientip/$(nm2pref $subnet_mask) broadcast $broadcast_address \
-      dev $nwif
-    ip route add default via $gateway
+[ -f /lib/modules/@@@KERNVER@@@/kernel/net/packet/af_packet.ko ] && \
+  modprobe -q af_packet
+[ -n $vci ] && vci="-V $vci"
+udhcpc -b -q $vci -i $nwif 2>/dev/null
+
+[ -z "$clientip" -o -z "$subnet_mask" -o -z "$gateway" \
+  -o -z "$broadcast_address" ] && error "$init_errdhcp"
+ip addr add $clientip/$(nm2pref $subnet_mask) broadcast $broadcast_address \
+  dev $nwif
+ip route add default via $gateway
 
 # start the new kernel with initialramfs and cmdline
 #kexec
diff --git a/initramfs/mkdxsinitrd b/initramfs/mkdxsinitrd
index 68e21f05..7c4b70a2 100755
--- a/initramfs/mkdxsinitrd
+++ b/initramfs/mkdxsinitrd
@@ -400,11 +400,6 @@ if [ -z "$cdboot" ] ; then
 	# remove any architecture specification after version
   copy_distro_stuff ${DISTRO_NAME} ${DISTRO_VER}
 
-  if [ -z "$NWMODULES" ] ; then
-    #NWMODULES="forcedeth e1000 e100 tg3 via-rhine r8169 pcnet32 8139too 8139cp"
-    NWMODULES="forcedeth e1000 e100 tg3 via-rhine r8169 pcnet32"
-  fi
-
   # initial ramdisk scripts: init, functions, servconfig, hwautocfg, ...
   # copy and replace variable names
   for dirs in `find ${SLX_SHARE_PATH}/initramfs/* ! -regex ".*/\..*"` ; do
@@ -549,7 +544,10 @@ fi
 if [ -z "$INITRD_PATH" ] ; then
   INITRD_PATH="/tmp/slxinitramfs.gz"
 fi
-
+if [ -z "$NWMODULES" ] ; then
+    #NWMODULES="forcedeth e1000 e100 tg3 via-rhine r8169 pcnet32 8139too 8139cp"
+    NWMODULES="forcedeth e1000 e100 tg3 3c59x via-rhine r8169 pcnet32 b44 8139too"
+fi
 # slx init or cdboot init 
 if [ -z "$cdboot" ] ; then
   # base filesystem modules
-- 
cgit v1.2.3-55-g7522