From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Thu, 14 Oct 2010 15:34:53 +0000 (+0000)
Subject: fixup install scripts with root option.
X-Git-Tag: release-1.4.7rc1~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=614cbb3e9212597c83fffd84c0b7a8ba3df10786;p=thirdparty%2Funbound.git

fixup install scripts with root option.

git-svn-id: file:///svn/unbound/trunk@2293 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/winrc/setup.nsi b/winrc/setup.nsi
index 3979aa879..66d5d1271 100644
--- a/winrc/setup.nsi
+++ b/winrc/setup.nsi
@@ -75,7 +75,8 @@ section "Root anchor - DNSSEC" SectionRootKey
 	AddSize 2
 sectionEnd
 
-section "DLV - dlv.isc.org" SectionDLV
+# the /o means it is not selected by default.
+section /o "DLV - dlv.isc.org" SectionDLV
 	# add estimated size for key (Kb)
 	AddSize 2
 	SetOutPath $INSTDIR
@@ -116,11 +117,11 @@ section "-hidden.postinstall"
 	${If} $R0 == ${SF_SELECTED}
 		ClearErrors
 		FileOpen $R1 "$INSTDIR\service.conf" a
-		IfErrors done
+		IfErrors done_rk
 		FileSeek $R1 0 END
 		FileWrite $R1 "$\nserver: auto-trust-anchor-file: $\"$INSTDIR\root.key$\"$\n"
 		FileClose $R1
-	  done:
+	  done_rk:
 		WriteRegStr HKLM "Software\Unbound" "RootAnchor" "yes"
 	${Else}
 		WriteRegStr HKLM "Software\Unbound" "RootAnchor" "no"
@@ -132,11 +133,11 @@ section "-hidden.postinstall"
 	${If} $R0 == ${SF_SELECTED}
 		ClearErrors
 		FileOpen $R1 "$INSTDIR\service.conf" a
-		IfErrors done
+		IfErrors done_dlv
 		FileSeek $R1 0 END
 		FileWrite $R1 "$\nserver: dlv-anchor-file: $\"$INSTDIR\dlv.isc.org.key$\"$\n"
 		FileClose $R1
-	  done:
+	  done_dlv:
 		WriteRegStr HKLM "Software\Unbound" "CronAction" "$\"$INSTDIR\anchor-update.exe$\" dlv.isc.org $\"$INSTDIR\dlv.isc.org.key$\""
 	${Else}
 		WriteRegStr HKLM "Software\Unbound" "CronAction" ""
@@ -173,9 +174,9 @@ section "-hidden.postinstall"
 sectionEnd
 
 # set section descriptions
-LangString DESC_unbound ${LANG_ENGLISH} "The base unbound DNS(SEC) validating caching resolver. $\r$\n$\r$\nIt can be found in the Services control panel, and a config file is in the Program Files folder."
+LangString DESC_unbound ${LANG_ENGLISH} "The base unbound DNS(SEC) validating caching resolver. $\r$\n$\r$\nStarted at boot from the Services control panel, logs to the Application Log, and the config file is its Program Files folder."
 LangString DESC_rootkey ${LANG_ENGLISH} "Set up to use the DNSSEC root trust anchor. It is automatically updated. $\r$\n$\r$\nThis provides the main key that is used for security verification."
-LangString DESC_dlv ${LANG_ENGLISH} "Set up to use DLV with dlv.isc.org. Downloads the key with a leap of faith. $\r$\n$\r$\nThis provides additional public keys that are used for security verification, but your queries (websites) are sent to a remote server to fetch them."
+LangString DESC_dlv ${LANG_ENGLISH} "Set up to use DLV with dlv.isc.org. Downloads the key during install. $\r$\n$\r$\nIt fetches additional public keys that are used for security verification by querying the isc.org server with names encountered."
 
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
   !insertmacro MUI_DESCRIPTION_TEXT ${SectionUnbound} $(DESC_unbound)