[Fai-commit] r5433 - in trunk: bin debian doc

[Thomas Lange]

Author: lange
Date: 2009-07-19 10:08:17 +0000 (Sun, 19 Jul 2009)
New Revision: 5433

Modified:
   trunk/bin/fai-mirror
   trunk/debian/changelog
   trunk/doc/fai-guide.sgml
Log:
line (closes: #497548), remove outdated information about
/files/packages
* fai-mirror: remove use of $addpackages (closes: #537544)

Modified: trunk/bin/fai-mirror
===================================================================
--- trunk/bin/fai-mirror	2009-07-19 09:02:06 UTC (rev 5432)
+++ trunk/bin/fai-mirror	2009-07-19 10:08:17 UTC (rev 5433)
@@ -25,7 +25,7 @@
 # MA 02111-1307, USA.
 #*********************************************************************
 
-version="Version 1.9.15, 19-april-2009"
+version="Version 1.10, 19-july-2009"
 
 # variables: NFSROOT, FAI_CONFIGDIR, FAI_ETC_DIR
 
@@ -69,34 +69,6 @@
     classes="$newclass"
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-get_addpackages() {
-
-    # add packages (mostly kernels) which are defined in the variable $addpackages
-    # TODO: maybe better to create a tmp file with all these package
-    # names, then to call install_packages for the tmp file
-
-    local f p pkg pkglist
-
-    for f in $(echo $FAI_CONFIGDIR/class/*.var); do
-	pkg=$(egrep ^addpackages= $f | sed 's/addpackages=//'|sed 's/"//g'| perl -pe 's/\$[\w_-]+//g')
-
-	[ -n "$pkg" ] && pkglist="$pkglist $pkg"
-    done
-    [ -z "$pkglist" ] && return 0
-
-    echo -n "Adding packages from variable \$addpackages:"
-    # loop over the list, because maybe some packages doesn't exist in the
-    # partial mirror, but only in the local repository. These can't be
-    # downloaded via the normal method
-    for p in $pkglist; do
-	echo -n " $p"
-	# test if .deb file is available
-	if [ ! -f $FAI_CONFIG/files/packages/${p}_*.deb ]; then
-	    apt-get $qflag -d $aptoptions -y --force-yes --fix-missing install $p
-	fi
-    done
-    echo ""
-}
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 umount_dirs() {
 
@@ -298,7 +270,6 @@
 echo "Downloading packages for classes:" $classes
 FAI=$FAI_CONFIGDIR install_packages -d $vflag
 [ $add -eq 1 ] && add_base_packages
-get_addpackages
 umount_dirs
 trap "" EXIT ERR
 [ $add -eq 0 ] && delete_base_packages

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-07-19 09:02:06 UTC (rev 5432)
+++ trunk/debian/changelog	2009-07-19 10:08:17 UTC (rev 5433)
@@ -7,7 +7,8 @@
   * task_sysinfo: call blkid on all disks
   * fcopy.8: improve info for calling postinst
   * fai-guide.sgml: add hint how to define classes on the kernel command
-    line (closes: #497548)
+    line (closes: #497548), remove outdated information about
+    /files/packages
   * ainsl: create missing path elements if -a is used (closes: #447199)
   * make-fai-nfsroot: mount sysfs inside nfsroot (closes: #532985)
   * debian/control: Depends: iproute for fai-client, fai-server
@@ -17,8 +18,9 @@
     Claes for the patch
   * fai-savelog: cd to the right place if LOGREMOTEDIR is set, thanks to
     Robin Powell for the patch (closes: #515704)
+  * fai-mirror: remove use of $addpackages (closes: #537544)
   
- -- Thomas Lange <lange at debian.org>  Sat, 18 Jul 2009 20:28:54 +0200
+ -- Thomas Lange <lange at debian.org>  Sun, 19 Jul 2009 12:08:02 +0200
 
 fai (3.2.20) unstable; urgency=low
 

Modified: trunk/doc/fai-guide.sgml
===================================================================
--- trunk/doc/fai-guide.sgml	2009-07-19 09:02:06 UTC (rev 5432)
+++ trunk/doc/fai-guide.sgml	2009-07-19 10:08:17 UTC (rev 5433)
@@ -9,8 +9,8 @@
 <!entity faiver "3.2.14">
 <!entity faiverdate "28 Oct 2008">
 
-<!entity version "2.8.6">
-<!entity date    "17 july 2009">
+<!entity version "2.8.7">
+<!entity date    "19 july 2009">
 
 <!entity faisetup           system "entities/faisetup.sgml">
 <!entity bootexample        system "entities/bootexample.sgml">
@@ -1335,8 +1335,6 @@
 	  copied by customization scripts using the <manref
 	  name="fcopy" section="8"> command.</p> </item>
 
-	  <tag><tt>files/packages/</tt></tag> <item> <p>
-THE USE OF THIS DIRECTORY IS NOW OBSOLETE.
 </p> </item>
 
 	  <tag><tt>basefiles/</tt></tag> <item> <p> Normally the file
@@ -2483,8 +2481,7 @@
 
 Now boot the first client node for the first
 time. Then start to adjust the configuration for your client
-nodes. Don't forget to build the kernel for the cluster nodes using
-<manref name="make-kpkg" section="8"> and store it in <file>/srv/fai/config/files/packages</file>.
+nodes. 
 
 <sect id=beotools> Tools for Beowulf clusters<p>