From: Jeffrey Altman Date: Tue, 16 Mar 2004 04:40:10 +0000 (+0000) Subject: service-dependencies-20040315 X-Git-Tag: openafs-devel-1_3_60~24 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=741486ef8356743aa3b42b07b9501c42ac1e1dec;p=packages%2Fo%2Fopenafs.git service-dependencies-20040315 Fix the location of the registy values to be used for specifying the service dependencies of the AFS Network Provider. AFS is dependent on PNP_TDI (tcpip, netbt, etc); RpcSs; and NetBios. Upgrades were failing to read the Cell name from the proper location so that it could be restored. --- diff --git a/src/WINNT/install/NSIS/OpenAFS.nsi b/src/WINNT/install/NSIS/OpenAFS.nsi index 95c513926..a1de9c84d 100644 --- a/src/WINNT/install/NSIS/OpenAFS.nsi +++ b/src/WINNT/install/NSIS/OpenAFS.nsi @@ -615,7 +615,7 @@ Section "AFS Client" secClient ;IMPORTANT! If we are not refreshing the config files, do NOT remove the service ;Don't re-install because it must be present or we wouldn't have passed the Reg check - ReadRegStr $R2 HKLM "SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon" "Cell" + ReadRegStr $R2 HKLM "SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\Parameters" "Cell" StrCmp $R2 "" +1 skipremove nsExec::Exec '$INSTDIR\Common\Service.exe u TransarcAFSDaemon' nsExec::Exec '$INSTDIR\Common\Service.exe TransarcAFSDaemon "$INSTDIR\Client\Program\afsd_service.exe" "OpenAFS Client Service"' @@ -657,7 +657,7 @@ skipremove: WriteRegDWORD HKLM "SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\Parameters" "NoFindLanaByName" 1 !ENDIF - strcpy $REG_SUB_KEY "SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider" + strcpy $REG_SUB_KEY "SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon" strcpy $REG_VALUE "DependOnGroup" strcpy $REG_DATA_1 "PNP_TDI" strcpy $REG_DATA_2 "" @@ -667,7 +667,7 @@ skipremove: strcpy $REG_VALUE "DependOnService" strcpy $REG_DATA_1 "Tcpip" strcpy $REG_DATA_2 "NETBIOS" - strcpy $REG_DATA_3 "NetBT" + strcpy $REG_DATA_3 "RpcSs" Call RegWriteMultiStr SetRebootFlag true