[ostree] ostbuild: Use split out linux-user-chroot binary

[Colin Walters <walters src gnome org>]

commit d72d6c5fb10fb4a15a5b5cfa45d549808196e815
Author: Colin Walters <walters verbum org>
Date:   Fri Jan 6 11:41:27 2012 -0500

    ostbuild: Use split out linux-user-chroot binary
    
    This way other meta-build projects could use it; mainly mock/pbuilder.
    
    Also I don't have to keep running chown root:root; chmod u+s in a
    separate root terminal after every install.

 Makefile-ostbuild.am                               |    5 -
 src/ostbuild/ostbuild-user-chroot.c                |  348 --------------------
 .../pyostbuild/builtin_chroot_compile_one.py       |    4 +-
 3 files changed, 2 insertions(+), 355 deletions(-)
---
diff --git a/Makefile-ostbuild.am b/Makefile-ostbuild.am
index 42074e2..bb0f6fb 100644
--- a/Makefile-ostbuild.am
+++ b/Makefile-ostbuild.am
@@ -36,10 +36,5 @@ pyostbuild_PYTHON =					\
 	src/ostbuild/pyostbuild/subprocess_helpers.py	\
 	$(NULL)
 
-bin_PROGRAMS += src/ostbuild/ostbuild-user-chroot
-
-ostbuild_user_chroot_SOURCES = src/ostbuild/ostbuild-user-chroot.c
-ostbuild_user_chroot_CFLAGS = $(AM_CFLAGS)
-
 bin_SCRIPTS += src/ostbuild/ostbuild-nice-and-log-output
 
diff --git a/src/ostbuild/pyostbuild/builtin_chroot_compile_one.py b/src/ostbuild/pyostbuild/builtin_chroot_compile_one.py
index d78399c..182ad7e 100755
--- a/src/ostbuild/pyostbuild/builtin_chroot_compile_one.py
+++ b/src/ostbuild/pyostbuild/builtin_chroot_compile_one.py
@@ -118,12 +118,12 @@ class OstbuildChrootCompileOne(builtins.Builtin):
         # below for our children inside the chroot.
         ostbuild_user_chroot_path = None
         for dirname in os.environ['PATH'].split(':'):
-            path = os.path.join(dirname, 'ostbuild-user-chroot')
+            path = os.path.join(dirname, 'linux-user-chroot')
             if os.access(path, os.X_OK):
                 ostbuild_user_chroot_path = path
                 break
         if ostbuild_user_chroot_path is None:
-            ostbuild_user_chroot_path = 'ostbuild-user-chroot'
+            ostbuild_user_chroot_path = 'linux-user-chroot'
         
         child_args = [ostbuild_user_chroot_path, '--unshare-pid', '--unshare-net', '--unshare-ipc',
                       '--mount-readonly', '/',