[SCM] live-build branch, debian, updated. debian/3.0_a34-1-10-gf2132fc
Daniel Baumann
daniel at debian.org
Sat Oct 8 09:03:36 UTC 2011
The following commit has been merged in the debian branch:
commit 0b654837bba8ddabde530d5c0b7d1efdb4139a32
Author: Ben Howard <ben.howard at canonical.com>
Date: Fri Sep 30 16:23:34 2011 -0600
Adding check for missing mtab during chrooted binary rootfs stage.
diff --git a/scripts/build/lb_binary_rootfs b/scripts/build/lb_binary_rootfs
index 280cd1a..96523a8 100755
--- a/scripts/build/lb_binary_rootfs
+++ b/scripts/build/lb_binary_rootfs
@@ -122,12 +122,24 @@ case "${LB_CHROOT_FILESYSTEM}" in
case "${LB_BUILD_WITH_CHROOT}" in
true)
dd if=/dev/zero of=chroot/filesystem.${LB_CHROOT_FILESYSTEM} bs=1024k count=0 seek=${REAL_DIM}
+
+ if ! Chroot chroot "test -s /etc/mtab"
+ then
+ Chroot chroot "ln -s /proc/mounts/mtab /etc/mtab"
+ FAKE_MTAB="true"
+ fi
+
Chroot chroot "mkfs.${LB_CHROOT_FILESYSTEM} -F -b 1024 -N ${REAL_INODES} -m 0 filesystem.${LB_CHROOT_FILESYSTEM}"
mkdir -p filesystem.tmp
${LB_ROOT_COMMAND} mount -o loop chroot/filesystem.${LB_CHROOT_FILESYSTEM} filesystem.tmp
cp -a chroot/chroot/* filesystem.tmp
+ if [ "${FAKE_MTAB}" = "true" ]
+ then
+ Chroot chroot "rm -f /etc/mtab"
+ fi
+
${LB_ROOT_COMMAND} umount filesystem.tmp
rmdir filesystem.tmp
--
live-build
More information about the debian-live-changes
mailing list