Commit 2dcbbca5 authored by intrigeri's avatar intrigeri

Adjust to Buster's debootstrap (refs: #16868).

parent 3df6c19c
......@@ -139,7 +139,7 @@ $RUN_LB_CONFIG \
--checksums none \
--bootappend-live "${AMNESIA_APPEND}" \
--bootstrap debootstrap \
--bootstrap-config tails-build-jessie \
--bootstrap-config buster \
--archive-areas "main contrib non-free" \
--includes none \
--iso-application="The Amnesic Incognito Live System" \
......@@ -207,13 +207,19 @@ install -m 0755 \
rm -rf config/chroot_local-includes/usr/src/aufs-standalone
cp -a submodules/aufs-standalone config/chroot_local-includes/usr/src/
# custom debootstrap script, setting some APT magic to log downloads:
# save the original file, shipped by the debootstrap package,
# so we can always apply our debian-common.patch to the original
# version
if ! [ -e /usr/share/debootstrap/scripts/debian-common.bak ]; then
cp -a /usr/share/debootstrap/scripts/debian-common \
/usr/share/debootstrap/scripts/debian-common.bak
fi
# customize debootstrap with some APT magic to log downloads
patch \
--follow-symlinks \
--output=/usr/share/debootstrap/scripts/tails-build-jessie \
/usr/share/debootstrap/scripts/jessie \
data/debootstrap/scripts/jessie.patch
sed -i "s,%%topdir%%,$(pwd)," /usr/share/debootstrap/scripts/tails-build-jessie
--output=/usr/share/debootstrap/scripts/debian-common \
/usr/share/debootstrap/scripts/debian-common.bak \
data/debootstrap/scripts/debian-common.patch
sed -i "s,%%topdir%%,$(pwd)," /usr/share/debootstrap/scripts/debian-common
# Make the python library available in Tails
install -d -m 2777 config/chroot_local-includes/tmp/
--- /usr/share/debootstrap/scripts/sid 2016-05-11 15:43:45.396062439 +0000
+++ data/debootstrap/tails-wheezy 2016-05-11 15:38:08.949103098 +0000
@@ -201,4 +201,8 @@
--- /usr/share/debootstrap/scripts/debian-common 2019-07-06 13:22:30.000000000 +0200
+++ /usr/share/debootstrap/scripts/debian-common 2019-08-05 14:15:07.165451726 +0200
@@ -217,4 +217,8 @@
progress $bases $bases CONFBASE "Configuring base system"
info BASESUCCESS "Base system installed successfully."
......
......@@ -35,7 +35,7 @@ in them. Therefore, we create a _build manifest_ at the end of an ISO
build. It is generated by
[[!tails_gitweb auto/scripts/generate-build-manifest]], thanks to
[[!tails_gitweb data/wrappers/apt-get]] and
[[!tails_gitweb data/debootstrap/scripts/jessie.patch]].
[[!tails_gitweb data/debootstrap/scripts/debian-common.patch]].
Output:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment