Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-08-14 18:24:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Imported 23.10.27 from mantic-release pocket.

Browse Source 
No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2023-08-30 02:51:09 +00:00
parent 197c549edb
commit 9899b25b05
3 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
debian/changelog vendored
View File

@ -1,3 +1,12 @@
livecd-rootfs (23.10.27) mantic; urgency=medium
* Add ubuntu to the list of targets we autopkgtest for on amd64, to ensure
coverage of the lb_chroot_layered behavior.
* lb_chroot_layered: if the unmount of the chroot mountpoint fails, dump
mount information for debugging.
-- Steve Langasek <steve.langasek@ubuntu.com> Tue, 29 Aug 2023 10:39:23 -0700
livecd-rootfs (23.10.26) mantic; urgency=medium livecd-rootfs (23.10.26) mantic; urgency=medium
[ Łukasz 'sil2100' Zemczak ] [ Łukasz 'sil2100' Zemczak ]

7
debian/tests/default-bootstraps vendored
View File

@ -43,11 +43,17 @@ ALL_TRIPLETS="
xubuntu:: xubuntu::
xubuntu:minimal:" xubuntu:minimal:"
ARCH=$(dpkg --print-architecture)
if [ -z "$SELECTED_TRIPLETS" ]; then if [ -z "$SELECTED_TRIPLETS" ]; then
SELECTED_TRIPLETS=" SELECTED_TRIPLETS="
ubuntu-base:: ubuntu-base::
ubuntu-cpc::ubuntu-cpc ubuntu-cpc::ubuntu-cpc
" "
if [ "$ARCH" = amd64 ]; then
SELECTED_TRIPLETS="$SELECTED_TRIPLETS
ubuntu::"
fi
fi fi
live_build_rootfs() { live_build_rootfs() {
@ -55,7 +61,6 @@ live_build_rootfs() {
local SUBPROJECT_TMP=${1%:*} local SUBPROJECT_TMP=${1%:*}
SUBPROJECT=${SUBPROJECT_TMP#*:} SUBPROJECT=${SUBPROJECT_TMP#*:}
TEMPLATE=${1##*:} TEMPLATE=${1##*:}
ARCH=$(dpkg --print-architecture)
echo "Building rootfs for project: '$PROJECT' subproject: '$SUBPROJECT' template: '$TEMPLATE' in $PWD" echo "Building rootfs for project: '$PROJECT' subproject: '$SUBPROJECT' template: '$TEMPLATE' in $PWD"
cp -a /usr/share/livecd-rootfs/live-build/auto . cp -a /usr/share/livecd-rootfs/live-build/auto .
if [ -n "$TEMPLATE" ]; then if [ -n "$TEMPLATE" ]; then

8
live-build/lb_chroot_layered
View File

@ -268,7 +268,13 @@ create_chroot_pass () {
lb chroot_devpts remove ${*} lb chroot_devpts remove ${*}
if [ -n "$lowerdirs" ]; then if [ -n "$lowerdirs" ]; then
umount chroot res=0
umount chroot || res=$?
if [ $res -ne 0 ]; then
Echo_message "Unmount failed, current mounts: "
cat /proc/$$/mounts
exit $res
fi
rmdir chroot rmdir chroot
else else
rm chroot rm chroot