diff options
| author | Phil Wise <phil@advancedtelematic.com> | 2017-06-21 17:25:27 +0200 |
|---|---|---|
| committer | Phil Wise <phil@advancedtelematic.com> | 2017-06-22 11:09:18 +0200 |
| commit | 1c5b56dcd6d21528e67c681d973cae3a13045bb9 (patch) | |
| tree | 828259571cc24e506ab6fbecddb903262f8e0e61 | |
| parent | 15ae682a2020182552df70726c8352701a1f444c (diff) | |
| download | meta-updater-1c5b56dcd6d21528e67c681d973cae3a13045bb9.tar.gz | |
Preserve /var/local
Fixes SPEC-761 in AGL
| -rw-r--r-- | classes/image_types_ota.bbclass | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass index 2dd6846..09c30ff 100644 --- a/classes/image_types_ota.bbclass +++ b/classes/image_types_ota.bbclass | |||
| @@ -96,8 +96,9 @@ IMAGE_CMD_otaimg () { | |||
| 96 | 96 | ||
| 97 | # Copy deployment /home and /var/sota to sysroot | 97 | # Copy deployment /home and /var/sota to sysroot |
| 98 | HOME_TMP=`mktemp -d ${WORKDIR}/home-tmp-XXXXX` | 98 | HOME_TMP=`mktemp -d ${WORKDIR}/home-tmp-XXXXX` |
| 99 | tar --xattrs --xattrs-include='*' -C ${HOME_TMP} -xf ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.ostree.tar.bz2 ./usr/homedirs ./var/sota || true | 99 | tar --xattrs --xattrs-include='*' -C ${HOME_TMP} -xf ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.ostree.tar.bz2 ./usr/homedirs ./var/sota ./var/local || true |
| 100 | mv ${HOME_TMP}/var/sota ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/ || true | 100 | mv ${HOME_TMP}/var/sota ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/ || true |
| 101 | mv ${HOME_TMP}/var/local ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/ || true | ||
| 101 | # Create /var/sota if it doesn't exist yet | 102 | # Create /var/sota if it doesn't exist yet |
| 102 | mkdir -p ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/sota || true | 103 | mkdir -p ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/sota || true |
| 103 | mv ${HOME_TMP}/usr/homedirs/home ${PHYS_SYSROOT}/ || true | 104 | mv ${HOME_TMP}/usr/homedirs/home ${PHYS_SYSROOT}/ || true |