manuel/live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rclobus/debootstrap_eatmydata' into 'master'

Browse Source 
debootstrap: Optionally use 'eatmydata'

See merge request live-team/live-build!397
This commit is contained in:
Roland Clobus 2025-01-10 10:56:15 +00:00
commit 26bc1189f1
3 changed files with 40 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
debian/control vendored
View File

@ -3,12 +3,8 @@ Section: misc
Priority: optional
Maintainer: Debian Live <debian-live@lists.debian.org>
Uploaders: Raphaël Hertzog <raphael@offensive-security.com>,
Luca Boccassi <bluca@debian.org>,
Build-Depends:
debhelper-compat (= 13),
po4a,
gettext,
devscripts,
Luca Boccassi <bluca@debian.org>
Build-Depends: debhelper-compat (= 13), devscripts, gettext, po4a
Standards-Version: 4.7.0
Rules-Requires-Root: no
Homepage: https://wiki.debian.org/DebianLive
@ -17,27 +13,19 @@ Vcs-Git: https://salsa.debian.org/live-team/live-build.git
Package: live-build
Architecture: all
Depends:
cpio,
debootstrap,
${misc:Depends},
Recommends:
apt-utils,
bzip2,
cryptsetup,
file,
live-boot-doc,
live-config-doc,
live-manual-html | live-manual,
rsync,
systemd-container,
wget,
xz-utils,
Suggests:
e2fsprogs,
git,
parted,
mtd-utils,
Depends: cpio, debootstrap, ${misc:Depends}
Recommends: apt-utils,
bzip2,
cryptsetup,
file,
live-boot-doc,
live-config-doc,
live-manual-html | live-manual,
rsync,
systemd-container,
wget,
xz-utils
Suggests: e2fsprogs, eatmydata, git, mtd-utils, parted
Description: Live System Build Components
The Debian Live project maintains the components to build Debian based Live
systems and the official Debian Live images themselves.

21
debian/tests/control vendored
View File

@ -1,11 +1,20 @@
Tests: build-default-image
Depends: live-build,
Restrictions: needs-root, allow-stderr, needs-internet
Depends: live-build
Restrictions: allow-stderr, needs-internet, needs-root
Tests: build-stable-image
Depends: live-build,
Restrictions: needs-root, allow-stderr, needs-internet
Depends: live-build
Restrictions: allow-stderr, needs-internet, needs-root
Tests: build-kali-image
Depends: live-build, git, ca-certificates, curl, apt-utils, bzip2, cpio, file, wget, xz-utils
Restrictions: needs-root, allow-stderr, flaky, needs-internet
Depends: apt-utils,
bzip2,
ca-certificates,
cpio,
curl,
file,
git,
live-build,
wget,
xz-utils
Restrictions: allow-stderr, flaky, needs-internet, needs-root

11
scripts/build/bootstrap_debootstrap
View File

@ -30,6 +30,15 @@ fi
Echo_message "Begin bootstrapping system..."
Check_package host /usr/sbin/debootstrap debootstrap
Check_installed host /usr/bin/eatmydata eatmydata
if [ "${INSTALL_STATUS}" -eq 0 ]
then
Echo_message "eatmydata found. It will be used do disable the sync command in the second stage of debootstrap"
_EATMYDATA="eatmydata"
else
# eatmydata is optional
_EATMYDATA=""
fi
# Checking stage file
Check_stagefile "bootstrap"
@ -110,7 +119,7 @@ if [ -n "${LB_BOOTSTRAP_QEMU_ARCHITECTURE}" ]; then
Echo_message "Running debootstrap second stage under QEMU"
Chroot chroot /bin/sh /debootstrap/debootstrap --second-stage ${FOREIGN_DEBOOTSTRAP_OPTIONS}
else
debootstrap ${DEBOOTSTRAP_OPTIONS} "${LB_PARENT_DISTRIBUTION_CHROOT}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}" ${DEBOOTSTRAP_SCRIPT}
${_EATMYDATA} debootstrap ${DEBOOTSTRAP_OPTIONS} "${LB_PARENT_DISTRIBUTION_CHROOT}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}" ${DEBOOTSTRAP_SCRIPT}
fi
# If there's an os-release file, copy it to /etc/ and add some extra fields that identify the live image