MT#11947 Include Sipwise keyring 'sipwise.gpg' into CE Install CD

Change-Id: Id0622fe94fdcee8806f4764cd6a2934fd1a8c9a7
changes/30/1230/5
Alexander Lutay 12 years ago
parent 60c45937fe
commit bacb139eaf

@ -7,7 +7,10 @@ build:
@echo -n "Downloading deployment.sh scripts"; \
wget -r --directory-prefix=./templates-ce/scripts/includes/netscript/ --reject "index.html*" \
--no-parent --no-host-directories --cut-dirs=1 "http://deb.sipwise.com/netscript/" ; \
echo " done."; \
echo " done.";
@echo -n "Downloading Sipwise keyring 'sipwise.gpg'"; \
wget -O ./templates-ce/scripts/includes/sipwise.gpg https://deb.sipwise.com/spce/sipwise.gpg ;\
echo " done.";
syntaxcheck: shellcheck
@ -28,6 +31,7 @@ clean:
templates/boot/isolinux/sipwise_latest.cfg templates/boot/isolinux/sipwise_lts.cfg
rm -f templates/boot/isolinux/syslinux.cfg
rm -rf templates-ce/scripts/includes/netscript
rm -f templates-ce/scripts/includes/sipwise.gpg
dist-clean: clean
rm -rf artifacts

@ -22,6 +22,15 @@ NORMAL="$(tput op)"
einfo "Executing grml-sipwise specific checks..."
eindent
install_sipwise_keyring() {
if [ -f "${scripts_dir}/sipwise.gpg" ]; then
einfo "Installing sipwise keyring to '/etc/apt/trusted.gpg.d/sipwise.gpg'..."; eend 0
cp "${scripts_dir}/sipwise.gpg" /etc/apt/trusted.gpg.d/sipwise.gpg
else
ewarn "Sipwise keyring '${scripts_dir}/sipwise.gpg' not found, continuing anyway." ; eend 0
fi
}
network_check() {
if ${scripts_dir}/check-for-network ; then
einfo "Looks like we have working network, continuing..." ; eend 0
@ -153,6 +162,7 @@ deploy() {
fi
}
install_sipwise_keyring
prompt_for_target
check_for_existing_pvs
network_check

Loading…
Cancel
Save