summaryrefslogtreecommitdiff
path: root/functions
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2009-03-24 22:37:34 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:09:43 +0100
commit3f42bba0c79733aa281794876686b0640ae0281b (patch)
treee92f8ada92953a3a968598191fbab058fe98b155 /functions
parent14571619340bd32da269af6e2cfdebe404877a7a (diff)
downloadvyos-live-build-3f42bba0c79733aa281794876686b0640ae0281b.tar.gz
vyos-live-build-3f42bba0c79733aa281794876686b0640ae0281b.zip
Don't always overwrite keyring package option on debian or emedebian mode.
Diffstat (limited to 'functions')
-rwxr-xr-xfunctions/defaults.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh
index d695f001e..2b2e3f7a4 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -379,11 +379,11 @@ Set_defaults ()
# Setting keyring packages
case "${LH_MODE}" in
debian|debian-release)
- LH_KEYRING_PACKAGES="debian-archive-keyring"
+ LH_KEYRING_PACKAGES="${LH_KEYRING_PACKAGES:-debian-archive-keyring}"
;;
emdebian)
- LH_KEYRING_PACKAGES="debian-archive-keyring"
+ LH_KEYRING_PACKAGES="${LH_kEYRING_PACKAGES:-debian-archive-keyring}"
;;
esac