From b90aaecfb03b73ccae46a8d66f33bea07828f47f Mon Sep 17 00:00:00 2001 From: parazyd Date: Mon, 13 Nov 2017 17:45:54 +0100 Subject: [PATCH] replace "sudo -E" calls --- zlibs/bootstrap | 4 ++-- zlibs/helpers | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/zlibs/bootstrap b/zlibs/bootstrap index 107ed9f..cf13579 100644 --- a/zlibs/bootstrap +++ b/zlibs/bootstrap @@ -51,7 +51,7 @@ bootstrap_complete_base() { notice "running debootstrap stage 1" - sudo -E env DEBOOTSTRAP_DIR="$LIBPATH/extra/debootstrap" "$LIBPATH/extra/debootstrap/debootstrap" \ + sudo DEBOOTSTRAP_DIR="$LIBPATH/extra/debootstrap" "$LIBPATH/extra/debootstrap/debootstrap" \ --keyring="$LIBPATH/extra/devuan-keyring/keyrings/devuan-archive-keyring.gpg" \ --foreign \ --arch $arch $release $strapdir $mirror || zerr @@ -63,7 +63,7 @@ bootstrap_complete_base() { ## debootstrap stage 2 notice "running debootstrap stage 2" - sudo -E chroot $strapdir \ + sudo chroot $strapdir \ /debootstrap/debootstrap --second-stage || zerr ## write all system configuration diff --git a/zlibs/helpers b/zlibs/helpers index 4c556ef..14f0f13 100644 --- a/zlibs/helpers +++ b/zlibs/helpers @@ -292,11 +292,11 @@ chroot-script() { ## logging sudo sed -i "$strapdir/$script" \ - -e 's@#!/bin/sh@#!/bin/sh\'$'\nset -x ; exec 2>/'$script'.log@' + -e 's@#!/bin/sh@#!/bin/sh\'$'\nset -x ; exec 2>/'$script'.log ; export DEBIAN_FRONTEND=noninteractive@' notice "chrooting to execute $script..." sudo chmod +x "$strapdir/$script" || zerr - sudo -E chroot "$strapdir" "/$script" || zerr + sudo chroot "$strapdir" "/$script" || zerr sudo mv -f "$strapdir/${script}.log" "$R/log/" [[ "$APT_CACHE" = 1 ]] && { aptcache off "$strapdir/mnt" || zerr } @@ -313,7 +313,7 @@ chroot-script() { notice "chrooting to execute $script..." sudo chmod +x "$strapdir/$script" || zerr - sudo -E chroot "$strapdir" "/$script" || zerr + sudo chroot "$strapdir" "/$script" || zerr sudo mv -f "$strapdir/${script}.log" "$R/log/" [[ "$APT_CACHE" = 1 ]] && { aptcache off "$strapdir/mnt" || zerr }