From: Otavio Salvador <[EMAIL PROTECTED]>
A new configuration variable 'LIVE_BOOTSTRAP_KEYRING' has been add to
allow bootstraping to use a different keyring to validate the releases
files.
Signed-off-by: Otavio Salvador <[EMAIL PROTECTED]>
---
helpers/lh_bootstrap_cdebootstrap | 5 +++++
helpers/lh_config | 4 ++++
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/helpers/lh_bootstrap_cdebootstrap
b/helpers/lh_bootstrap_cdebootstrap
index 4cd4f03..f0161d5 100755
--- a/helpers/lh_bootstrap_cdebootstrap
+++ b/helpers/lh_bootstrap_cdebootstrap
@@ -63,6 +63,11 @@ then
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"
diff --git a/helpers/lh_config b/helpers/lh_config
index 7985f77..bef0be7 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -187,6 +187,10 @@ LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}"
# (Default: empty)
LIVE_BOOTSTRAP_CONFIG="${LIVE_BOOTSTRAP_CONFIG}"
+# \$LIVE_BOOTSTRAP_KEYRING: set distribution keyring
+# (Default: empty)
+LIVE_BOOTSTRAP_KEYRING="${LIVE_BOOTSTRAP_KEYRING}"
+
# \$LIVE_BOOTSTRAP_FLAVOUR: select flavour to use
# (Default: ${LIVE_BOOTSTRAP_FLAVOUR})
LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}"
_______________________________________________
Debian-live-devel mailing list
Debian-live-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/debian-live-devel
