Merge pull request 'Use openSUSE-build key and import gpkeys to recognize ALP key' (#1) from master into 16.0
Reviewed-on: #1
This commit is contained in:
commit
db1d411765
@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<!-- OBS-Profiles: @BUILD_FLAVOR@ -->
|
<!-- OBS-Profiles: @BUILD_FLAVOR@ -->
|
||||||
<!-- OBS-Milestone: %current_milestone -->
|
<!-- OBS-Milestone: %current_milestone -->
|
||||||
<!-- OBS-BcntSyncTag: Leap-Micro -->
|
<!-- OBS-BcntSyncTag: Leap -->
|
||||||
<image schemaversion="7.5" name="openSUSE-Leap-Micro" displayname="openSUSE Leap">
|
<image schemaversion="7.5" name="openSUSE-Leap-Micro" displayname="openSUSE Leap">
|
||||||
<description type="system">
|
<description type="system">
|
||||||
<author>openSUSE</author>
|
<author>openSUSE</author>
|
||||||
@ -695,7 +695,7 @@
|
|||||||
<package name="firewalld"/>
|
<package name="firewalld"/>
|
||||||
<package name="NetworkManager-tui"/>
|
<package name="NetworkManager-tui"/>
|
||||||
<package name="growpart-generator"/>
|
<package name="growpart-generator"/>
|
||||||
<package name="suse-build-key"/>
|
<package name="openSUSE-build-key"/>
|
||||||
<!-- for debugging -->
|
<!-- for debugging -->
|
||||||
<package name="less"/>
|
<package name="less"/>
|
||||||
<package name="vim-small"/>
|
<package name="vim-small"/>
|
||||||
|
@ -314,4 +314,17 @@ if [[ "$kiwi_profiles" =~ ^(x86-qcow|x86-vmware|aarch64-qcow)$ ]]; then
|
|||||||
echo "policy: search,found=all,maybe=disabled,notfound=disabled" > /etc/cloud/ds-identify.cfg
|
echo "policy: search,found=all,maybe=disabled,notfound=disabled" > /etc/cloud/ds-identify.cfg
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
#======================================
|
||||||
|
# Import trusted rpm keys
|
||||||
|
#--------------------------------------
|
||||||
|
for i in /usr/lib/rpm/gnupg/keys/gpg-pubkey*asc; do
|
||||||
|
# importing can fail if it already exists
|
||||||
|
rpm --import $i || true
|
||||||
|
done
|
||||||
|
|
||||||
|
#======================================
|
||||||
|
# Refresh zypper services / repos
|
||||||
|
#--------------------------------------
|
||||||
|
zypper refs
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
|
Loading…
Reference in New Issue
Block a user