sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Export FS_TYPE and remove hardcoded ext4 values

Browse Source 
Export FS_TYPE from img-defaults and use it to remove hard-coded
defaults in the debootstrap mounting.  Also, cleanup the suse element
as it should have access to the exported variable.

Change-Id: Ie9b671ca9336060a5ad294be48aa7eff442bf066
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2016-05-18 21:26:56 -04:00 committed by Ian Wienand
parent 95c874abb9
commit be521bdec6
4 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elements/debootstrap/install.d/15-cleanup-debootstrap
View File

@ -26,5 +26,5 @@ echo 'blacklist pcspkr' > /etc/modprobe.d/blacklist.conf
cat << EOF | tee /etc/fstab > /dev/null cat << EOF | tee /etc/fstab > /dev/null
proc /proc proc nodev,noexec,nosuid 0 0 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 EOF

4
elements/opensuse/post-install.d/10-mkinitrd
View File

@ -8,10 +8,6 @@ fi
set -eu set -eu
set -o pipefail 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 # 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 # 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 # different than what the chroot is currently on (which might currently be a

2
elements/yum-minimal/install.d/15-base-fstab
View File

@ -23,5 +23,5 @@ set -o pipefail
cat << EOF | tee /etc/fstab > /dev/null cat << EOF | tee /etc/fstab > /dev/null
proc /proc proc nodev,noexec,nosuid 0 0 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 EOF

2
lib/img-defaults
View File

@ -17,7 +17,7 @@
source $_LIB/common-defaults source $_LIB/common-defaults
# options for create-baremetal-image.sh # 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. # 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}