[buildd-tools-devel] Bug#740427: Bug#740427: 10mount uses --bind on kfreebsd

[Roger Leigh]

On Wed, Mar 05, 2014 at 10:48:17AM +0100, Christoph Egger wrote:
> Robert Millan <rmh at debian.org> writes:
> > On 01/03/2014 13:14, Christoph Egger wrote:
> >> E: 10mount: + mount --bind /srv/chroot/sid /var/lib/schroot/mount/unstable-kfreebsd-amd64-sbuild-1393679326-19038
> >
> > I don't have time to send a patch, but FTR that line ought to be:
> >
> > mount -t nullfs /srv/chroot/sid /var/lib/schroot/mount/unstable-kfreebsd-amd64-sbuild-1393679326-19038
> 
> Right. There's even code for this but for some reason $HOST_OS seems to
> be unset during execution of 10mount. Should it be set by schroot? Does
> 10mount miss a HOST_OS="`uname -a`" somewhere near the top?

Ah, I think this might be caused by the switch to cmake.

On master:
% git grep SCHROOT_HOST_OS
config.h.cmake:#cmakedefine SCHROOT_HOST_OS "${SCHROOT_HOST_OS}"
lib/schroot/session.cc:#ifdef SCHROOT_HOST_OS
lib/schroot/session.cc:    env.add("HOST_OS", SCHROOT_HOST_OS);
lib/schroot/session.cc:#endif // SCHROOT_HOST_OS

On schroot-1.6:
% git grep SBUILD_HOST_OS
config.h.cmake:#cmakedefine SBUILD_HOST_OS "${SBUILD_HOST_OS}"
configure.ac:AH_TEMPLATE(SBUILD_HOST_OS, [Host OS])
configure.ac:AC_DEFINE_UNQUOTED(SBUILD_HOST_OS, ["$host_os"])
sbuild/sbuild-session.cc:#ifdef SBUILD_HOST_OS
sbuild/sbuild-session.cc:  env.add("HOST_OS", SBUILD_HOST_OS);
sbuild/sbuild-session.cc:#endif // SBUILD_HOST_OS

With the old autoconf build, HOST_OS is derived directly from
the config.guess output.  cmake isn't providing this, so we
aren't defining it.  Note that on 1.6, you still have the
option of building with autoconf, but the Debian packaging
was switched to use cmake.

contrib/setup.d/05customdir:        case "$HOST_OS" in
etc/setup.d/10mount:        case "$HOST_OS" in
etc/setup.d/10mount:            case "$HOST_OS" in
etc/setup.d/common-data:case "$HOST_OS" in

These are the three files which actually use this.  We should
probably be using $(uname -s) and FreeBSD for all these
checks?  On FreeBSD 10, I get:

% uname -s
FreeBSD

So assuming it's the same for kFreeBSD, that's easy enough.

Sorry this fell through the cracks.  It's annoying because most of
my recent work on schroot has been porting to (native) FreeBSD,
which should help kFreeBSD as well.


Regards,
Roger

-- 
  .''`.  Roger Leigh
 : :' :  Debian GNU/Linux    http://people.debian.org/~rleigh/
 `. `'   schroot and sbuild  http://alioth.debian.org/projects/buildd-tools
   `-    GPG Public Key      F33D 281D 470A B443 6756 147C 07B3 C8BC 4083 E800