Browse code

make sure gpg keys get installed for ova paths

Change-Id: I3cf07eb7545e41cde65a4540be338379d8975303
Reviewed-on: http://photon-jenkins.eng.vmware.com/716
Reviewed-by: suezzelur <anishs@vmware.com>
Tested-by: suezzelur <anishs@vmware.com>

ppadmavilasom authored on 2016/04/14 10:42:54
Showing 2 changed files
... ...
@@ -25,6 +25,9 @@ LOGFILE=/var/log/"${PRGNAME}-${LOGFILE}"	#	set log file name
25 25
 /usr/sbin/grpconv
26 26
 /bin/systemd-machine-id-setup
27 27
 
28
+# Importing the pubkey
29
+rpm --import /etc/pki/rpm-gpg/*
30
+
28 31
 #TODO: This should be removed, systemd should be able to create this file
29 32
 /usr/bin/touch /var/run/utmp
30 33
 #/sbin/locale-gen.sh
... ...
@@ -38,8 +38,7 @@ cd ${BUILDROOT} || fail "${PRGNAME}: Change directory: ${BUILDROOT}: FAILURE"
38 38
 if [[	$# -gt 0 ]] && [[ $1 == 'install' ]]; then
39 39
 	mkdir -p ${BUILDROOT}/var/lib/rpm
40 40
 	rpm   --root ${BUILDROOT} --initdb
41
-    tdnf install filesystem photon-repos --installroot ${BUILDROOT} --nogpgcheck --assumeyes
42
-    rpm --root ${BUILDROOT} --import ${BUILDROOT}/etc/pki/rpm-gpg/VMWARE-RPM-GPG-KEY
41
+    tdnf install filesystem --installroot ${BUILDROOT} --nogpgcheck --assumeyes
43 42
 else
44 43
 	RPMPKG="$(find RPMS -name 'filesystem-[0-9]*.rpm' -print)"
45 44
 	[ -z ${RPMPKG} ] && fail "	Filesystem rpm package missing: Can not continue"