Skip to content

Commit

Permalink
Fix gpg import (#1535)
Browse files Browse the repository at this point in the history
## Problem

In staging there is no opensuse keys for PXE build which causes build
failure.


https://build.opensuse.org/package/live_build_log/openSUSE:Factory:Staging:adi:34/agama-installer:openSUSE-PXE/images/x86_64


## Solution

Import keys only if there is any available.
  • Loading branch information
ancorgs committed Aug 12, 2024
2 parents e8579a9 + 1dd3bf6 commit 0759ddc
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
6 changes: 6 additions & 0 deletions live/src/agama-installer.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Aug 12 12:38:45 UTC 2024 - Josef Reidinger <jreidinger@suse.com>

- Do not fail if there is no opensuse keys on medium for PXE
(gh#openSUSE/agama#1535)

-------------------------------------------------------------------
Fri Aug 2 08:02:41 UTC 2024 - Ladislav Slezák <lslezak@suse.com>

Expand Down
6 changes: 4 additions & 2 deletions live/src/config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,10 @@ rm /tmp/systemsmanagement_key.gpg
# import the IBS key for the Devel:YaST:Agama:Head project
rpm --import /tmp/Devel_YaST_Agama_Head_key.gpg
rm /tmp/Devel_YaST_Agama_Head_key.gpg
# import the openSUSE keys
rpm --import /usr/lib/rpm/gnupg/keys/*.asc
# import the openSUSE keys, but check if there is any
if stat -t /usr/lib/rpm/gnupg/keys/*.asc 2>/dev/null 1>/dev/null; then
rpm --import /usr/lib/rpm/gnupg/keys/*.asc
fi

# activate services
systemctl enable sshd.service
Expand Down

0 comments on commit 0759ddc

Please sign in to comment.