Re: [PATCH v1 2/5] mount: Allow calling unmount on not mounted paths

[Jan Kiszka <jan.kiszka@siemens.com>]

On 07.07.21 18:38, Anton Mikanovich wrote:
> Make buildchroot_undo_mounts and rootfs_undo_mounts functions do not
> fail if calling without buildchroot_do_mounts and rootfs_do_mounts.
> 

"Why" is missing, you only have the "what" here.

Jan

> Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
> ---
>  meta/classes/buildchroot.bbclass | 20 ++++++++++----------
>  meta/classes/rootfs.bbclass      | 20 ++++++++++----------
>  2 files changed, 20 insertions(+), 20 deletions(-)
> 
> diff --git a/meta/classes/buildchroot.bbclass b/meta/classes/buildchroot.bbclass
> index 806a29f..9c27711 100644
> --- a/meta/classes/buildchroot.bbclass
> +++ b/meta/classes/buildchroot.bbclass
> @@ -23,16 +23,18 @@ python __anonymous() {
>  
>  MOUNT_LOCKFILE = "${BUILDCHROOT_DIR}.lock"
>  
> +BUILDCHROOT_MOUNT_CNT = "${BUILDCHROOT_DIR}.mount"
> +
>  buildchroot_do_mounts() {
>      sudo -s <<'EOSUDO'
>          ( flock 9
>          set -e
>  
>          count="1"
> -        if [ -f '${BUILDCHROOT_DIR}.mount' ]; then
> -            count=$(($(cat '${BUILDCHROOT_DIR}.mount') + 1))
> +        if [ -f "${BUILDCHROOT_MOUNT_CNT}" ]; then
> +            count=$(($(cat "${BUILDCHROOT_MOUNT_CNT}") + 1))
>          fi
> -        echo $count > '${BUILDCHROOT_DIR}.mount'
> +        echo $count > "${BUILDCHROOT_MOUNT_CNT}"
>          if [ $count -gt 1 ]; then
>              exit 0
>          fi
> @@ -77,17 +79,15 @@ buildchroot_undo_mounts() {
>          ( flock 9
>          set -e
>  
> -        if [ -f '${BUILDCHROOT_DIR}.mount' ]; then
> -            count=$(($(cat '${BUILDCHROOT_DIR}.mount') - 1))
> -            echo $count > '${BUILDCHROOT_DIR}.mount'
> -        else
> -            echo "Could not find mount counter"
> -            exit 1
> +        count="0"
> +        if [ -f "${BUILDCHROOT_MOUNT_CNT}" ]; then
> +            count=$(($(cat "${BUILDCHROOT_MOUNT_CNT}") - 1))
> +            echo $count > "${BUILDCHROOT_MOUNT_CNT}"
>          fi
>          if [ $count -gt 0 ]; then
>              exit 0
>          fi
> -        rm ${BUILDCHROOT_DIR}.mount
> +        rm -f "${BUILDCHROOT_MOUNT_CNT}"
>  
>          mountpoint -q '${BUILDCHROOT_DIR}/base-apt' && \
>              umount ${BUILDCHROOT_DIR}/base-apt && \
> diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass
> index 50d6408..9ccc8e3 100644
> --- a/meta/classes/rootfs.bbclass
> +++ b/meta/classes/rootfs.bbclass
> @@ -28,6 +28,8 @@ export LC_ALL = "C"
>  
>  MOUNT_LOCKFILE = "${ROOTFSDIR}.lock"
>  
> +ROOTFS_MOUNT_CNT = "${ROOTFSDIR}.mount"
> +
>  rootfs_do_mounts[weight] = "3"
>  rootfs_do_mounts() {
>      sudo -s <<'EOSUDO'
> @@ -35,10 +37,10 @@ rootfs_do_mounts() {
>          set -e
>  
>          count="1"
> -        if [ -f '${ROOTFSDIR}.mount' ]; then
> -            count=$(($(cat '${ROOTFSDIR}.mount') + 1))
> +        if [ -f "${ROOTFS_MOUNT_CNT}" ]; then
> +            count=$(($(cat "${ROOTFS_MOUNT_CNT}") + 1))
>          fi
> -        echo $count > '${ROOTFSDIR}.mount'
> +        echo $count > "${ROOTFS_MOUNT_CNT}"
>          if [ $count -gt 1 ]; then
>              exit 0
>          fi
> @@ -79,17 +81,15 @@ rootfs_undo_mounts() {
>          ( flock 9
>          set -e
>  
> -        if [ -f '${ROOTFSDIR}.mount' ]; then
> -            count=$(($(cat '${ROOTFSDIR}.mount') - 1))
> -            echo $count > '${ROOTFSDIR}.mount'
> -        else
> -            echo "Could not find mount counter"
> -            exit 1
> +        count="0"
> +        if [ -f "${ROOTFS_MOUNT_CNT}" ]; then
> +            count=$(($(cat "${ROOTFS_MOUNT_CNT}") - 1))
> +            echo $count > "${ROOTFS_MOUNT_CNT}"
>          fi
>          if [ $count -gt 0 ]; then
>              exit 0
>          fi
> -        rm ${ROOTFSDIR}.mount
> +        rm -f "${ROOTFS_MOUNT_CNT}"
>  
>          mountpoint -q '${ROOTFSDIR}/base-apt' && \
>              umount ${ROOTFSDIR}/base-apt && \
> 

-- 
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux