devuan-sdk
/
libdevuansdk
mirror of https://github.com/parazyd/libdevuansdk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

preserve env where needed on sudo calls

This commit is contained in:
parazyd 2016-10-11 22:37:44 +02:00
parent 1d0e5356f1
commit 24cd77335f
No known key found for this signature in database
GPG Key ID: F0CB28FCF78637DE
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
zlibs/bootstrap
View File

@ -35,7 +35,11 @@ bootstrap_complete_base() {
} }
notice "running debootstrap stage 1" notice "running debootstrap stage 1"
## deboostrap stage 1 ## deboostrap stage 1
sudo debootstrap \ export LANG=C
export LC_ALL=C
export DEBIAN_FRONTEND=noninteractive
sudo -E debootstrap \
--foreign \ --foreign \
--arch $arch $release $strapdir $mirror || zerr --arch $arch $release $strapdir $mirror || zerr
@ -43,7 +47,7 @@ bootstrap_complete_base() {
## debootstrap stage 2 ## debootstrap stage 2
notice "running debootstrap stage 2" notice "running debootstrap stage 2"
sudo chroot $strapdir \ sudo -E chroot $strapdir \
/debootstrap/debootstrap --second-stage || zerr /debootstrap/debootstrap --second-stage || zerr
## write all system configuration ## write all system configuration
@ -69,14 +73,13 @@ bootstrap_complete_base() {
## chroot into it and configure further ## chroot into it and configure further
## debootstrap stage 3 ## debootstrap stage 3
notice "running debootstrap stage 3" notice "running debootstrap stage 3"
export LANG=C
export LC_ALL=C
export DEBIAN_FRONTEND=noninteractive
devprocsys mount $strapdir || zerr devprocsys mount $strapdir || zerr
sudo chroot $strapdir /thirdstage || zerr dpkgdivert on $strapdir
sudo chroot $strapdir /cleanup || zerr sudo -E chroot $strapdir /thirdstage || zerr
sudo -E chroot $strapdir /cleanup || zerr
dpkgdivert off $strapdir
sleep 1 sleep 1
devprocsys umount $strapdir || zerr devprocsys umount $strapdir || zerr
@ -130,17 +133,16 @@ bootstrap_tar_pack() {
req=(bootstrap_tgz) req=(bootstrap_tgz)
ckreq || return 1 ckreq || return 1
for i in $custmodules; do for i in $custmodules; do sed -i -e 's/$i//' $strapdir/etc/modules; done
sed -i -e 's/$i//g' $strapdir/etc/modules
done
cat <<EOF | sudo tee ${strapdir}/prepack cat <<EOF | sudo tee ${strapdir}/prepack
#!/bin/sh #!/bin/sh
apt-get --yes --force-yes purge ${extra_packages} apt-get --yes --force-yes purge ${extra_packages}
apt-get --yes --force-yes autoremove
EOF EOF
sudo chmod +x $strapdir/prepack || zerr sudo chmod +x $strapdir/prepack || zerr
sudo chroot $strapdir /prepack || zerr sudo -E chroot $strapdir /prepack || zerr
local _dest=$(dirname $bootstrap_tgz) local _dest=$(dirname $bootstrap_tgz)