Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 15:36:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SYSSETUP]

Browse source 
- 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
This commit is contained in:
Thomas Faber 2016-10-06 10:57:29 +00:00
parent 48a354d428
commit e8109a02b4
3 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
reactos/boot/bootdata/hivesys.inf
View file

@ -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","Start",0x00010001,0x00000004
HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","Type",0x00010001,0x00000001 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 ; EMS Serial Administration Console Driver
HKLM,"SYSTEM\CurrentControlSet\Services\sacdrv","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\sacdrv","ErrorControl",0x00010001,0x00000000
HKLM,"SYSTEM\CurrentControlSet\Services\sacdrv","Group",0x00000000,"EMS" HKLM,"SYSTEM\CurrentControlSet\Services\sacdrv","Group",0x00000000,"EMS"

2
reactos/dll/win32/syssetup/install.c
View file

@ -834,6 +834,7 @@ InstallLiveCD(IN HINSTANCE hInstance)
{ {
/* Start the TCP/IP protocol driver */ /* Start the TCP/IP protocol driver */
SetupStartService(L"Tcpip", FALSE); SetupStartService(L"Tcpip", FALSE);
SetupStartService(L"Dhcp", FALSE);
} }
if (!CommonInstall()) if (!CommonInstall())
@ -1148,6 +1149,7 @@ InstallReactOS(HINSTANCE hInstance)
{ {
/* Start the TCP/IP protocol driver */ /* Start the TCP/IP protocol driver */
SetupStartService(L"Tcpip", FALSE); SetupStartService(L"Tcpip", FALSE);
SetupStartService(L"Dhcp", FALSE);
} }

15
reactos/media/inf/nettcpip.inf
View file

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