| tmake apt-cache opt-in; add contrib and non-free by default - libdevuansdk - common library for devuan's simple distro kits |
| git clone https://git.parazyd.org/libdevuansdk |
| Log |
| Files |
| Refs |
| Submodules |
| README |
| LICENSE |
| --- |
| commit 895c6eaaffff6203b9d88654136b67f7126d0328 |
| parent bb46f77ec555f0b4f10e24a124583803c8e5a139 |
| Author: parazyd |
| Date: Tue, 23 May 2017 13:54:53 +0200
make apt-cache opt-in; add contrib and non-free by default
Diffstat:
M config | 4 ++--
M zlibs/helpers | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
--- |
| diff --git a/config b/config |
| t@@ -27,7 +27,7 @@ vars+=(usercredentials rootcredentials)
arrs+=(core_packages base_packages purge_packages blend_packages)
## enable local apt cache
-APT_CACHE=1
+APT_CACHE=0
aptcachedir="$LIBPATH/apt-cache"
## key used to sign the cache's Release
aptcachegpg="0xdeadbeefdeadbeef"
t@@ -36,7 +36,7 @@ os="devuan"
release="jessie"
version="1.0.0"
mirror="http://auto.mirror.devuan.org/merged"
-section="main"
+section="main contrib non-free"
image_name="${os}_${release}_${version}_${arch}"
[[ -n "$blend_name" ]] && image_name="${image_name}_${blend_name}" |
| diff --git a/zlibs/helpers b/zlibs/helpers |
| t@@ -275,6 +275,7 @@ chroot-script() {
local script="$2"
devprocsys mount "$strapdir" || zerr
dpkgdivert on "$strapdir" || zerr
+ [[ "$APT_CACHE" = 1 ]] && { aptcache on "$strapdir/mnt" || zerr }
## logging
sudo sed -i "$strapdir/$script" \
t@@ -285,6 +286,7 @@ chroot-script() {
sudo -E chroot "$strapdir" "/$script" || zerr
sudo mv -f "$strapdir/${script}.log" "$R/log/"
+ [[ "$APT_CACHE" = 1 ]] && { aptcache off "$strapdir/mnt" || zerr }
dpkgdivert off "$strapdir" || zerr
devprocsys umount "$strapdir" || zerr
;; |