From 6b768f803fc8bf786f6a1ad397d22c9c8001d9f6 Mon Sep 17 00:00:00 2001
From: Nico Dietrich
Date: Fri, 17 Feb 2006 00:35:31 +0000
Subject: fixes: dhclient in ubuntu, ide-generic

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

(limited to 'initrd/initrd-stuff/etc/functions')

diff --git a/initrd/initrd-stuff/etc/functions b/initrd/initrd-stuff/etc/functions
index 655e8aca..349ee9da 100644
--- a/initrd/initrd-stuff/etc/functions
+++ b/initrd/initrd-stuff/etc/functions
@@ -197,7 +197,7 @@ option hw-mouse code 252\t\t= string;\n\
 option hw-graphic code 253\t\t= string;\n\
 option hw-monitor code 254\t\t= string;\n\n\
 send dhcp-lease-time 86400;\nsend dhcp-max-message-size 1400;\n\
-request;\nscript \"/sbin/dhclient-script\";" >> /etc/dhclient.conf
+request;\nscript \"/bin/dhclient-script\";" >> /etc/dhclient.conf
 if [ -n "$vci" ] ; then
   echo "send vendor-class-identifier \"$vci\";" >> /etc/dhclient.conf
 fi
@@ -232,13 +232,13 @@ export client="$dhcp"
 case $dhcp in
   dhclient)
     mkdhclconf $vci
-    ln -s /bin/dhcpmkconfig /sbin/dhclient-script
-    dhclient -q -lf /var/lib/dhcp/dhclient.leases eth0 2>&1 >/dev/null || \
+    ln -s /bin/dhcpmkconfig /bin/dhclient-script
+    dhclient -q -cf /etc/dhclient.conf -lf /var/lib/dhcp/dhclient.leases eth0 2>&1 >/dev/null || \
       error "  Fatal error occured while trying to run dhclient.\n$commonerr" 
   ;;
   dhcpcd)
-    ln -s /bin/dhcpmkconfig /sbin/dhcpd.exe
-    dhcpcd -L /var/lib/dhcp -c /sbin/dhcpd.exe -T -t 30 eth0 2>&1 >/dev/null || \
+    ln -s /bin/dhcpmkconfig /bin/dhcpd.exe
+    dhcpcd -L /var/lib/dhcp -c /bin/dhcpd.exe -T -t 30 eth0 2>&1 >/dev/null || \
       error "  Fatal error occured while trying to run dhcpcd.\n$commonerr" 
   ;;
   pump)
@@ -271,8 +271,8 @@ basename () {
 #######################################################################
 # simple string in string search 
 strinstr (){
-case "$2" in *$1*) return 0;; esac
-return 1
+  case "$2" in *$1*) return 0;; esac
+  return 1
 }
 
 #######################################################################
@@ -285,8 +285,8 @@ return 1
 #return 1
 #}
 strinfile(){
-case "$(cat $2)" in *$1*) return 0;; esac
-return 1
+  case "$(cat $2)" in *$1*) return 0;; esac
+  return 1
 }
 
 
-- 
cgit v1.2.3-55-g7522