[Fai-commit] r5484 - in trunk: bin debian examples/simple/class

[Thomas Lange]

Author: lange
Date: 2009-07-24 09:13:15 +0000 (Fri, 24 Jul 2009)
New Revision: 5484

Modified:
   trunk/bin/make-fai-nfsroot
   trunk/debian/changelog
   trunk/examples/simple/class/10-base-classes
Log:
replace --print-installation-architecture by --print-architecture
* 10-base-classes: replace --print-installation-architecture by
--print-architecture

Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2009-07-24 08:50:35 UTC (rev 5483)
+++ trunk/bin/make-fai-nfsroot	2009-07-24 09:13:15 UTC (rev 5484)
@@ -383,7 +383,7 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 add_packages_nfsroot() {
 
-    local iarch=$($ROOTCMD dpkg --print-installation-architecture|tr /a-z/ /A-Z/)
+    local iarch=$($ROOTCMD dpkg --print-architecture|tr /a-z/ /A-Z/)
     export FAI_ROOT=$NFSROOT
     export classes="NFSROOT $iarch"
 cat > $NFSROOT/etc/kernel-img.conf << EOF

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-07-24 08:50:35 UTC (rev 5483)
+++ trunk/debian/changelog	2009-07-24 09:13:15 UTC (rev 5484)
@@ -16,6 +16,7 @@
   * ainsl: create missing path elements if -a is used (closes: #447199)
   * make-fai-nfsroot: mount sysfs inside nfsroot (closes: #532985)
     dereference symli nks when copying file into nfsroot
+    replace --print-installation-architecture by --print-architecture
   * debian/control: Depends: iproute for fai-client, fai-server
   * fai-setup, make-fai-nfsroot, subroutine-linux, get-boot-info,
     task_sysinfo, S99fai-setup/FAISERVER: Replaced all calls to ifconfig
@@ -49,6 +50,8 @@
   * 20-hwdetect.source, DEMO/10-misc,10-conffiles: apply patch from
     Michael, that skip somme commands on softupdate
   * install_packages: do not call AptPkg function when -N was given
+  * 10-base-classes: replace --print-installation-architecture by
+    --print-architecture
   
   [ Michael Tautschnig ]
   * setup-storage/Parser.pm: Set the boot flag on partition mounted at /, if

Modified: trunk/examples/simple/class/10-base-classes
===================================================================
--- trunk/examples/simple/class/10-base-classes	2009-07-24 08:50:35 UTC (rev 5483)
+++ trunk/examples/simple/class/10-base-classes	2009-07-24 09:13:15 UTC (rev 5484)
@@ -2,7 +2,7 @@
 
 # Echo architecture and OS name in uppercase. Do NOT remove these two lines.
 uname -s | tr '[:lower:]' '[:upper:]'
-[ -x "`which dpkg`" ] && dpkg --print-installation-architecture | tr a-z A-Z
+[ -x "`which dpkg`" ] && dpkg --print-architecture | tr a-z A-Z
 
 [ -f /etc/RUNNING_FROM_FAICD ] && echo "FAICD"
 exit 0