From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Mon, 8 May 2006 20:53:35 +0000 (+0000)
Subject: - merge revision 1.22
X-Git-Tag: planetlab-3_3-bootcd~10
X-Git-Url: http://git.onelab.eu/?p=sliceimage.git;a=commitdiff_plain;h=011396229e3754695729316f8c01e7b1fbfbbcba

- merge revision 1.22
date: 2006/05/08 20:52:30;  author: mlhuang;  state: Exp;  lines: +2 -1
- also copy Fedora signing key to reference images
---

diff --git a/vserver-reference.init b/vserver-reference.init
index 21242ab..e283aa5 100755
--- a/vserver-reference.init
+++ b/vserver-reference.init
@@ -9,7 +9,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2004 The Trustees of Princeton University
 #
-# $Id$
+# $Id: vserver-reference.init,v 1.19.4.1 2006/05/08 20:34:30 mlhuang Exp $
 #
 
 case "$1" in
@@ -60,10 +60,11 @@ 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
     if [ -r $file ] ; then
 	for vroot in $VROOTS ; do
-	    if [ "$file" = "/etc/pki/rpm-gpg/RPM-GPG-KEY-planetlab" -a \
+	    if [ "$(dirname $file)" = "/etc/pki/rpm-gpg" -a \
 		 ! -f $vroot/$file ] ; then
 		import=1
 	    else