Re: [PATCH v2] isar-bootstrap: preserve environment in sudo'ed debootstrap call

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

On 9/13/18 3:46 PM, Cedric Hombourger wrote:
> Make bitbake add proxy environment variables and preserve them when
> calling debootstrap under sudo. This is required to get user-defined
> proxies used while bootstraping Isar.

Applied to the 'next',

Thanks,
Maxim.


> Signed-off-by: Cedric Hombourger <Cedric_Hombourger@mentor.com>
> ---
>   meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 5 ++---
>   1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
> index 4010307..cfad136 100644
> --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
> +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
> @@ -171,7 +171,8 @@ isar_bootstrap() {
>           esac
>           shift
>       done
> -    sudo flock "${ISAR_BOOTSTRAP_LOCK}" -c "\
> +    E="${@bb.utils.export_proxies(d)}"
> +    sudo -E flock "${ISAR_BOOTSTRAP_LOCK}" -c "\
>           set -e
>           if [ ! -e "${DEPLOY_ISAR_BOOTSTRAP}" ]; then
>               if [ -e "${ROOTFSDIR}" ]; then
> @@ -179,7 +180,6 @@ isar_bootstrap() {
>                  umount -l "${ROOTFSDIR}/proc" || true
>                  rm -rf "${ROOTFSDIR}"
>               fi
> -            E="${@bb.utils.export_proxies(d)}"
>               if [ ${IS_HOST} ]; then
>                   ${DEBOOTSTRAP} --verbose \
>                                  --variant=minbase \
> @@ -233,7 +233,6 @@ isar_bootstrap() {
>               mount -t devtmpfs -o mode=0755,nosuid devtmpfs ${ROOTFSDIR}/dev
>               mount -t proc none ${ROOTFSDIR}/proc
>   
> -            E="${@bb.utils.export_proxies(d)}"
>               export DEBIAN_FRONTEND=noninteractive
>               chroot "${ROOTFSDIR}" /usr/bin/apt-get update -y
>               chroot "${ROOTFSDIR}" /usr/bin/apt-get dist-upgrade -y \
> 


-- 
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