[SCM] live-helper branch, debian-next, updated. debian/2.0_a9-1-15-gebcc0ea

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit ebcc0eaa9fb61f9e1b0fd46bda168d874794ee37
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Apr 9 21:03:49 2010 +0200

    Adding --repositories, part 5.

diff --git a/helpers/chroot_sources b/helpers/chroot_sources
index 1ba1f51..e11ff42 100755
--- a/helpers/chroot_sources
+++ b/helpers/chroot_sources
@@ -143,12 +143,12 @@ case "${1}" in
 				if [ "${LH_APT_SECURE}" != false ]
 				then
 					# Adding archive signing keys (chroot)
-					if [ -e "${LH_BASE}/repositores/${REPOSITORY}.chroot.gpg" ]
+					if [ -e "${LH_BASE}/repositories/${REPOSITORY}.chroot.gpg" ]
 					then
-						cat "${LH_BASE}/repositores/${REPOSITORY}.gpg" | Chroot "apt-key add -"
-					elif [ -e "${LH_BASE}/repositores/${REPOSITORY}.gpg" ]
+						cat "${LH_BASE}/repositories/${REPOSITORY}.gpg" | Chroot "apt-key add -"
+					elif [ -e "${LH_BASE}/repositories/${REPOSITORY}.gpg" ]
 					then
-						cat "${LH_BASE}/repositores/${REPOSITORY}.chroot.gpg" | Chroot "apt-key add -"
+						cat "${LH_BASE}/repositories/${REPOSITORY}.chroot.gpg" | Chroot "apt-key add -"
 					fi
 				fi
 			done
@@ -513,12 +513,12 @@ case "${1}" in
 				if [ "${LH_APT_SECURE}" != false ]
 				then
 					# Adding archive signing keys (binary)
-					if [ -e "${LH_BASE}/repositores/${REPOSITORY}.binary.gpg" ]
+					if [ -e "${LH_BASE}/repositories/${REPOSITORY}.binary.gpg" ]
 					then
-						cat "${LH_BASE}/repositores/${REPOSITORY}.gpg" | Chroot "apt-key add -"
-					elif [ -e "${LH_BASE}/repositores/${REPOSITORY}.gpg" ]
+						cat "${LH_BASE}/repositories/${REPOSITORY}.gpg" | Chroot "apt-key add -"
+					elif [ -e "${LH_BASE}/repositories/${REPOSITORY}.gpg" ]
 					then
-						cat "${LH_BASE}/repositores/${REPOSITORY}.binary.gpg" | Chroot "apt-key add -"
+						cat "${LH_BASE}/repositories/${REPOSITORY}.binary.gpg" | Chroot "apt-key add -"
 					fi
 				fi
 			done
diff --git a/manpages/lh_config.en.1 b/manpages/lh_config.en.1
index 9cf53c1..cbe5b63 100644
--- a/manpages/lh_config.en.1
+++ b/manpages/lh_config.en.1
@@ -160,6 +160,8 @@ lh_config \- create configuration for live\-helper
 .br
 	[\fB\-\-packages\fR \fIPACKAGE\fR|\fI"PACKAGES"\fR]
 .br
+	[\fB\-r, \-\-repositories \fIREPOSITORY\fR|\fI"REPOSITORIES"\fR]
+.br
 	[\fB\-\-root-command\fR sudo]
 .br
 	[\fB\-\-use-fakeroot\fR true|false]
@@ -369,6 +371,8 @@ defines the format of the netboot image. Choosing tar results in a not compresse
 defines which lists available in /usr/share/live-helper/lists should be used. By default, this is set to standard. Note that in case you have local packages lists, you don't need to list them here. Putting them into config/chroot_local-packageslists is enough (the filename needs to have the .list suffix though).
 .IP "\fB\-\-packages\fR \fIPACKAGE\fR|\fI""PACKAGES""\fR" 4
 defines one or more packages to be installed in the live system. This is a quick and convenient place to add a few packages when building an image (limited by the max length of shell). Packages that should be permanently installed should be put into a local packages list.
+.IP "\fB\-r, \-\-repositories\fR \fIREPOSITORY\fR|\fI""REPOSITORIES""\fR" 4
+enables one of available third-party repository configurations in /usr/share/live-helper/repositories.
 .IP "\fB\-\-root-command\fR sudo" 4
 controls if live-helper should use sudo internally to build the live image. Note that this is not well tested and that you should, when relying on sudo, call the individual live\-helper command with sudo itself.
 .IP "\fB\-\-use-fakeroot\fR true|false" 4

-- 
live-helper