Re: [PATCH] classes/isar-image: Collapse multiple sudo's

["Maxim Yu. Osipov" <mosipov@ilbers.de>]

On 12/19/18 2:16 PM, Maxim Yu. Osipov wrote:
> Suggested-by: Jan Kiszka <jan.kiszka@siemens.com>
> Signed-off-by: Maxim Yu. Osipov <mosipov@ilbers.de>

Applied to the 'next'.

> ---
>   meta/classes/isar-image.bbclass | 40 +++++++++++++++++++++-------------------
>   1 file changed, 21 insertions(+), 19 deletions(-)
> 
> diff --git a/meta/classes/isar-image.bbclass b/meta/classes/isar-image.bbclass
> index 4992800..754e896 100644
> --- a/meta/classes/isar-image.bbclass
> +++ b/meta/classes/isar-image.bbclass
> @@ -53,26 +53,28 @@ isar_image_conf_rootfs() {
>   
>   isar_image_cleanup() {
>       # Cleanup
> -    sudo rm "${IMAGE_ROOTFS}/etc/apt/sources.list.d/isar-apt.list"
> -    test ! -e "${IMAGE_ROOTFS}/usr/share/doc/qemu-user-static" && \
> -         sudo find "${IMAGE_ROOTFS}/usr/bin" \
> -              -maxdepth 1 -name 'qemu-*-static' -type f -delete
> -    sudo umount -l ${IMAGE_ROOTFS}/isar-apt
> -    sudo rmdir ${IMAGE_ROOTFS}/isar-apt
> -    sudo umount -l ${IMAGE_ROOTFS}/dev
> -    sudo umount -l ${IMAGE_ROOTFS}/proc
> -    sudo umount -l ${IMAGE_ROOTFS}/sys
> -    sudo rm -f "${IMAGE_ROOTFS}/etc/apt/apt.conf.d/55isar-fallback.conf"
> -    if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ]; then
> -        sudo umount -l ${IMAGE_ROOTFS}/base-apt
> -        sudo rmdir ${IMAGE_ROOTFS}/base-apt
> -        # Replace the local apt we bootstrapped with the
> -        # APT sources initially defined in DISTRO_APT_SOURCES
> -        sudo rm -f "${IMAGE_ROOTFS}/etc/apt/sources.list.d/base-apt.list"
> -        sudo mv "${IMAGE_ROOTFS}/etc/apt/sources-list" \
> +    sudo sh -c ' \
> +        rm "${IMAGE_ROOTFS}/etc/apt/sources.list.d/isar-apt.list"
> +        test ! -e "${IMAGE_ROOTFS}/usr/share/doc/qemu-user-static" && \
> +            find "${IMAGE_ROOTFS}/usr/bin" \
> +                -maxdepth 1 -name 'qemu-*-static' -type f -delete
> +             umount -l ${IMAGE_ROOTFS}/isar-apt
> +        rmdir ${IMAGE_ROOTFS}/isar-apt
> +        umount -l ${IMAGE_ROOTFS}/dev
> +        umount -l ${IMAGE_ROOTFS}/proc
> +        umount -l ${IMAGE_ROOTFS}/sys
> +        rm -f "${IMAGE_ROOTFS}/etc/apt/apt.conf.d/55isar-fallback.conf"
> +        if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ]; then
> +            umount -l ${IMAGE_ROOTFS}/base-apt
> +            rmdir ${IMAGE_ROOTFS}/base-apt
> +            # Replace the local apt we bootstrapped with the
> +            # APT sources initially defined in DISTRO_APT_SOURCES
> +            rm -f "${IMAGE_ROOTFS}/etc/apt/sources.list.d/base-apt.list"
> +            mv "${IMAGE_ROOTFS}/etc/apt/sources-list" \
>                   "${IMAGE_ROOTFS}/etc/apt/sources.list.d/bootstrap.list"
> -    fi
> -    sudo rm -f "${IMAGE_ROOTFS}/etc/apt/sources-list"
> +        fi
> +        rm -f "${IMAGE_ROOTFS}/etc/apt/sources-list"
> +    '
>   }
>   
>   do_rootfs() {
> 


-- 
Maxim Osipov
ilbers GmbH
Maria-Merian-Str. 8
85521 Ottobrunn
Germany
+49 (151) 6517 6917
mosipov@ilbers.de
http://ilbers.de/
Commercial register Munich, HRB 214197
General Manager: Baurzhan Ismagulov