Mise à jour du script de vérification version/arch.

[progfou.git] / sysadmin / sysadmin-check-version-arch

diff --git a/sysadmin/sysadmin-check-version-arch b/sysadmin/sysadmin-check-version-arch
index 04b24b8..09c42ea 100755 (executable)
--- a/sysadmin/sysadmin-check-version-arch
+++ b/sysadmin/sysadmin-check-version-arch
@@ -5,12 +5,17 @@
 # Licence : GNU General Public License, version 3
 # Auteur : Progfou <jean-christophe.andre@auf.org>
 # Création : 2011-04-26
-# Mise à jour : 2011-04-27
+# Mise à jour : 2011-04-28
 
 EXPECTED_DEBIAN_VERSION="6.0.1"
 ACCEPTED_DEBIAN_VERSION="5.0.8"
-EXPECTED_DEBIAN_ARCH="x86_64"
-ACCEPTED_DEBIAN_ARCH="i686"
+if grep -qE ' Intel.* Xeon| AMD.* Opteron' /proc/cpuinfo ; then
+  EXPECTED_DEBIAN_ARCH="x86_64"
+  ACCEPTED_DEBIAN_ARCH="i686"
+else
+  EXPECTED_DEBIAN_ARCH="i686"
+  ACCEPTED_DEBIAN_ARCH="i686"
+fi
 
 EXPECTED_UBUNTU_VERSION="10.04"
 ACCEPTED_UBUNTU_VERSION="10.04"
@@ -24,7 +29,7 @@ colorize() {
   elif [ "${color}" = "red" ] ; then
     data="\033[1;31m${data}\033[m"
   fi
-  echo "${data}"
+  printf "${data}"
 }
 
 display_host() {
@@ -63,10 +68,13 @@ then
     for id in $IDS
     do
       name="`sed -n '/^NAME=/s/^.*="\?\([^"]*\)"\?.*$/\1/p' /etc/vz/conf/${id}.conf`"
-      if [ -n "${name}" ] ; then
+      if [ -z "${name}" ] ; then
         name="`sed -n '/^HOSTNAME=/s/^.*="\?\([^"]*\)"\?.*$/\1/p' /etc/vz/conf/${id}.conf`"
       fi
-      display_host "CT ${id} (${name})" "`vzctl exec ${id} lsb_release -si`" "`vzctl exec ${id} lsb_release -sr`" "`vzctl exec ${id} uname -m`"
+      dist="`vzctl exec ${id} lsb_release -si 2>/dev/null`"
+      version="`vzctl exec ${id} lsb_release -sr 2>/dev/null`"
+      arch="`vzctl exec ${id} uname -m`"
+      display_host "CT ${id} (${name})" "${dist}" "${version}" "${arch}"
     done
   fi
 fi