Merge "Export FS_TYPE and remove hardcoded ext4 values"

elements/debootstrap/install.d/15-cleanup-debootstrap

@@ -26,5 +26,5 @@ echo 'blacklist pcspkr' > /etc/modprobe.d/blacklist.conf
 
 cat << EOF | tee /etc/fstab > /dev/null
 proc /proc proc nodev,noexec,nosuid 0 0
-LABEL=${DIB_ROOT_LABEL} / ext4 errors=remount-ro 0 1
+LABEL=${DIB_ROOT_LABEL} / ${FS_TYPE} errors=remount-ro 0 1
 EOF

elements/opensuse/post-install.d/10-mkinitrd

@@ -8,10 +8,6 @@ fi
 set -eu
 set -o pipefail
 
-# To have access to FS_TYPE
-_LIB="/tmp/opensuse-extras"
-source $_LIB/img-defaults
-
 # This is to tell mkinitrd to include the right tools for the root filesystem
 # that will actually be used for the final image. This is likely something
 # different than what the chroot is currently on (which might currently be a

elements/yum-minimal/install.d/15-base-fstab

@@ -23,5 +23,5 @@ set -o pipefail
 
 cat << EOF | tee /etc/fstab > /dev/null
 proc /proc proc nodev,noexec,nosuid 0 0
-LABEL=${DIB_ROOT_LABEL} / ext4 errors=remount-ro 0 1
+LABEL=${DIB_ROOT_LABEL} / ${FS_TYPE} errors=remount-ro 0 1
 EOF

lib/img-defaults

@@ -17,7 +17,7 @@
 source $_LIB/common-defaults
 # options for create-baremetal-image.sh
 
-FS_TYPE=${FS_TYPE:-ext4}
+export FS_TYPE=${FS_TYPE:-ext4}
 # Used to set the file extension only at this stage.
 export IMAGE_TYPE=${IMAGE_TYPE:-qcow2}
 export IMAGE_NAME=${IMAGE_NAME:-image}