From a7ea1f2efd616149b2419bb394f54d4828d316b9 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Mon, 18 Dec 2006 21:44:11 +0000 Subject: [PATCH] windows-nsis-20061218 remove the autorun for the AFS Server Wizard remove the shortcut to the AFS Server Wizard update the service dependencies for the bosctlsvc (tcpip and PNP_TDI) --- src/WINNT/install/NSIS/OpenAFS.nsi | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/src/WINNT/install/NSIS/OpenAFS.nsi b/src/WINNT/install/NSIS/OpenAFS.nsi index 2126146fa..b8e99e319 100644 --- a/src/WINNT/install/NSIS/OpenAFS.nsi +++ b/src/WINNT/install/NSIS/OpenAFS.nsi @@ -914,7 +914,7 @@ skipCheck: IfFileExists "$INSTDIR\Server\usr\afs\etc\ThisCell" SkipStartup ; Make the server config wizard auto-start on bootup if this is an install (not an upgrade) - WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce" "AFS Server Wizard" '"$INSTDIR\Server\usr\afs\bin\afssvrcfg.exe" /wizard"' + ; WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce" "AFS Server Wizard" '"$INSTDIR\Server\usr\afs\bin\afssvrcfg.exe" /wizard"' SkipStartup: @@ -922,10 +922,24 @@ SkipStartup: ;nsExec::Exec '$INSTDIR\Common\service.exe u TransarcAFSServer' nsExec::Exec '$INSTDIR\Common\service.exe TransarcAFSServer "$INSTDIR\Server\usr\afs\bin\bosctlsvc.exe" "OpenAFS AFS Server"' Delete "$INSTDIR\Common\service.exe" + + strcpy $REG_SUB_KEY "SYSTEM\CurrentControlSet\Services\TransarcAFSServer" + strcpy $REG_VALUE "DependOnGroup" + strcpy $REG_DATA_1 "PNP_TDI" + strcpy $REG_DATA_2 "" + strcpy $REG_DATA_3 "" + strcpy $REG_DATA_4 "" + Call RegWriteMultiStr + strcpy $REG_SUB_KEY "SYSTEM\CurrentControlSet\Services\TransarcAFSServer" + strcpy $REG_VALUE "DependOnService" + strcpy $REG_DATA_1 "Tcpip" + strcpy $REG_DATA_2 "" + strcpy $REG_DATA_3 "" + strcpy $REG_DATA_4 "" + Call RegWriteMultiStr - CreateDirectory "$SMPROGRAMS\OpenAFS\Server" - CreateShortCut "$SMPROGRAMS\OpenAFS\Server\Server Configuration.lnk" "$INSTDIR\Server\usr\afs\bin\afssvrcfg.exe" - + ;CreateDirectory "$SMPROGRAMS\OpenAFS\Server" + ;CreateShortCut "$SMPROGRAMS\OpenAFS\Server\Server Configuration.lnk" "$INSTDIR\Server\usr\afs\bin\afssvrcfg.exe" WriteUninstaller "$INSTDIR\Uninstall.exe" WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenAFS" "DisplayIcon" "$INSTDIR\Uninstall.exe,0" -- 2.39.5