From 45574ccfbfc49796712c60df7be573ad2f076db4 Mon Sep 17 00:00:00 2001
From: Dieter Plaetinck <dieter@plaetinck.be>
Date: Mon, 10 Nov 2008 19:21:23 +0100
Subject: fix for dhcp works only once (maybe)

---
 TODO                                | 3 ++-
 src/core/libs/lib-ui-interactive.sh | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/TODO b/TODO
index c3c1e23..2801887 100644
--- a/TODO
+++ b/TODO
@@ -6,7 +6,7 @@ PRE-ALPHA PHASE: get it sort of reasonably working
 -> fixed i think
 * no default mirrorlist? -> fixed i think
 * can't return to main menu after mirror selection/network setup. maybe because network setup failed
-(if i say network is ok, it's ok though)
+(if i say network is ok, it's ok though) -> fixed i think
 
 
 ALPHA PHASE: get some people to test and suggest ideas, while fixing bugs
@@ -37,6 +37,7 @@ BETA PHASE: try to get fifa on the (beta) installcd as an experimental, alternat
 * setup bugtracker/roadmap thingie
 * fix everything
 * if dhcpd already runs for $reason, the installer will try again @ configure network and fail
+-> fixed i think
 
 PRODUCTION PHASE: totally replace /arch/setup and /arch/quickinst
 * fix everything even more
diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh
index a35ae90..b494dba 100644
--- a/src/core/libs/lib-ui-interactive.sh
+++ b/src/core/libs/lib-ui-interactive.sh
@@ -451,6 +451,9 @@ interactive_runtime_network() {
     ask_yesno "Do you want to use DHCP?" 0 0
     if [ $? -eq 0 ]; then
         infofy "Please wait.  Polling for DHCP server on $INTERFACE..."
+        killall dhcpd
+        killall -9 dhcpd
+        sleep 1
         dhcpcd $INTERFACE >$LOG 2>&1
         if [ $? -ne 0 ]; then
             notify "Failed to run dhcpcd.  See $LOG for details."
-- 
cgit v1.2.3-54-g00ecf