From 3bd54055f8885dfe17639fca06c772ff6c4ec3a2 Mon Sep 17 00:00:00 2001
From: Nico Dietrich
Date: Thu, 26 Jan 2006 21:59:47 +0000
Subject: einige bugfixes

git-svn-id: http://svn.openslx.org/svn/openslx/dxs/ld4@44 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initrd/initrd-stuff/init | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'initrd/initrd-stuff/init')

diff --git a/initrd/initrd-stuff/init b/initrd/initrd-stuff/init
index a81bbcb1..4f9333ac 100755
--- a/initrd/initrd-stuff/init
+++ b/initrd/initrd-stuff/init
@@ -113,8 +113,8 @@ in $0\ncountry=\"${COUNTRY}\"" >> /etc/machine-setup
     tmpfssize=*)
       TMPFSSIZE=${opts#tmpfssize=};;
     # vendor code identifier for dhcp requests
-    vci=*|VCI=*)
-      VCI=${opts#VCI=};;
+    vci=*)
+      VCI=${opts#vci=};;
   esac
 done
 # check if at least one type of IP configuration is availabe
@@ -190,6 +190,10 @@ echo "dhcp:x:101:" > /etc/group
 if [ -n "$noipyet" ] ; then
   waitfor /tmp/dhcp-done 20000
   . /etc/machine-setup
+  [ -z "$clientip" -o -z "$subnet_mask" -o -z "$gateway" \
+    -o -z "$broadcast_address" ] && error "  Did not get complete IP \
+configuration via DHCP. You may want to add\n  a vendor code identifier \
+via kernel commandline (vci=VCI)."
   ipsetup $clientip $subnet_mask $gateway $broadcast_address eth0
 fi
 [ -n "$LDAP" ] && ldapconf &
@@ -377,7 +381,6 @@ and list the modules loaded until\n  now."
 waitfor /tmp/svcfg 20000 || error "  For some reason the software config \
 of this client did not finish in\n  time. You might check the process list \
 and list the modules loaded until\n  now."
-bash
 # IP configuration is made and should not be updated automatically
 killall -9 dhcpcd dhclient pump 2>/dev/null
 # unmount the bind mounted modules directory
-- 
cgit v1.2.3-55-g7522