summaryrefslogtreecommitdiff
path: root/cmdline/apt-key
diff options
context:
space:
mode:
Diffstat (limited to 'cmdline/apt-key')
-rwxr-xr-xcmdline/apt-key9
1 files changed, 4 insertions, 5 deletions
diff --git a/cmdline/apt-key b/cmdline/apt-key
index 048105320..860895ae2 100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -9,10 +9,9 @@ GPG_CMD="gpg --ignore-time-conflict --no-options --no-default-keyring --secret-k
GPG="$GPG_CMD --keyring /etc/apt/trusted.gpg"
-MASTER_KEYRING=""
-#MASTER_KEYRING=/usr/share/keyrings/debian-master-keyring.gpg
-ARCHIVE_KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg
-REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg
+MASTER_KEYRING=/usr/share/keyrings/ubuntu-master-keyring.gpg
+ARCHIVE_KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg
+REMOVED_KEYS=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg
add_keys_with_verify_against_master_keyring() {
ADD_KEYRING=$1
@@ -46,7 +45,7 @@ add_keys_with_verify_against_master_keyring() {
update() {
if [ ! -f $ARCHIVE_KEYRING ]; then
echo >&2 "ERROR: Can't find the archive-keyring"
- echo >&2 "Is the debian-archive-keyring package installed?"
+ echo >&2 "Is the ubuntu-keyring package installed?"
exit 1
fi