From 04cec317cc4437eed514f4277f6779010e587662 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Mon, 18 Feb 2013 11:29:04 +0100
Subject: Removing incomplete support for root-command.

---
 scripts/build/bootstrap_debootstrap | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

(limited to 'scripts/build/bootstrap_debootstrap')

diff --git a/scripts/build/bootstrap_debootstrap b/scripts/build/bootstrap_debootstrap
index ebfd7bf61..5f7df4b09 100755
--- a/scripts/build/bootstrap_debootstrap
+++ b/scripts/build/bootstrap_debootstrap
@@ -101,12 +101,7 @@ then
 		fi
 
 		Echo_breakage "Running debootstrap (download-only)... "
-		${LB_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LB_PARENT_DISTRIBUTION}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}"
-
-		if [ -n "${LB_ROOT_COMMAND}" ]
-		then
-			${LB_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot
-		fi
+		debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LB_PARENT_DISTRIBUTION}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}"
 
 		# Removing old cache
 		rm -f cache/packages.bootstrap/*.deb
@@ -127,18 +122,13 @@ then
 		fi
 
 		Echo_message "Bootstrap will be foreign"
-		${LB_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} --foreign "${LB_PARENT_DISTRIBUTION}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}"
+		debootstrap ${DEBOOTSTRAP_OPTIONS} --foreign "${LB_PARENT_DISTRIBUTION}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}"
 
 		Echo_message "Running debootstrap second stage under QEMU"
 		cp ${LB_BOOTSTRAP_QEMU_STATIC} chroot/usr/bin
 		Chroot chroot /bin/sh /debootstrap/debootstrap --second-stage
 	else
-		${LB_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} "${LB_PARENT_DISTRIBUTION}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}"
-	fi
-
-	if [ -n "${LB_ROOT_COMMAND}" ]
-	then
-		${LB_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot
+		debootstrap ${DEBOOTSTRAP_OPTIONS} "${LB_PARENT_DISTRIBUTION}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}"
 	fi
 
 	# Deconfiguring debootstrap configurations
-- 
cgit v1.2.3