[Fai-commit] r3837 - trunk/bin

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

Author: lange
Date: 2006-09-04 14:09:41 +0000 (Mon, 04 Sep 2006)
New Revision: 3837

Modified:
   trunk/bin/make-fai-nfsroot
Log:
use install_packages and /etc/fai/NFSROOT for installing packages into
the nfsroot


Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2006-09-04 14:07:01 UTC (rev 3836)
+++ trunk/bin/make-fai-nfsroot	2006-09-04 14:09:41 UTC (rev 3837)
@@ -27,6 +27,14 @@
 # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #*********************************************************************
 
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+die() {
+
+    echo "$@"
+    exit 99
+}
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
 PATH=/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin
 
 if [ $(id -u) != "0" ]; then
@@ -67,6 +75,9 @@
     exit 8
 fi
 
+[ -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 \$NFSROOT_PACKAGES in make-fai-nfsroot.conf is now deprecated. Please include this information into $cfdir/NFSROOT."
+
 if [ -z "$NFSROOT" ]; then
     echo "\$NFSROOT is not set. Please check your settings in $cfdir/fai.conf."
     exit 4
@@ -83,30 +94,7 @@
 fi
 
 kfile="vmlinuz"
-case `dpkg --print-installation-architecture` in
-    i386)
-	arch_packages="grub lilo dmidecode hwtools read-edid" ;;
 
-    amd64)
-	arch_packages="grub lilo dmidecode" ;;
-
-    ia64)
-	arch_packages="elilo gnu-efi efibootmgr dmidecode" ;;
-
-    sparc)
-	arch_packages="silo sparc-utils" ;;
-
-    powerpc)
-	arch_packages="" ;;
-
-    alpha)
-	arch_packages="aboot" ;;
-
-    *)  arch_packages="" ;;
-esac
-packages="$packages
-$arch_packages"
- 
 ROOTCMD="chroot $NFSROOT"
 
 RUNDIR=/var/run/fai/make-fai-nfsroot
@@ -124,12 +112,6 @@
     echo "Please fix the error or try make-fai-nfsroot -v"
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-die() {
-
-    echo "$@"
-    exit 99
-}
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 call_with_stamp() {
 
     local func=$1
@@ -239,7 +221,6 @@
     call_with_stamp create_base
     # save the list of all packages in the base.tgz
     $ROOTCMD dpkg --get-selections | egrep 'install$' | awk '{print $1}' > var/tmp/base-pkgs.lis
-    echo $arch_packages > $NFSROOT/var/tmp/packages.arch
 
     if [ "$FAI_DEBMIRROR" ]; then
 	[ "$verbose" ] && echo "Mounting $FAI_DEBMIRROR to $NFSROOT/$MNTPOINT."
@@ -271,9 +252,7 @@
 EOF
     echo "Upgrading $NFSROOT"
     LC_ALL=C call_verbose call_with_stamp upgrade_nfsroot  
-    echo "Adding additional packages to $NFSROOT:"
-    echo "$packages"
-    LC_ALL=C call_verbose call_with_stamp add_packages_nfsroot
+    LC_ALL=C call_with_stamp add_packages_nfsroot
     call_with_stamp copy_fai_files
 
     # set timezone in nfsroot
@@ -343,8 +322,13 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 add_packages_nfsroot() {
 
-    $ROOTCMD apt-get -y --fix-missing install $packages $NFSROOT_PACKAGES </dev/null
-    $ROOTCMD apt-get clean
+    local iarch=$(dpkg --print-installation-architecture|tr /a-z/ /A-Z/)
+    export FAI_ROOT=$NFSROOT
+    export classes="NFSROOT $iarch"
+    install_packages -l -p/etc/fai > $NFSROOT/var/tmp/packages.nfsroot
+    echo "Adding additional packages to $NFSROOT:"
+    cat $NFSROOT/var/tmp/packages.nfsroot
+    install_packages $v -p/etc/fai
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 umount_dirs() {