From ea39bbf3dea267732163bac5e1be8763bd353e36 Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" Date: Thu, 29 Jun 2017 21:12:04 -0700 Subject: [PATCH] common/populate: remember multi-device configurations Record the external log and realtime device configurations when we create a sample filesystem. ext4 tightly binds to external logs, so we have to preserve that too. Signed-off-by: Darrick J. Wong Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- common/populate | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/common/populate b/common/populate index e99ce68d..498151f3 100644 --- a/common/populate +++ b/common/populate @@ -713,7 +713,18 @@ _scratch_populate_cached() { rm -rf "$(find "${POPULATE_METADUMP}" -mtime +2 2>/dev/null)" # Throw away cached image if it doesn't match our spec. - meta_descr="FSTYP ${FSTYP} MKFS_OPTIONS ${MKFS_OPTIONS} SIZE $(blockdev --getsz "${SCRATCH_DEV}") ARGS $@" + case "${FSTYP}" in + "ext4") + extra_descr="LOGDEV ${SCRATCH_LOGDEV} USE_EXTERNAL ${USE_EXTERNAL}" + # ext4 cannot e2image external logs, so we cannot restore + test -n "${SCRATCH_LOGDEV}" && rm -f "${POPULATE_METADUMP}" + ;; + "xfs") + extra_descr="LOGDEV ${SCRATCH_LOGDEV} USE_EXTERNAL ${USE_EXTERNAL} RTDEV ${SCRATCH_RTDEV}";; + *) + extra_descr="";; + esac + meta_descr="FSTYP ${FSTYP} MKFS_OPTIONS ${MKFS_OPTIONS} SIZE $(blockdev --getsz "${SCRATCH_DEV}") ${extra_descr} ARGS $@" cmp -s "${POPULATE_METADUMP_DESCR}" <(echo "${meta_descr}") || rm -rf "${POPULATE_METADUMP}" # Do we have a cached image? -- 2.47.3