From e4a39d1ec496d27c3c78a5fa9c9108553ca12e5a Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Wed, 27 Aug 2008 23:01:01 +0000
Subject: Cleanup of by now obsoleted tool versions (ddcprobe, 915res). Update
 for udhcpc call in stage3 functions (see r2110, r2111).

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2112 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initramfs/stage3-stuff/etc/functions |   6 +++---
 tools/915resolution                  |   1 -
 tools/915resolution.i586             | Bin 16980 -> 0 bytes
 tools/ddcprobe                       |   1 -
 tools/ddcprobe.i586                  | Bin 116080 -> 0 bytes
 5 files changed, 3 insertions(+), 5 deletions(-)
 delete mode 120000 tools/915resolution
 delete mode 100755 tools/915resolution.i586
 delete mode 120000 tools/ddcprobe
 delete mode 100755 tools/ddcprobe.i586

diff --git a/initramfs/stage3-stuff/etc/functions b/initramfs/stage3-stuff/etc/functions
index 9b3c6e28..0af554e5 100644
--- a/initramfs/stage3-stuff/etc/functions
+++ b/initramfs/stage3-stuff/etc/functions
@@ -261,9 +261,9 @@ mkdir /var/lib/dhcp >/dev/null 2>&1
 [ -n $vci ] && vci="-V $vci"
 testmkd /usr/share/udhcpc
 ln -sf /bin/dhcpmkconfig /usr/share/udhcpc/default.script
-# -o option gets additionally the nis* options, but described other way round
-# hopefully in some future version "-O dhcp-option" works ...
-udhcpc -t 8 -q $vci -s /usr/share/udhcpc/default.script -i $nwif 2>/dev/null
+# see for options.c file in udhcp subdir of busybox for accepted "-O option"
+udhcpc -O nissrv -O nisdomain -t 8 -q $vci \
+  -s /usr/share/udhcpc/default.script -i $nwif 2>/dev/null
 }
 
 #############################################################################
diff --git a/tools/915resolution b/tools/915resolution
deleted file mode 120000
index f23a64a7..00000000
--- a/tools/915resolution
+++ /dev/null
@@ -1 +0,0 @@
-915resolution.i586
\ No newline at end of file
diff --git a/tools/915resolution.i586 b/tools/915resolution.i586
deleted file mode 100755
index c5b0e0a9..00000000
Binary files a/tools/915resolution.i586 and /dev/null differ
diff --git a/tools/ddcprobe b/tools/ddcprobe
deleted file mode 120000
index 22c91798..00000000
--- a/tools/ddcprobe
+++ /dev/null
@@ -1 +0,0 @@
-ddcprobe.i586
\ No newline at end of file
diff --git a/tools/ddcprobe.i586 b/tools/ddcprobe.i586
deleted file mode 100755
index 1df7708f..00000000
Binary files a/tools/ddcprobe.i586 and /dev/null differ
-- 
cgit v1.2.3-55-g7522