remove dhcp-client depend, switch to busybox udhcpc

5 files changed, 74 insertions, 51 deletions

diff --git a/scripts/tcos-bottom/01download_settings b/scripts/tcos-bottom/01download_settings
index 05fa19a..a8826dd 100755
--- a/scripts/tcos-bottom/01download_settings
+++ b/scripts/tcos-bottom/01download_settings
@@ -13,7 +13,8 @@ maybe_break download_settings
 . /conf/tcos.conf
 . /conf/tcos-run-functions
 
-MYIP=$(grep 'fixed-address' /var/lib/dhcp/dhclient.leases | head -1| awk '{print $2}' | sed s/";"//g)
+#MYIP=$(grep 'fixed-address' /var/lib/dhcp/dhclient.leases | head -1| awk '{print $2}' | sed s/";"//g)
+MYIP=$(awk -F"=" '/^ip=/ {print $2}' /tmp/net.data)
 
 download_file /tcos/conf/${MYIP}.conf /conf/mysettings.conf 
 if [ $? -eq 0 ]; then 
diff --git a/scripts/tcos-bottom/25startx b/scripts/tcos-bottom/25startx
index c4daffd..964d04b 100755
--- a/scripts/tcos-bottom/25startx
+++ b/scripts/tcos-bottom/25startx
@@ -35,7 +35,8 @@ if [ ! -f $XAUTHORITY ]; then
   value=0
   log_begin_msg "Creating magic cookie for X"
     _log "STARTX creating cookie..."
-    MYIP=$(grep 'fixed-address' /var/lib/dhcp/dhclient.leases | head -1| awk '{print $2}' | sed s/";"//g)
+    #MYIP=$(grep 'fixed-address' /var/lib/dhcp/dhclient.leases | head -1| awk '{print $2}' | sed s/";"//g)
+    MYIP=$(awk -F"=" '/^ip=/ {print $2}' /tmp/net.data)
     cookie=$(mcookie || value=1)
     xauth -f $XAUTHORITY -q add :0                      MIT-MAGIC-COOKIE-1 $cookie 2>> /tmp/initramfs.debug || value=1
     xauth -f $XAUTHORITY -q add localhost:0             MIT-MAGIC-COOKIE-1 $cookie 2>> /tmp/initramfs.debug || value=1
diff --git a/scripts/tcos-premount/30rootfs b/scripts/tcos-premount/30rootfs
index 5a53393..7ae3601 100755
--- a/scripts/tcos-premount/30rootfs
+++ b/scripts/tcos-premount/30rootfs
@@ -82,8 +82,9 @@ rm -rf /target/conf/    && cp -ra /conf/   /target/
 rm -rf /target/scripts/ && cp -ra /scripts/  /target/
 mkdir -p /target/tmp    && cp -ra /tmp/*     /target/tmp
 
-mkdir -p /var/lib/dhcp/
-cp /var/lib/dhcp/dhclient.leases /target/var/lib/dhcp/dhclient.leases
+#mkdir -p /var/lib/dhcp/
+#cp /var/lib/dhcp/dhclient.leases /target/var/lib/dhcp/dhclient.leases
+cat /tmp/net.data > /root/tmp/net.data
 
 cp /etc/hostname /target/etc/hostname
 cp /etc/resolv.conf /target/etc/resolv.conf
diff --git a/scripts/tcos-top/05network b/scripts/tcos-top/05network
index 164ece8..7fe1f2b 100755
--- a/scripts/tcos-top/05network
+++ b/scripts/tcos-top/05network
@@ -22,17 +22,17 @@ log_end_msg $?
 
 touch /etc/resolv.conf
 
-if [ -d /var/lib/dhcp3 ]; then
-  # link to work with dhcp-client or dhcp3-client
-  ln -s /var/lib/dhcp3 /var/lib/dhcp
+#if [ -d /var/lib/dhcp3 ]; then
+#  # link to work with dhcp-client or dhcp3-client
+#  ln -s /var/lib/dhcp3 /var/lib/dhcp
 
-  chown root:dhcp /lib/dhcp3-client 2>/dev/null
-  chown 775 /lib/dhcp3-client
-  chmod 4744 /lib/dhcp3-client/call-dhclient-script
+#  chown root:dhcp /lib/dhcp3-client 2>/dev/null
+#  chown 775 /lib/dhcp3-client
+#  chmod 4744 /lib/dhcp3-client/call-dhclient-script
 
-  chown root:dhcp /etc/resolv.conf 2>/dev/null
-  chmod 644 /etc/resolv.conf
-fi
+#  chown root:dhcp /etc/resolv.conf 2>/dev/null
+#  chmod 644 /etc/resolv.conf
+#fi
 
 # wireless TCOS minihowto
 #
@@ -195,37 +195,46 @@ fi
  
  log_begin_msg "Sending DHCP request on $TCOS_NET_LINK"
   _log "DHCLIENT $TCOS_NET_LINK"
-  dhclient $TCOS_NET_LINK >> /tmp/initramfs.debug  2>&1
-  myip=$(grep 'fixed-address' /var/lib/dhcp/dhclient.leases     | head -1| awk '{print $2}' | sed s/";"//g)
-
-  if grep -q "server-name" /var/lib/dhcp/dhclient.leases; then
-    dhcpserver=$(grep 'server-name' /var/lib/dhcp/dhclient.leases | awk -F'"' '{print $2}')
-  else
-    dhcpserver=$(grep 'dhcp-server' /var/lib/dhcp/dhclient.leases | awk '{print $3}' | awk -F ";" '{print $1}')
-  fi
-
-  hostname=$(grep 'host-name' /var/lib/dhcp/dhclient.leases | awk '{print $3}' | awk -F ";" '{print $1}' | sed s/\"//g)
-  TCOS_NET_ACTIVE=$(grep 'interface' /var/lib/dhcp/dhclient.leases  | head -1| awk '{print $2}' | sed s/";"//g | sed s/\"//g)
+  busybox udhcpc -i $TCOS_NET_LINK -s /bin/udhcpc-script -O sipsrv >> /tmp/initramfs.debug  2>&1
+  myip=$(awk -F"=" '/^ip=/ {print $2}' /tmp/net.data)
+  dhcpserver=$(awk -F"=" '/^dhcpserver=/ {print $2}' /tmp/net.data)
+  hostname=$(awk -F"=" '/^hostname=/ {print $2}' /tmp/net.data)
+  netmask=$(awk -F"=" '/^netmask=/ {print $2}' /tmp/net.data)
+  gateway=$(awk -F"=" '/^gateway=/ {print $2}' /tmp/net.data)
+  TCOS_NET_ACTIVE=$(awk -F"=" '/^interface=/ {print $2}' /tmp/net.data)
+  xserver=$(awk -F"=" '/^sipsrv=/ {print $2}' /tmp/net.data)
+  
+#  dhclient $TCOS_NET_LINK >> /tmp/initramfs.debug  2>&1
+#  myip=$(grep 'fixed-address' /var/lib/dhcp/dhclient.leases     | head -1| awk '{print $2}' | sed s/";"//g)
+
+#  if grep -q "server-name" /var/lib/dhcp/dhclient.leases; then
+#    dhcpserver=$(grep 'server-name' /var/lib/dhcp/dhclient.leases | awk -F'"' '{print $2}')
+#  else
+#    dhcpserver=$(grep 'dhcp-server' /var/lib/dhcp/dhclient.leases | awk '{print $3}' | awk -F ";" '{print $1}')
+#  fi
+
+#  hostname=$(grep 'host-name' /var/lib/dhcp/dhclient.leases | awk '{print $3}' | awk -F ";" '{print $1}' | sed s/\"//g)
+#  TCOS_NET_ACTIVE=$(grep 'interface' /var/lib/dhcp/dhclient.leases  | head -1| awk '{print $2}' | sed s/";"//g | sed s/\"//g)
  log_end_msg 0
 
 # hack for dhcp3-client
-if [ "$(route -n 2>&1| grep -c $TCOS_NET_ACTIVE)" = "0" ]; then
-   log_begin_msg "Forcing net for dhcp3-client"
-     myip=$(grep 'fixed-address' /var/lib/dhcp/dhclient.leases     | head -1| awk '{print $2}' | sed s/";"//g)
-
-     if grep -q "server-name" /var/lib/dhcp/dhclient.leases; then
-       dhcpserver=$(grep 'server-name' /var/lib/dhcp/dhclient.leases | awk -F'"' '{print $2}')
-     else
-       dhcpserver=$(grep 'dhcp-server' /var/lib/dhcp/dhclient.leases | awk '{print $3}' | awk -F ";" '{print $1}')
-     fi
-
-     netmask=$(grep 'subnet-mask' /var/lib/dhcp/dhclient.leases | head -1| awk '{print $3}' | sed s/";"//g)
-     gateway=$(grep 'routers' /var/lib/dhcp/dhclient.leases     | head -1| awk '{print $3}' | sed s/";"//g)
-     #ifconfig $TCOS_NET_ACTIVE down
-     ifconfig $TCOS_NET_ACTIVE $myip netmask $netmask up
-     route add default dev $TCOS_NET_ACTIVE gw $gateway
-   log_end_msg $?
-fi
+#if [ "$(route -n 2>&1| grep -c $TCOS_NET_ACTIVE)" = "0" ]; then
+#   log_begin_msg "Forcing net for dhcp3-client"
+#     myip=$(grep 'fixed-address' /var/lib/dhcp/dhclient.leases     | head -1| awk '{print $2}' | sed s/";"//g)
+
+#     if grep -q "server-name" /var/lib/dhcp/dhclient.leases; then
+#       dhcpserver=$(grep 'server-name' /var/lib/dhcp/dhclient.leases | awk -F'"' '{print $2}')
+#     else
+#       dhcpserver=$(grep 'dhcp-server' /var/lib/dhcp/dhclient.leases | awk '{print $3}' | awk -F ";" '{print $1}')
+#     fi
+
+#     netmask=$(grep 'subnet-mask' /var/lib/dhcp/dhclient.leases | head -1| awk '{print $3}' | sed s/";"//g)
+#     gateway=$(grep 'routers' /var/lib/dhcp/dhclient.leases     | head -1| awk '{print $3}' | sed s/";"//g)
+#     #ifconfig $TCOS_NET_ACTIVE down
+#     ifconfig $TCOS_NET_ACTIVE $myip netmask $netmask up
+#     route add default dev $TCOS_NET_ACTIVE gw $gateway
+#   log_end_msg $?
+#fi
 
 
 if [ -n ${TCOS_DEBUG} ]; then
@@ -249,8 +258,13 @@ fi
 # search for other hosts
 TCOS_TFTP_SERVER=$(read_cmdline_var 'tftpserver' "${dhcpserver}")
 
-if grep -q "x-display-manager" /var/lib/dhcp/dhclient.leases; then
-  TCOS_XDMCP_SERVER=$(grep "x-display-manager" /var/lib/dhcp/dhclient.leases | tail -1| awk '{print $3}'| sed -e 's/;//g')
+#if grep -q "x-display-manager" /var/lib/dhcp/dhclient.leases; then
+#  TCOS_XDMCP_SERVER=$(grep "x-display-manager" /var/lib/dhcp/dhclient.leases | tail -1| awk '{print $3}'| sed -e 's/;//g')
+#else
+#  TCOS_XDMCP_SERVER=$(read_cmdline_var 'xserver' "${dhcpserver}")
+#fi
+if [ "$xserver" != "" ]; then
+  TCOS_XDMCP_SERVER=$xserver
 else
   TCOS_XDMCP_SERVER=$(read_cmdline_var 'xserver' "${dhcpserver}")
 fi
@@ -258,8 +272,13 @@ fi
 TCOS_RDESKTOP_SERVER=$(read_cmdline_var 'rdesktop' "${dhcpserver}")
 TCOS_NFS_SERVER=$(read_cmdline_var 'nfsserver' "${dhcpserver}")
 
-if grep -q "font-servers" /var/lib/dhcp/dhclient.leases; then
-  TCOS_FONT_SERVER=$(grep font-servers /var/lib/dhcp/dhclient.leases | tail -1| awk '{print $3}'| sed -e 's/;//g')
+#if grep -q "font-servers" /var/lib/dhcp/dhclient.leases; then
+#  TCOS_FONT_SERVER=$(grep font-servers /var/lib/dhcp/dhclient.leases | tail -1| awk '{print $3}'| sed -e 's/;//g')
+#else
+#  TCOS_FONT_SERVER=$(read_cmdline_var 'fontserver' "${dhcpserver}")
+#fi
+if [ "$xserver" != "" ]; then
+  TCOS_FONT_SERVER=$xserver
 else
   TCOS_FONT_SERVER=$(read_cmdline_var 'fontserver' "${dhcpserver}")
 fi
@@ -280,14 +299,14 @@ ${TCOS_NFS_SERVER} nfs-server
 ${TCOS_FONT_SERVER} font-server
 EOF
 
-# set dns
-echo "nameserver $TCOS_DNS_SERVER" > /etc/resolv.conf
+## set dns
+#echo "nameserver $TCOS_DNS_SERVER" > /etc/resolv.conf
 
 
 hostname $hostname
 export HOSTNAME=$hostname
-export hostname
-log_end_msg $?
+#export hostname
+log_end_msg
 
 # start portmap
 [ -x /sbin/portmap ] && /sbin/portmap >/tmp/portmap.log 2>&1 &
diff --git a/scripts/tcos-top/60make_init b/scripts/tcos-top/60make_init
index 08f8e9a..a6c2d29 100755
--- a/scripts/tcos-top/60make_init
+++ b/scripts/tcos-top/60make_init
@@ -68,8 +68,9 @@ chmod +x /root/sbin/init
 mkdir -p /root/proc /root/dev /root/sys
 mkdir -p /root/var/run /root/var/www /root/var/log /root/tmp
 
-mkdir -p /root/var/lib/dhcp
-cat /var/lib/dhcp/dhclient.leases > /root/var/lib/dhcp/dhclient.leases
+#mkdir -p /root/var/lib/dhcp
+#cat /var/lib/dhcp/dhclient.leases > /root/var/lib/dhcp/dhclient.leases
+cat /tmp/net.data > /root/tmp/net.data
 cat /etc/hostname > /root/etc/hostname
 cat /etc/hosts > /root/etc/hosts
 cat /etc/resolv.conf > /root/etc/resolv.conf