From 8758522fefde7dc78566fcdac2ae05e1ca77df0c Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Wed, 27 Feb 2008 22:18:21 +0000
Subject: Working on CD preboot ...

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

(limited to 'initramfs')

diff --git a/initramfs/cdboot/init b/initramfs/cdboot/init
index ca6f6c96..88cb04a3 100755
--- a/initramfs/cdboot/init
+++ b/initramfs/cdboot/init
@@ -137,9 +137,13 @@ BOOT_IMAGE\nset >/tmp/ipstuff" >/usr/share/udhcpc/default.script
 chmod u+x /usr/share/udhcpc/default.script
 modprobe -q af_packet
 [ -n $vci ] && vci="-V $vci"
-udhcpc -b -q $vci -s /usr/share/udhcpc/default.script -i $nwif #2>/dev/null
+udhcpc -n -q $vci -s /usr/share/udhcpc/default.script -i $nwif 2>/dev/null || \
+  echo "No answer from a DHCP server received"; /bin/ash 
 if test -e /tmp/ipstuff ; then
   . /tmp/ipstuff
+  for i in $dns ; do
+    echo "nameserver $i" >> /etc/resolv.conf
+  done
 else
   echo "Did not get any proper IP configuration"
 fi
@@ -150,8 +154,8 @@ ip route add default via $router
 # user choose what kind of SLX client he wants to get
 
 # get kernel and initramfs
-wget -q -c -O /tmp/kernel ftp://openslx:OpenS1X@archive.ruf.uni-freiburg.de/kernel
-wget -q -c -O /tmp/iramfs ftp://openslx:OpenS1X@archive.ruf.uni-freiburg.de/iramfs
+( wget -q -c -O /tmp/kernel ftp://openslx:OpenS1X@archive.ruf.uni-freiburg.de/kernel && \
+wget -q -c -O /tmp/iramfs ftp://openslx:OpenS1X@archive.ruf.uni-freiburg.de/iramfs ) || \
 /bin/ash
 
 # start the new kernel with initialramfs and cmdline
diff --git a/initramfs/cdboot/mkcdboot b/initramfs/cdboot/mkcdboot
index c23f6094..5fc588fd 100755
--- a/initramfs/cdboot/mkcdboot
+++ b/initramfs/cdboot/mkcdboot
@@ -66,7 +66,9 @@ MENU HSHIFT 0\nMENU VSHIFT 5\n\nMENU TITLE OpenSLX PreBoot ISO\
 " > ${BUILDDIR}/iso/isolinux/isolinux.cfg
 echo -e "LABEL OpenSLX\n\tMENU LABEL Test to boot an OpenSLX Client" \
   >> ${BUILDDIR}/iso/isolinux/isolinux.cfg
-echo -e "\tTEXT HELP\n\tYou should have DHCP running ...\n\tENDTEXT" \
+echo -e "\tTEXT HELP\n\tYou should have DHCP running ...\n\tFor more \
+information on this project consult the homepage on\n\t\t\
+http://www.openslx.org\n\tENDTEXT" \
   >> ${BUILDDIR}/iso/isolinux/isolinux.cfg
 echo -e "\tKERNEL vmlinuz\n\tAPPEND initrd=cdirfs quiet" \
   >> ${BUILDDIR}/iso/isolinux/isolinux.cfg
-- 
cgit v1.2.3-55-g7522