sig_cloud/diskimage-builder
11
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Remove the rhel 8 check for xfs"

Browse source
This commit is contained in:
Zuul 2019-06-18 06:49:34 +00:00 committed by Gerrit Code Review
commit c46f8714e3
2 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
diskimage_builder/elements/rhel/environment.d/10-rhel-distro-name.bash
View file

@ -1,7 +1,2 @@
export DISTRO_NAME=rhel export DISTRO_NAME=rhel
export DIB_RELEASE=${DIB_RELEASE:-8} export DIB_RELEASE=${DIB_RELEASE:-8}
if [ "${DISTRO_NAME}" = "rhel" ] && [ "${DIB_RELEASE}" = "8" ] && [ "${FS_TYPE}" != "xfs" ]; then
echo "ERROR: RHEL8 images file-system type must be set to xfs, FS_TYPE is currently set to" $FS_TYPE
exit 1
fi

9
diskimage_builder/lib/img-defaults
View file

@ -17,14 +17,7 @@
source $_LIB/common-defaults source $_LIB/common-defaults
# options for create-baremetal-image.sh # options for create-baremetal-image.sh
if [ "${DISTRO_NAME}" = "rhel" ] && [ "${DIB_RELEASE}" = "8" ]; then export FS_TYPE=${FS_TYPE:-ext4}
# xfs is the default file-system for RHEL8
export DEFAULT_FS_TYPE=xfs
else
export DEFAULT_FS_TYPE=ext4
fi
export FS_TYPE=${FS_TYPE:-$DEFAULT_FS_TYPE}
# Used to set the file extension only at this stage. # Used to set the file extension only at this stage.
export IMAGE_TYPE=${IMAGE_TYPE:-qcow2} export IMAGE_TYPE=${IMAGE_TYPE:-qcow2}
export IMAGE_NAME=${IMAGE_NAME:-image} export IMAGE_NAME=${IMAGE_NAME:-image}