From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Fri, 14 Mar 2014 15:12:52 +0000 (+0100)
Subject: move check_yum_installed
X-Git-Tag: 5.3.2~33
X-Git-Url: http://git.onelab.eu/?p=build.git;a=commitdiff_plain;h=b4dcf590f6c1aaaf3f4d508dfa207ed5fed6851e

move check_yum_installed
---

diff --git a/lbuild-bridge.sh b/lbuild-bridge.sh
index ecf218be..ecee98b5 100755
--- a/lbuild-bridge.sh
+++ b/lbuild-bridge.sh
@@ -34,11 +34,23 @@ function discover_interface () {
     echo unknown
 }
 
+##############################
+function check_yum_installed () {
+    package=$1; shift
+    rpm -q $package >& /dev/null || yum -y install $package
+}
+
+# not used apparently
+function check_yumgroup_installed () {
+    group="$1"; shift
+    yum grouplist "$group" | grep -q Installed || { yum -y groupinstall "$group" ; }
+}
+
 #################### bridge initialization
 function create_bridge_if_needed() {
 
-    # turn on verbosity
-    set -x
+    # do not turn on verbosity
+    # set -x
 
     public_bridge=$1; shift
 
diff --git a/lbuild-initvm.sh b/lbuild-initvm.sh
index c355c6ca..5f51503a 100755
--- a/lbuild-initvm.sh
+++ b/lbuild-initvm.sh
@@ -97,17 +97,6 @@ function almost_empty () {
     count=$(cd $dir; ls | wc -l); [ $count -le 1 ]; 
 }
 
-##############################
-function check_yum_installed () {
-    package=$1; shift
-    rpm -q $package >& /dev/null || yum -y install $package
-}
-
-function check_yumgroup_installed () {
-    group="$1"; shift
-    yum grouplist "$group" | grep -q Installed || { yum -y groupinstall "$group" ; }
-}
-
 ##############################
 function fedora_install() {
     set -x