diff options
| author | Serhii Voloshynov <serhii.voloshynov@globallogic.com> | 2022-02-17 14:11:54 +0200 |
|---|---|---|
| committer | Serhii Voloshynov <serhii.voloshynov@globallogic.com> | 2022-02-17 14:11:54 +0200 |
| commit | 07cafe9d11907d08ff55e26baddd3fdbcd9803f4 (patch) | |
| tree | 4db75971f64b2d919a1212c0393fbbf3a2998c1a | |
| parent | 5e3a211d0968653340328b4cebb1456b9c775837 (diff) | |
| parent | cd250d01166a61d0ffa65591d7673103ec0a6163 (diff) | |
| download | meta-mlinux-07cafe9d11907d08ff55e26baddd3fdbcd9803f4.tar.gz meta-mlinux-07cafe9d11907d08ff55e26baddd3fdbcd9803f4.tar.bz2 meta-mlinux-07cafe9d11907d08ff55e26baddd3fdbcd9803f4.zip | |
Merge remote-tracking branch 'origin/ad/MTX-4380/package_management_fix' into HEAD
| -rw-r--r-- | recipes-core/multitech/overlayfs-init-ubi/overlayfs.init | 4 | ||||
| -rw-r--r-- | recipes-core/multitech/overlayfs-init-ubi_0.1.bb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/recipes-core/multitech/overlayfs-init-ubi/overlayfs.init b/recipes-core/multitech/overlayfs-init-ubi/overlayfs.init index c23a1ce..f19abef 100644 --- a/recipes-core/multitech/overlayfs-init-ubi/overlayfs.init +++ b/recipes-core/multitech/overlayfs-init-ubi/overlayfs.init @@ -31,7 +31,7 @@ mnt_user() { mount -t ubifs $USER_PARTITION $MNT_USER } -fs="/run /dev /proc /sys /sys/kernel/security /dev/shm /dev/pts /run /sys/fs/cgroup /sys/fs/cgroup/unified +fs="/run /dev /proc /sys /sys/kernel/security /dev/shm /dev/pts /sys/fs/cgroup /sys/fs/cgroup/unified /sys/fs/cgroup/systemd /sys/fs/cgroup/devices /sys/fs/cgroup/freezer /sys/fs/cgroup/pids /sys/fs/cgroup/memory /dev/mqueue /sys/kernel/debug /tmp /sys/fs/fuse/connections /sys/kernel/config /var/volatile" @@ -122,7 +122,7 @@ do_rw_mount() { umount -l /var/volatile >/dev/null 2>&1 cgroupmnts=$(sed -r -e 's/[^[:space:]]*[[:space:]]//' -e 's/[[:space:]]+.*//g' /proc/mounts | grep '^/orig') for mp in ${cgroupmnts} ; do - if [[ $mp != /orig ]] && [[ -d $mp ]] ; then + if [[ $mp != /orig ]] && [[ $mp != /orig/mnt* ]] && [[ -d $mp ]] ; then umount -l $mp >/dev/null 2>&1 fi done diff --git a/recipes-core/multitech/overlayfs-init-ubi_0.1.bb b/recipes-core/multitech/overlayfs-init-ubi_0.1.bb index be7ea36..b2d98af 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 = "6" +PR = "7" RDEPENDS_${PN} += "bash" SRC_URI = " \ |