[SCM] live-build branch, debian-next, updated. debian/3.0_a49-1-12-g9eeb8c3

Daniel Baumann daniel at debian.org
Wed Jun 6 17:31:44 UTC 2012


The following commit has been merged in the debian-next branch:
commit 9eeb8c3bb86f6c45d9f83c689473fe9c98a2fdf6
Author: Hector Oron <hector.oron at gmail.com>
Date:   Wed Jun 6 19:31:17 2012 +0200

    Dont assume bash when configuring chroot with QEMU.
    
    Currently running second stage with QEMU on a chroot without bash fails.
    The following patch teaches chroot to use /bin/sh instead default /bin/bash.

diff --git a/scripts/build/lb_bootstrap_debootstrap b/scripts/build/lb_bootstrap_debootstrap
index 080335d..f169926 100755
--- a/scripts/build/lb_bootstrap_debootstrap
+++ b/scripts/build/lb_bootstrap_debootstrap
@@ -154,7 +154,7 @@ then
 
 		Echo_message "Running debootstrap second stage under QEMU"
 		cp ${LB_BOOTSTRAP_QEMU_STATIC} chroot/usr/bin
-		Chroot chroot /debootstrap/debootstrap --second-stage
+		Chroot chroot /bin/sh /debootstrap/debootstrap --second-stage
 	else
 		${LB_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} "${LB_PARENT_DISTRIBUTION}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}"
 	fi

-- 
live-build



More information about the debian-live-changes mailing list