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>

14 files changed, 1 insertions, 1 deletions

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
index 8339dd2d..8339dd2d 100755
--- a/systems/CentOS/build_base_machine.sh
+++ b/systems/centos/build_base_machine.sh
diff --git a/systems/CentOS/prepare_python_env.sh b/systems/centos/prepare_python_env.sh
index 5777448b..5777448b 100755
--- a/systems/CentOS/prepare_python_env.sh
+++ b/systems/centos/prepare_python_env.sh
diff --git a/systems/Fedora/20/build_base_machine.sh b/systems/fedora/20/build_base_machine.sh
index 77d95779..77d95779 100755
--- a/systems/Fedora/20/build_base_machine.sh
+++ b/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
index d0efd687..d0efd687 100755
--- a/systems/Fedora/20/prepare_python_env.sh
+++ b/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
index 0aaa73b6..0aaa73b6 100755
--- a/systems/Fedora/21/build_base_machine.sh
+++ b/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
index f348c75d..f348c75d 100755
--- a/systems/Fedora/21/prepare_python_env.sh
+++ b/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
index a909e284..a909e284 100755
--- a/systems/Fedora/22/build_base_machine.sh
+++ b/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
index 0b2c5a32..0b2c5a32 100755
--- a/systems/Fedora/22/prepare_python_env.sh
+++ b/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
index a038f7b3..a038f7b3 100755
--- a/systems/Red/7.2/build_base_machine.sh
+++ b/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
index 1d51380a..1d51380a 100755
--- a/systems/Red/7.2/prepare_python_env.sh
+++ b/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
index 3b4185fc..3b4185fc 100755
--- a/systems/Ubuntu/14.04/build_base_machine.sh
+++ b/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
index f9c2def8..f9c2def8 100755
--- a/systems/Ubuntu/14.04/prepare_python_env.sh
+++ b/systems/ubuntu/14.04/prepare_python_env.sh
diff --git a/systems/Ubuntu/build_base_machine.sh b/systems/ubuntu/build_base_machine.sh
index a2b48a26..a2b48a26 100755
--- a/systems/Ubuntu/build_base_machine.sh
+++ b/systems/ubuntu/build_base_machine.sh