bootdisk/trunk/batch-installer/installer-prep

[hawk]

Author: hawk
Date: Sat Dec  3 20:29:23 2005
New Revision: 6590

Modified:
   bootdisk/trunk/batch-installer/installer-prep
Log:
- make sure dhcpcd is not running before launching it


Modified: bootdisk/trunk/batch-installer/installer-prep
==============================================================================
--- bootdisk/trunk/batch-installer/installer-prep	(original)
+++ bootdisk/trunk/batch-installer/installer-prep	Sat Dec  3 20:29:23 2005
@@ -331,6 +331,9 @@
       if test "$dhcp_pid" = ""; then
         # af_packet is needed for dhcpcd
         load_module af_packet
+        # dhcpcd shouldn't be running but who knows...
+        kill `ps|grep dhcpcd|awk '{print $1}'` 2>/dev/null || :
+        rm /var/run/dhcp*pid 2>/dev/null || :
         log info "running dhcpcd"
         dhcpcd "$net_device" || die "Problems with dhcp"
         log info "$net_device configured with dhcp"