diff options
| author | Jeff Hatch <jhatch@multitech.com> | 2022-01-28 15:07:24 -0600 |
|---|---|---|
| committer | Jeff Hatch <jhatch@multitech.com> | 2022-01-28 15:07:24 -0600 |
| commit | e013cebe7b874d970b5b609ec3e5d236a9a1d1c0 (patch) | |
| tree | a915b224c99e764a7718b4124fc85374c0271f34 /recipes-core | |
| parent | 6177de2c6fa3742d01b592393f6ba6ba5e03b169 (diff) | |
| parent | 12e34516aa2df00459f688abd70c506606c11f80 (diff) | |
| download | meta-mlinux-e013cebe7b874d970b5b609ec3e5d236a9a1d1c0.tar.gz meta-mlinux-e013cebe7b874d970b5b609ec3e5d236a9a1d1c0.tar.bz2 meta-mlinux-e013cebe7b874d970b5b609ec3e5d236a9a1d1c0.zip | |
Merge branch 'ap/MTX-4363' into mpower-dev-nxp
Diffstat (limited to 'recipes-core')
| -rw-r--r-- | recipes-core/multitech/overlayfs-init-ubi/overlayfs.init | 6 | ||||
| -rw-r--r-- | recipes-core/multitech/overlayfs-init-ubi_0.1.bb | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/recipes-core/multitech/overlayfs-init-ubi/overlayfs.init b/recipes-core/multitech/overlayfs-init-ubi/overlayfs.init index 0000f29..c23a1ce 100644 --- a/recipes-core/multitech/overlayfs-init-ubi/overlayfs.init +++ b/recipes-core/multitech/overlayfs-init-ubi/overlayfs.init @@ -12,7 +12,7 @@ USER_PARTITION="ubi0:user-data" # Erase the file system DO_ERASE_PERSISTENT="/mnt/user/.persistent/mts_do_erase_persistent" # Remove files not hidden -DO_CLEAR_PERSISTENT="/mnt/user/.persistent/mts_do_clear_persistent" +DO_CLEAR_PERSISTENT=$(fw_printenv default_reset_f | cut -d '"' -f2 | grep -Eo '[0-9]+$' || true) pid=$$ prefix="<3>overlayrootfs-generator[${pid}]: " @@ -69,7 +69,7 @@ do_clear_old() { mv "$FILE_PATH" "$MNT_USER/$FILE_NAME.old" 2>&1 | logpipe done do_remove_old - rm -f $DO_CLEAR_PERSISTENT + fw_setenv default_reset_f 0 } # Most efficient way to clear UBIFS file system @@ -99,7 +99,7 @@ do_rw_mount() { if [[ -f $DO_ERASE_PERSISTENT ]] ; then do_erase_old - elif [[ -f $DO_CLEAR_PERSISTENT ]] ; then + elif [[ "$DO_CLEAR_PERSISTENT" -eq 1 ]] ; then do_clear_old fi diff --git a/recipes-core/multitech/overlayfs-init-ubi_0.1.bb b/recipes-core/multitech/overlayfs-init-ubi_0.1.bb index a14ed2e..be7ea36 100644 --- a/recipes-core/multitech/overlayfs-init-ubi_0.1.bb +++ b/recipes-core/multitech/overlayfs-init-ubi_0.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.multitech.com/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" PACKAGE_ARCH = "all" -PR = "r5" +PR = "6" RDEPENDS_${PN} += "bash" SRC_URI = " \ |