diff options
| author | Daniel Baumann <daniel@debian.org> | 2008-07-15 09:32:30 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:03:37 +0100 |
| commit | 8b2ee102d233bba666fd5927dc4510e5ce2decca (patch) | |
| tree | 3ba68ef24ff5dbc5177a460dc3719d9cbe0a277d | |
| parent | d5f142a24adc4982e0e13fb706bfa7da1f7113dd (diff) | |
| download | vyos-live-build-8b2ee102d233bba666fd5927dc4510e5ce2decca.tar.gz vyos-live-build-8b2ee102d233bba666fd5927dc4510e5ce2decca.zip | |
Using better suited variable name for live-helpers local key.
| -rwxr-xr-x | helpers/lh_chroot_sources | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/helpers/lh_chroot_sources b/helpers/lh_chroot_sources index a355acecd..f5bdb13a0 100755 --- a/helpers/lh_chroot_sources +++ b/helpers/lh_chroot_sources @@ -31,7 +31,7 @@ Set_defaults # Requiring stage file Require_stagefile .stage/bootstrap -_LH_DUMMY_KEY_EMAIL="live-helper-local-key@dummy" +_LH_LOCAL_KEY_EMAIL="live-helper-local-key@dummy" case "${1}" in install) @@ -143,7 +143,7 @@ case "${1}" in Subkey-Type: ELG-E Subkey-Length: 1024 Name-Real: live-helper local packages key - Name-Email: ${_LH_DUMMY_KEY_EMAIL} + Name-Email: ${_LH_LOCAL_KEY_EMAIL} Expire-Date: 0 %secring /root/local-package-keyring.sec %pubring /root/local-package-keyring.pub @@ -173,7 +173,7 @@ case "${1}" in # Import key Chroot "gpg --no-default-keyring --secret-keyring /root/local-package-keyring.sec \ --keyring /root/local-package-keyring.pub --armor \ - --export ${_LH_DUMMY_KEY_EMAIL}" | Chroot "apt-key add -" + --export ${_LH_LOCAL_KEY_EMAIL}" | Chroot "apt-key add -" # Remove temporary keyrings rm chroot/root/local-package-keyring.pub @@ -398,9 +398,9 @@ case "${1}" in rm -rf chroot/root/local-packages # Remove local packages key if it exists - if apt-key list | grep -q ${_LH_DUMMY_KEY_EMAIL} + if apt-key list | grep -q ${_LH_LOCAL_KEY_EMAIL} then - apt-key del ${_LH_DUMMY_KEY_EMAIL} + apt-key del ${_LH_LOCAL_KEY_EMAIL} fi # Removing stage file |