[Fai-commit] r3838 - trunk/bin

[fai-commit at lists.alioth.debian.org]

Author: lange
Date: 2006-09-04 14:10:55 +0000 (Mon, 04 Sep 2006)
New Revision: 3838

Modified:
   trunk/bin/fai-mirror
Log:
use packages.nfsroot instead of packages.arch, check if obsolete
variables are used


Modified: trunk/bin/fai-mirror
===================================================================
--- trunk/bin/fai-mirror	2006-09-04 14:09:41 UTC (rev 3837)
+++ trunk/bin/fai-mirror	2006-09-04 14:10:55 UTC (rev 3838)
@@ -25,10 +25,9 @@
 # MA 02111-1307, USA.
 #*********************************************************************
 
-version="Version 1.7.1, 20-april-2006"
+version="Version 1.8, 4-sep-2006"
 
 # variables: NFSROOT, FAI_CONFIGDIR
-# NFSROOT_PACKAGES, packages from make-fai-nfsroot.conf
 
 debdist=sarge # maybe use this $(echo "$FAI_DEBOOTSTRAP" | awk '{print $1}')
 set -a
@@ -178,18 +177,15 @@
     # add packages from base.tgz and additional packages in nfsroot
 
     # arch dependent packages defined in make-fai-nfsroot
-    echo "Adding packages defined in make-fai-nfsroot.conf."
-    if [ -f $NFSROOT/var/tmp/packages.arch ]; then
-	plist=$(< $NFSROOT/var/tmp/packages.arch)
+    echo "Adding packages of $cfdir/NFSROOT."
+    if [ -f $NFSROOT/var/tmp/packages.nfsroot ]; then
+	plist=$(< $NFSROOT/var/tmp/packages.nfsroot)
 	apt-get $qflag -d $aptoptions -y --force-yes --fix-missing install $plist
     else
-	echo "WARNING: $NFSROOT/var/tmp/packages.arch does not exists."
+	echo "WARNING: $NFSROOT/var/tmp/packages.nfsroot does not exists."
 	echo "Can't add those packages. Maybe the nfsroot is not yet created."
     fi
 
-    # also add packages defined in make-fai-nfsroot.conf
-    apt-get $qflag -d $aptoptions -y --force-yes --fix-missing install $packages $NFSROOT_PACKAGES
-
     # now use sources.list for debootstrap packages
     echo "$FAI_DEBOOTSTRAP" | awk '{printf "deb %s %s main\n",$2,$1}' | perl -p -e 's/file:/copy:/' > $aptcache/etc/apt/sources.list
     echo "Adding packages from base.tgz."
@@ -250,6 +246,9 @@
 . $cfdir/fai.conf
 . $cfdir/make-fai-nfsroot.conf
 
+[ -n "$packages" ] && die "WARNING: The use of \$packages in make-fai-nfsroot.conf is now deprecated. Please include this information into $cfdir/NFSROOT."
+[ -n "$NFSROOT_PACKAGES" ] && die "WARNING: The use of \$packages in make-fai-nfsroot.conf is now deprecated. Please include this information into $cfdir/NFSROOT."
+
 [ -n "$exclasses" -a -n "$cclasses" ] && die 3 "Options -x and -c not allowed at the same time."
 debug=0
 [ $debug -eq 0 ] && quiet=-q