Add initial support for splitting var as a separated partition #1422
Conversation
Variable used to split the /var content in a separated partition instead of making it part of the rootfs. Signed-off-by: Ricardo Salveti <ricardo@foundries.io>
wic file used to deploy /var as a separated partition. Signed-off-by: Ricardo Salveti <ricardo@foundries.io>
Replace license with the respective SPDX entry and include a copyright line for Foundries.IO based on the modifications done over the past few years. Signed-off-by: Ricardo Salveti <ricardo@foundries.io>
To cover scenarios where the rootfs or var (or any other extra partition) is used as the last partition instead. Signed-off-by: Ricardo Salveti <ricardo@foundries.io>
… set Signed-off-by: Ricardo Salveti <ricardo@foundries.io>
Allow automatically setting a different WKS_FILE when OSTREE_SPLIT_VAR is set, which requires var to be defined as a separated partition. Signed-off-by: Ricardo Salveti <ricardo@foundries.io>
| } | ||
| OTA_BOOT = "${WORKDIR}/ota-boot" | ||
| do_image_ota[dirs] += "${OTA_BOOT}" | ||
| do_image_ota[cleandirs] += "${OTA_BOOT}" | ||
| OTA_VAR = "${WORKDIR}/ota-var" |
There was a problem hiding this comment.
Wouldn't it be more logical and readable to place setting vars above using them?
There was a problem hiding this comment.
Funny enough most tasks end up defining the variables and cleaning actions after the task itself is defined (if you see the other tasks in this class). We can probably have a separated commit to move things around if needed (here I would prefer to just add the new variable to avoid a larger diff).
| if [ "${OSTREE_SPLIT_VAR}" = "1" ]; then | ||
| rm -rf ${OTA_VAR} | ||
| mv ${OTA_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var ${OTA_VAR} | ||
| mkdir -p ${OTA_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var |
There was a problem hiding this comment.
Using mv will fail if we run this task more than one time because on the second one the ${OSTREE_OSNAME}/var is clean. It should be better to copy all the files with cp -a and we can drop the mkdir.
There was a problem hiding this comment.
We don't need to have the content in ${OTA_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var after this code.
But I agree we may need to move the content only once like
if [ "${OSTREE_SPLIT_VAR}" = "1" ] && ! -d ${OTA_VAR}; then
mv ${OTA_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var ${OTA_VAR}
mkdir -p ${OTA_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var
fi
There was a problem hiding this comment.
OTA_SYSROOT is already defined for dir and cleandirs:
do_image_ota[dirs] = "${OTA_SYSROOT}"
do_image_ota[cleandirs] = "${OTA_SYSROOT}"
So a re-run wouldn't be an issue here.
mkdir might not necessarily be needed indeed, will check.
There was a problem hiding this comment.
Yeah, best to let var in deploy as that is expected by ostree when creating .ostree-selabeled during deploy.
There was a problem hiding this comment.
I hadn't even taken into account possible dependencies that have more impact than running more than once
|
@Tim-Anderson mind reviewing the resize-helper related changes? |
Yeah, the idea is to expand the latest, which in our standard setup ends up being basically the rootfs. Once we add another patition (e.g. var), it expands that one instead. |
No description provided.