From: Christian Trautman <ctrautma@redhat.com>
Date: Mon, 21 Mar 2016 16:15:23 +0000 (-0400)
Subject: systems: Fix top level build_base_machine script to use ID
X-Git-Tag: colorado.1.0~103
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=9f6805f5a3f17633004325f2ac2b8bca3241128d;p=vswitchperf.git

systems: Fix top level build_base_machine script to use ID

Modified top level build_base_machine.sh script to use ID
instead of Name from os-release file. Renamed folders to
adapt to this change.

* Modified ID variable assignment from echo to straight assignment.

JIRA: VSPERF-257

Change-Id: I22a7d5a1f191418cbc8fc9fd7d85b013e51b49bc
Signed-off-by: Christian Trautman <ctrautma@redhat.com>
---

diff --git a/systems/build_base_machine.sh b/systems/build_base_machine.sh
index c64f7bb2..59712b96 100755
--- a/systems/build_base_machine.sh
+++ b/systems/build_base_machine.sh
@@ -38,7 +38,7 @@ function die() {
 . /etc/os-release
 
 # Get OS name (the First word from $NAME in /etc/os-release)
-OS_NAME=`echo "$NAME" | cut -d ' ' -f1`
+OS_NAME="$ID"
 
 # check if root
 if [ "$UID" -ne "$ROOT_UID" ]
diff --git a/systems/CentOS/build_base_machine.sh b/systems/centos/build_base_machine.sh
similarity index 100%
rename from systems/CentOS/build_base_machine.sh
rename to systems/centos/build_base_machine.sh
diff --git a/systems/CentOS/prepare_python_env.sh b/systems/centos/prepare_python_env.sh
similarity index 100%
rename from systems/CentOS/prepare_python_env.sh
rename to systems/centos/prepare_python_env.sh
diff --git a/systems/Fedora/20/build_base_machine.sh b/systems/fedora/20/build_base_machine.sh
similarity index 100%
rename from systems/Fedora/20/build_base_machine.sh
rename to systems/fedora/20/build_base_machine.sh
diff --git a/systems/Fedora/20/prepare_python_env.sh b/systems/fedora/20/prepare_python_env.sh
similarity index 100%
rename from systems/Fedora/20/prepare_python_env.sh
rename to systems/fedora/20/prepare_python_env.sh
diff --git a/systems/Fedora/21/build_base_machine.sh b/systems/fedora/21/build_base_machine.sh
similarity index 100%
rename from systems/Fedora/21/build_base_machine.sh
rename to systems/fedora/21/build_base_machine.sh
diff --git a/systems/Fedora/21/prepare_python_env.sh b/systems/fedora/21/prepare_python_env.sh
similarity index 100%
rename from systems/Fedora/21/prepare_python_env.sh
rename to systems/fedora/21/prepare_python_env.sh
diff --git a/systems/Fedora/22/build_base_machine.sh b/systems/fedora/22/build_base_machine.sh
similarity index 100%
rename from systems/Fedora/22/build_base_machine.sh
rename to systems/fedora/22/build_base_machine.sh
diff --git a/systems/Fedora/22/prepare_python_env.sh b/systems/fedora/22/prepare_python_env.sh
similarity index 100%
rename from systems/Fedora/22/prepare_python_env.sh
rename to systems/fedora/22/prepare_python_env.sh
diff --git a/systems/Red/7.2/build_base_machine.sh b/systems/rhel/7.2/build_base_machine.sh
similarity index 100%
rename from systems/Red/7.2/build_base_machine.sh
rename to systems/rhel/7.2/build_base_machine.sh
diff --git a/systems/Red/7.2/prepare_python_env.sh b/systems/rhel/7.2/prepare_python_env.sh
similarity index 100%
rename from systems/Red/7.2/prepare_python_env.sh
rename to systems/rhel/7.2/prepare_python_env.sh
diff --git a/systems/Ubuntu/14.04/build_base_machine.sh b/systems/ubuntu/14.04/build_base_machine.sh
similarity index 100%
rename from systems/Ubuntu/14.04/build_base_machine.sh
rename to systems/ubuntu/14.04/build_base_machine.sh
diff --git a/systems/Ubuntu/14.04/prepare_python_env.sh b/systems/ubuntu/14.04/prepare_python_env.sh
similarity index 100%
rename from systems/Ubuntu/14.04/prepare_python_env.sh
rename to systems/ubuntu/14.04/prepare_python_env.sh
diff --git a/systems/Ubuntu/build_base_machine.sh b/systems/ubuntu/build_base_machine.sh
similarity index 100%
rename from systems/Ubuntu/build_base_machine.sh
rename to systems/ubuntu/build_base_machine.sh