[SYSSETUP]

- Install the DHCP client service as part of nettcpip.inf. This ensures it does not try to run before tcpip is installed.
CORE-12011 #resolve

svn path=/trunk/; revision=72916

diff --git a/reactos/boot/bootdata/hivesys.inf b/reactos/boot/bootdata/hivesys.inf
index 1c1d0b8..bd5dd95 100644 (file)
--- a/reactos/boot/bootdata/hivesys.inf
+++ b/reactos/boot/bootdata/hivesys.inf
@@ -1471,17 +1471,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","ImagePath",0x00020000,"system
 HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","Start",0x00010001,0x00000004
 HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","Type",0x00010001,0x00000001
 
-; DHCP client service
-HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","DisplayName",0x00000000,"DHCP Client"
-HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Description",0x00000000,"Attempts to obtain network settings automatically from an available DHCP server"
-HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","ErrorControl",0x00010001,0x00000001
-HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Group",0x00000000,"TDI"
-HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","ImagePath",0x00020000,"%SystemRoot%\system32\svchost.exe -k netsvcs"
-HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","ObjectName",0x00000000,"LocalSystem"
-HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Start",0x00010001,0x00000002
-HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Type",0x00010001,0x00000020
-HKLM,"SYSTEM\CurrentControlSet\Services\DHCP\Parameters","ServiceDll",0x00020000,"%SystemRoot%\system32\dhcpcsvc.dll"
-
 ; EMS Serial Administration Console Driver
 HKLM,"SYSTEM\CurrentControlSet\Services\sacdrv","ErrorControl",0x00010001,0x00000000
 HKLM,"SYSTEM\CurrentControlSet\Services\sacdrv","Group",0x00000000,"EMS"

diff --git a/reactos/dll/win32/syssetup/install.c b/reactos/dll/win32/syssetup/install.c
index 26235e1..2c059d1 100644 (file)
--- a/reactos/dll/win32/syssetup/install.c
+++ b/reactos/dll/win32/syssetup/install.c
@@ -834,6 +834,7 @@ InstallLiveCD(IN HINSTANCE hInstance)
     {
         /* Start the TCP/IP protocol driver */
         SetupStartService(L"Tcpip", FALSE);
+        SetupStartService(L"Dhcp", FALSE);
     }
 
     if (!CommonInstall())
@@ -1148,6 +1149,7 @@ InstallReactOS(HINSTANCE hInstance)
     {
         /* Start the TCP/IP protocol driver */
         SetupStartService(L"Tcpip", FALSE);
+        SetupStartService(L"Dhcp", FALSE);
     }
 
 

diff --git a/reactos/media/inf/nettcpip.inf b/reactos/media/inf/nettcpip.inf
index 397ff14..70f58f5 100644 (file)
--- a/reactos/media/inf/nettcpip.inf
+++ b/reactos/media/inf/nettcpip.inf
@@ -234,6 +234,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Winsock2\Parameters\Protocol_Catalog9\Ca
 \r
 [MS_TCPIP.PrimaryInstall.Services]\r
 AddService = Tcpip, , tcpip_Service_Inst\r
+AddService = DHCP, , dhcp_Service_Inst\r
 \r
 [tcpip_Service_Inst]\r
 ServiceType   = 1\r
@@ -254,6 +255,20 @@ HKR,"Parameters","SearchList",0x00000000,""
 HKR,"Parameters","EnableSecurityFilters",0x00010001,0x00000000\r
 ;HKR,"Parameters","PersistentRoutes",,0x00000010\r
 \r
+[dhcp_Service_Inst]\r
+DisplayName   = "DHCP Client"\r
+Description   = "Attempts to obtain network settings automatically from an available DHCP server"\r
+ServiceType   = 0x20\r
+StartType     = 2\r
+ErrorControl  = 1\r
+ServiceBinary = "%11%\svchost.exe -k netsvcs"\r
+LoadOrderGroup = TDI\r
+AddReg=dhcp_AddReg\r
+\r
+[dhcp_AddReg]\r
+HKR,,"ObjectName",0x00000000,"LocalSystem"\r
+HKR,"Parameters","ServiceDll",0x00020000,"%SystemRoot%\system32\dhcpcsvc.dll"\r
+\r
 ;-------------------------------- STRINGS -------------------------------\r
 \r
 [Strings]\r