treplace "sudo -E" calls - libdevuansdk - common library for devuan's simple distro kits
HTML git clone https://git.parazyd.org/libdevuansdk
DIR Log
DIR Files
DIR Refs
DIR Submodules
DIR README
DIR LICENSE
---
DIR commit b90aaecfb03b73ccae46a8d66f33bea07828f47f
DIR parent fb212c12d0aec4f2932eaffe963a6191ab406e04
HTML Author: parazyd <parazyd@dyne.org>
Date: Mon, 13 Nov 2017 17:45:54 +0100
replace "sudo -E" calls
Diffstat:
M zlibs/bootstrap | 4 ++--
M zlibs/helpers | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
---
DIR diff --git a/zlibs/bootstrap b/zlibs/bootstrap
t@@ -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
t@@ -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
DIR diff --git a/zlibs/helpers b/zlibs/helpers
t@@ -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 }
t@@ -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 }