- new chroot does not take / anymore but just fails.

This is fixing Ubuntu 14.10 builds (and hopefully breaks nothing else)

1 files changed, 6 insertions, 6 deletions

diff --git a/build-pkg-deb b/build-pkg-deb
index 9e3f679..c6c4702 100644
--- a/build-pkg-deb
+++ b/build-pkg-deb
@@ -39,7 +39,7 @@ pkg_initdb_deb() {
 	rm -f $BUILD_ROOT/.init_b_cache/dpkg.deb
 	cp $BUILD_ROOT/.init_b_cache/rpms/dpkg.deb $BUILD_ROOT/.init_b_cache/dpkg.deb || cleanup_and_exit 1
     fi
-    chroot $BUILD_ROOT dpkg -i --force all .init_b_cache/dpkg.deb >/dev/null 2>&1
+    $CHROOT dpkg -i --force all .init_b_cache/dpkg.deb >/dev/null 2>&1
 }
 
 pkg_get_installed_deb() {
@@ -55,7 +55,7 @@ pkg_set_packageid_deb() {
 pkg_install_deb() {
     export DEBIAN_FRONTEND=noninteractive
     export DEBIAN_PRIORITY=critical
-    ( chroot $BUILD_ROOT dpkg --install --force all .init_b_cache/$PKG.deb 2>&1 || touch $BUILD_ROOT/exit ) | \
+    ( $CHROOT dpkg --install --force all /.init_b_cache/$PKG.deb 2>&1 || touch $BUILD_ROOT/exit ) | \
 	perl -ne '$|=1;/^(Configuration file|Installing new config file|Selecting previously deselected|Selecting previously unselected|\(Reading database|Unpacking |Setting up|Creating config file|Preparing to replace dpkg)/||/^$/||print'
     check_exit
     # ugly workaround for upstart system. some packages (procps) try
@@ -89,9 +89,9 @@ pkg_finalize_deb() {
     # configure all packages after complete installation, not for each package like rpm does
     # We need to run this twice, because of cyclic dependencies as it does not succeed on most
     # debian based distros in the first attempt.
-    if ! chroot $BUILD_ROOT dpkg --configure --pending  2>&1; then
+    if ! $CHROOT dpkg --configure --pending  2>&1; then
          echo "first configure attempt failed, trying again..."
-         chroot $BUILD_ROOT dpkg --configure --pending  2>&1 || cleanup_and_exit 1
+         $CHROOT dpkg --configure --pending  2>&1 || cleanup_and_exit 1
     fi
 }
 
@@ -117,12 +117,12 @@ pkg_runscripts_deb() {
     fi
     if test -e "$BUILD_ROOT/.init_b_cache/scripts/$PKG.pre" ; then
 	echo "running $PKG preinstall script"
-	chroot $BUILD_ROOT ".init_b_cache/scripts/$PKG.pre" install < /dev/null
+	$CHROOT "/.init_b_cache/scripts/$PKG.pre" install < /dev/null
 	rm -f "$BUILD_ROOT/.init_b_cache/scripts/$PKG.pre"
     fi
     if test -e "$BUILD_ROOT/.init_b_cache/scripts/$PKG.post" ; then
 	echo "running $PKG postinstall script"
-	chroot $BUILD_ROOT ".init_b_cache/scripts/$PKG.post" configure '' < /dev/null
+	$CHROOT "/.init_b_cache/scripts/$PKG.post" configure '' < /dev/null
 	rm -f "$BUILD_ROOT/.init_b_cache/scripts/$PKG.post"
     fi
 }