manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Using better suited variable name for live-helpers local key.

This commit is contained in:
Daniel Baumann 2008-07-15 09:32:30 +02:00
parent 81893c0e3d
commit e8f45391ba
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
helpers/lh_chroot_sources
View File

@ -31,7 +31,7 @@ Set_defaults
# Requiring stage file # Requiring stage file
Require_stagefile .stage/bootstrap 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 case "${1}" in
install) install)
@ -143,7 +143,7 @@ case "${1}" in
Subkey-Type: ELG-E Subkey-Type: ELG-E
Subkey-Length: 1024 Subkey-Length: 1024
Name-Real: live-helper local packages key Name-Real: live-helper local packages key
Name-Email: ${_LH_DUMMY_KEY_EMAIL} Name-Email: ${_LH_LOCAL_KEY_EMAIL}
Expire-Date: 0 Expire-Date: 0
%secring /root/local-package-keyring.sec %secring /root/local-package-keyring.sec
%pubring /root/local-package-keyring.pub %pubring /root/local-package-keyring.pub
@ -173,7 +173,7 @@ case "${1}" in
# Import key # Import key
Chroot "gpg --no-default-keyring --secret-keyring /root/local-package-keyring.sec \ Chroot "gpg --no-default-keyring --secret-keyring /root/local-package-keyring.sec \
--keyring /root/local-package-keyring.pub --armor \ --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 # Remove temporary keyrings
rm chroot/root/local-package-keyring.pub rm chroot/root/local-package-keyring.pub
@ -398,9 +398,9 @@ case "${1}" in
rm -rf chroot/root/local-packages rm -rf chroot/root/local-packages
# Remove local packages key if it exists # 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 then
apt-key del ${_LH_DUMMY_KEY_EMAIL} apt-key del ${_LH_LOCAL_KEY_EMAIL}
fi fi
# Removing stage file # Removing stage file