From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Tue, 9 May 2006 16:45:28 +0000 (+0000)
Subject: - fix how GPG keys are pushed into the reference images
X-Git-Tag: myplc-0_4-rc1~4
X-Git-Url: http://git.onelab.eu/?p=vserver-reference.git;a=commitdiff_plain;h=88d62822a48f558e247ce64fe59f501448ee7c73

- fix how GPG keys are pushed into the reference images
---

diff --git a/vserver-reference.init b/vserver-reference.init
index d231190..4ab7830 100755
--- a/vserver-reference.init
+++ b/vserver-reference.init
@@ -60,24 +60,22 @@ setattr --barrier /vservers
 # Copy configuration files from host to slices
 for file in /etc/hosts /etc/resolv.conf /etc/yum.conf /etc/planetlab/node_id \
             /etc/planetlab/plc_config* /etc/planetlab/php/* \
-            /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora \
-            /etc/pki/rpm-gpg/RPM-GPG-KEY-planetlab ; do
+            /etc/pki/rpm-gpg/* ; do
     if [ -r $file ] ; then
 	for vroot in $VROOTS ; do
-	    if [ "$(dirname $file)" = "/etc/pki/rpm-gpg" -a \
-		 ! -f $vroot/$file ] ; then
-		import=1
-	    else
-		import=0
-	    fi
 	    install -D -m 644 $file $vroot/$file
-	    if [ $import -eq 1 ] ; then
-		chroot $vroot rpm --import $file
-	    fi
 	done
     fi
 done
 
+# (Re)install GPG signing keys
+if [ -d /etc/pki/rpm-gpg ] ; then
+    for vroot in $VROOTS ; do
+	chroot $vroot rpm --allmatches -e gpg-pubkey || :
+	chroot $vroot rpm --import /etc/pki/rpm-gpg/* || :
+    done
+fi
+
 # Old versions of the Boot Manager copied portions of the Boot CD to
 # /mnt/cdrom/bootme, to support old scripts which assumed that the
 # Boot CD was mounted even in production mode. Now, it just copies it