From 56ce668c84ad27bc1c61819c72875e899fa12058 Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Thu, 20 Nov 2014 17:06:00 +0000 Subject: [PATCH] always intsall gpg key from script --- vm/firstboot.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/vm/firstboot.sh b/vm/firstboot.sh index fbaa2f9fe..c4c3bd9e0 100755 --- a/vm/firstboot.sh +++ b/vm/firstboot.sh @@ -7,10 +7,8 @@ else fi UBUNTU_VERSION="$VERSION_ID" export DEBIAN_FRONTEND=noninteractive -if [ "$ID" == "debian" ]; then - SYSTEMD="yes" - echo "deb http://ppa.launchpad.net/j/pandora/ubuntu trusty main" > /etc/apt/sources.list.d/j-pandora.list - apt-key add - << EOF +echo "deb http://ppa.launchpad.net/j/pandora/ubuntu trusty main" > /etc/apt/sources.list.d/j-pandora.list +apt-key add - << EOF -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v1 @@ -26,6 +24,8 @@ pAAGSEQ4uz6bYSeM4Q== -----END PGP PUBLIC KEY BLOCK----- EOF +if [ "$ID" == "debian" ]; then + SYSTEMD="yes" else SYSTEMD="no" if [ "$UBUNTU_VERSION" == "12.04" ]; then @@ -37,8 +37,6 @@ else update-manager-core \ software-properties-common \ $EXTRA - - add-apt-repository -y ppa:j/pandora fi apt-get update