[Debian-live-changes] r1917 - in dists/trunk/live-helper: docs helpers

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-06-02 17:08:09 +0000 (Sat, 02 Jun 2007)
New Revision: 1917

Modified:
   dists/trunk/live-helper/docs/ChangeLog
   dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap
   dists/trunk/live-helper/helpers/lh_config
Log:


Modified: dists/trunk/live-helper/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog	2007-06-02 16:58:17 UTC (rev 1916)
+++ dists/trunk/live-helper/docs/ChangeLog	2007-06-02 17:08:09 UTC (rev 1917)
@@ -1,3 +1,8 @@
+2007-06-02  Daniel Baumann  <daniel at debian.org>
+
+	* Applied patches from Otavio Salvador <otavio at debian.org>:
+	  -  Add support to specify the keyring to be used while bootstraping.
+
 2007-05-28  Daniel Baumann  <daniel at debian.org>
 
 	* helpers/*:

Modified: dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap
===================================================================
--- dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap	2007-06-02 16:58:17 UTC (rev 1916)
+++ dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap	2007-06-02 17:08:09 UTC (rev 1917)
@@ -63,6 +63,11 @@
 	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --suite-config=${LIVE_BOOTSTRAP_CONFIG}"
 fi
 
+if [ -n "${LIVE_BOOTSTRAP_KEYRING}" ]
+then
+    CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --keyring=${LIVE_BOOTSTRAP_KEYRING}"
+fi
+
 if [ "${LIVE_PACKAGES_LISTS}" != "minimal" ] && [ "${LIVE_PACKAGES_LISTS}" != "mini" ]
 then
 	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=standard"

Modified: dists/trunk/live-helper/helpers/lh_config
===================================================================
--- dists/trunk/live-helper/helpers/lh_config	2007-06-02 16:58:17 UTC (rev 1916)
+++ dists/trunk/live-helper/helpers/lh_config	2007-06-02 17:08:09 UTC (rev 1917)
@@ -191,6 +191,10 @@
 # (Default: ${LIVE_BOOTSTRAP_FLAVOUR})
 LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}"
 
+# \$LIVE_BOOTSTRAP_KEYRING: set distribution keyring
+# (Default: empty)
+LIVE_BOOTSTRAP_KEYRING="${LIVE_BOOTSTRAP_KEYRING}"
+
 # \$LIVE_MIRROR_BOOTSTRAP: set mirror to fetch packages from
 # (Default: ${LIVE_MIRROR_BOOTSTRAP})
 LIVE_MIRROR_BOOTSTRAP="${LIVE_MIRROR_BOOTSTRAP}"