[Fai-commit] r6322 - branches/experimental/patches

[Michael Tautschnig]

Author: mt
Date: 2011-03-27 19:11:11 +0000 (Sun, 27 Mar 2011)
New Revision: 6322

Added:
   branches/experimental/patches/make-fai-nfsroot_add-keys
Modified:
   branches/experimental/patches/series
Log:
Added David's patch for make-fai-nfsroot


Added: branches/experimental/patches/make-fai-nfsroot_add-keys
===================================================================
--- branches/experimental/patches/make-fai-nfsroot_add-keys	                        (rev 0)
+++ branches/experimental/patches/make-fai-nfsroot_add-keys	2011-03-27 19:11:11 UTC (rev 6322)
@@ -0,0 +1,42 @@
+2011-03-27  Michael Tautschnig  <mt at debian.org>
+
+	* make-fai-nfsroot: Install apt keys from /etc/fai/apt/keys-added into
+		NFSROOT. Thanks David Dreezer <dave at socialstrata.com> for the patch.
+	* make-fai-nfsroot.8: Document this directory and behaviour.
+Index: trunk/bin/make-fai-nfsroot
+===================================================================
+--- trunk.orig/bin/make-fai-nfsroot
++++ trunk/bin/make-fai-nfsroot	
+@@ -380,6 +380,17 @@
+     mount -t proc   /proc  $NFSROOT/proc
+     mount -t sysfs  /sys   $NFSROOT/sys
+     mount -t devpts devpts $NFSROOT/dev/pts
++
++    # add any 3rd party repository keys that you may need installed into the NFSROOT
++    if [ -d $cfdir/apt/keys-added ]; then
++	    mkdir $NFSROOT/etc/apt/keys-added
++	    echo 'These *.asc files are 3rd party repository keys that have been added by make-fai-nfsroot' >> $NFSROOT/README.txt
++    fi
++    for f in `find -type f -name *.asc $cfdir/apt/keys-added`; do
++	    cp -Lp $v $f $NFSROOT/$f
++	    cat $f | $ROOTCMD apt-key add -
++    done
++
+     $ROOTCMD apt-get update
+     $ROOTCMD aptitude -Rfy install fai-nfsroot
+ 
+Index: trunk/man/make-fai-nfsroot.8
+===================================================================
+--- trunk.orig/man/make-fai-nfsroot.8
++++ trunk/man/make-fai-nfsroot.8	
+@@ -165,6 +165,10 @@
+ Copy this file to the NFSROOT.
+ .PD 0
+ .TP
++.FN /etc/fai/apt/keys-added/*.asc
++Repository keys in .asc format found here will be installed into the NFSROOT.
++.PD 0
++.TP
+ .FN /var/run/fai/make-fai-nfsroot/*-stamp
+ Stamp files used for recovery.
+ 

Modified: branches/experimental/patches/series
===================================================================
--- branches/experimental/patches/series	2011-03-17 21:28:08 UTC (rev 6321)
+++ branches/experimental/patches/series	2011-03-27 19:11:11 UTC (rev 6322)
@@ -26,3 +26,4 @@
 setup-storage_lvm-raid-preserve
 setup-storage_deterministic-lv-ordering
 setup-storage_internals-cleanup
+make-fai-nfsroot_add-keys