[Fai-commit] r5326 - in trunk: bin conf debian

[Thomas Lange]

Author: lange
Date: 2009-04-15 09:40:16 +0000 (Wed, 15 Apr 2009)
New Revision: 5326

Modified:
   trunk/bin/make-fai-nfsroot
   trunk/conf/NFSROOT
   trunk/debian/changelog
Log:
-k now also upgrades all packages inside the nfsroot,
add -N to install_packages call, this is good for cross architecture
building the nfsroot
* NFSROOT: install aMD64 apckages with aptitude, this also helps when
building an amd64 nfsroot on i386

Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2009-04-10 11:06:38 UTC (rev 5325)
+++ trunk/bin/make-fai-nfsroot	2009-04-15 09:40:16 UTC (rev 5326)
@@ -379,7 +379,7 @@
     install_packages -l -p$cfdir > $NFSROOT/var/tmp/packages.nfsroot
     echo "Adding additional packages to $NFSROOT:"
     cat $NFSROOT/var/tmp/packages.nfsroot
-    call_verbose install_packages $v -p$cfdir
+    call_verbose install_packages -N $v -p$cfdir
     echo "install_packages exit code: $?"
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Modified: trunk/conf/NFSROOT
===================================================================
--- trunk/conf/NFSROOT	2009-04-10 11:06:38 UTC (rev 5325)
+++ trunk/conf/NFSROOT	2009-04-15 09:40:16 UTC (rev 5326)
@@ -19,7 +19,7 @@
 grub lilo read-edid
 linux-image-486 aufs-modules-2.6-486
 
-PACKAGES install AMD64
+PACKAGES aptitude AMD64
 grub lilo
 linux-image-2.6-amd64 aufs-modules-2.6-amd64
 

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-04-10 11:06:38 UTC (rev 5325)
+++ trunk/debian/changelog	2009-04-15 09:40:16 UTC (rev 5326)
@@ -6,7 +6,9 @@
   * ftar, fcopy: add info about the other tool
   * new file live.conf will disable some messages during booting
   * make-fai-nfsroot: call apt-get update when using -k (closes: #507892),
-    -k now also upgrades all packages inside the nfsroot
+    -k now also upgrades all packages inside the nfsroot,
+    add -N to install_packages call, this is good for cross architecture
+    building the nfsroot
   * fai-do-scripts: skip files with certain suffixes (closes: #500579)
     call cfagent scripts with -v if fai is in debug mode
   * lib/subroutines-linux: don't rely on ' as a field separator when
@@ -19,7 +21,9 @@
     Robin Powell) (closes: #515057)
   * 20-removable_media: add fd0 entry to fstab only if device is present
   * fai-cd, make-fai-nfsroot: awk can also do the grep
-  
+  * NFSROOT: install aMD64 apckages with aptitude, this also helps when
+    building an amd64 nfsroot on i386
+
   [ Michael Tautschnig ]
   * setup-storage: Bumped version number to 1.0.4
   * setup-storage/Exec.pm: Use --timeout=10 instead of --timeout 10 to stay
@@ -83,7 +87,7 @@
   * Moved parsing of createopts,tuneopts to Parser.pm for simpler code and
     better syntax checking (closes: #521172)
 
- -- Thomas Lange <lange at debian.org>  Thu, 09 Apr 2009 20:02:43 +0200
+ -- Thomas Lange <lange at debian.org>  Wed, 15 Apr 2009 10:55:11 +0200
 
 fai (3.2.17) unstable; urgency=medium