From 2fb3c7e2e86beff2db60bb3bd3c10d7eb547f151 Mon Sep 17 00:00:00 2001 From: Vitaly Gridnev Date: Tue, 25 Aug 2015 15:09:11 +0000 Subject: [PATCH] Revert "Fix centos7 building image" 1.1.0 version of DIB was released This reverts commit 53627f187b94c7355ff0640d68b323790536475d. Change-Id: I210105acfbd4d8646a6259a2db92be79257a9efd --- diskimage-create/diskimage-create.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/diskimage-create/diskimage-create.sh b/diskimage-create/diskimage-create.sh index 10e8c299..1059d2f6 100755 --- a/diskimage-create/diskimage-create.sh +++ b/diskimage-create/diskimage-create.sh @@ -479,22 +479,18 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "vanilla" ]; then # CentOS 7 cloud image if [ -z "$BASE_IMAGE_OS" -o "$BASE_IMAGE_OS" = "centos7" ]; then + export DIB_EXTLINUX=1 if [ -z "$HADOOP_VERSION" -o "$HADOOP_VERSION" = "2.6" ]; then - export DIB_RELEASE="GenericCloud" - export DIB_EXTLINUX=1 export DIB_HADOOP_VERSION=${DIB_HADOOP_VERSION_2_6:-"2.6.0"} export centos7_image_name=${centos7_vanilla_hadoop_2_6_image_name:-"centos7_sahara_vanilla_hadoop_2_6_latest$suffix"} disk-image-create $TRACING $centos7_elements_sequence -o $centos7_image_name - unset DIB_RELEASE DIB_EXTLINUX fi if [ -z "$HADOOP_VERSION" -o "$HADOOP_VERSION" = "2.7.1" ]; then - export DIB_RELEASE="GenericCloud" - export DIB_EXTLINUX=1 export DIB_HADOOP_VERSION=${DIB_HADOOP_VERSION_2_7_1:-"2.7.1"} export centos7_image_name=${centos7_vanilla_hadoop_2_7_1_image_name:-"centos7_sahara_vanilla_hadoop_2_7_1_latest$suffix"} disk-image-create $TRACING $centos7_elements_sequence -o $centos7_image_name - unset DIB_RELEASE DIB_EXTLINUX fi + unset DIB_EXTLINUX fi fi