Push down the sudo / root commands into buildstrap.

Instead of running the whole buildstrap script with sudo, have each
command requiring sudo rights run with the $root prefix. This is
preparatory work for introducing support for 'fakeroot'.

Signed-off-by: Alistair Strachan <astrachan@google.com>

Author: Alistair Strachan

androdeb

@@ -298,11 +298,9 @@ fi
 PACKAGES+="$DEFAULT_PACKAGES"
 c_info "Using temporary directory: $TDIR"
 
-if [[ $EUID -ne 0 ]]; then c_info "The next stage runs as sudo, please enter password if asked."; fi
-
 ex_files=$(mktemp); echo $EXTRA_FILES > $ex_files
 
-sudo $spath/buildstrap $ARCH $DISTRO $TDIR $OUT_TMP "$PACKAGES" \
+$spath/buildstrap $ARCH $DISTRO $TDIR $OUT_TMP "$PACKAGES" \
 		$ex_files $INSTALL_BCC $SKIP_DEVICE $MIRROR
 rm $ex_files
 

buildstrap

@@ -15,50 +15,57 @@ SKIP_DEVICE=$8		# Skip any device-specific stages
 MIRROR=$9
 VARIANT="--variant=minbase"
 
-time qemu-debootstrap --arch $ARCH --include=$PACKAGES $VARIANT \
+root=sudo
+
+if [ $EUID -ne 0 ]; then echo "The next stage runs as sudo, please enter password if asked."; fi
+
+# It's easier to just really be root for debootstrap
+time $root qemu-debootstrap --arch $ARCH --include=$PACKAGES $VARIANT \
 	$DISTRO $OUT_TMP $MIRROR
 
 # Some reason debootstrap leaves these mounted
-umount $OUT_TMP/proc/sys/fs/binfmt_misc || true
-umount $OUT_TMP/proc || true
+$root umount $OUT_TMP/proc/sys/fs/binfmt_misc || true
+$root umount $OUT_TMP/proc || true
 
 # Make bash the default shell
-chroot $OUT_TMP rm /bin/sh || true
-chroot $OUT_TMP ln -s /bin/bash /bin/sh || true
-cp $spath/addons/bashrc $OUT_TMP/.bashrc
-cp $spath/addons/bashrc.common $OUT_TMP/.bashrc.common
-cp $spath/addons/bashrc.silent $OUT_TMP/.bashrc.silent
-cp $spath/addons/get_kvers.sh $OUT_TMP/
+$root ln -sf /bin/bash $OUT_TMP/bin/sh || true
+$root cp $spath/addons/bashrc $OUT_TMP/.bashrc
+$root cp $spath/addons/bashrc.common $OUT_TMP/.bashrc.common
+$root cp $spath/addons/bashrc.silent $OUT_TMP/.bashrc.silent
+$root cp $spath/addons/get_kvers.sh $OUT_TMP/
 
 for f in $EXTRA_FILES; do
 	if [ $f == "none" ]; then continue; fi
-	cp $f $OUT_TMP/
+	$root cp $f $OUT_TMP/
 done
 
 # Cleanup
-rm -rf $OUT_TMP/lib/udev/*
-rm -rf $OUT_TMP/var/lib/apt/lists/*
-rm -rf $OUT_TMP/var/cache/apt/archives/*deb
-rm -rf $OUT_TMP/usr/share/locale/*
-rm -rf $OUT_TMP/usr/lib/share/locale/*
-rm -rf $OUT_TMP/usr/share/doc/*
-rm -rf $OUT_TMP/usr/lib/share/doc/*
-rm -rf $OUT_TMP/usr/share/ieee-data/*
-rm -rf $OUT_TMP/usr/lib/share/ieee-data/*
-rm -rf $OUT_TMP/usr/share/man/*
-rm -rf $OUT_TMP/usr/lib/share/man/*
+$root rm -rf $OUT_TMP/lib/udev/*
+$root rm -rf $OUT_TMP/var/lib/apt/lists/*
+$root rm -rf $OUT_TMP/var/cache/apt/archives/*deb
+$root rm -rf $OUT_TMP/usr/share/locale/*
+$root rm -rf $OUT_TMP/usr/lib/share/locale/*
+$root rm -rf $OUT_TMP/usr/share/doc/*
+$root rm -rf $OUT_TMP/usr/lib/share/doc/*
+$root rm -rf $OUT_TMP/usr/share/ieee-data/*
+$root rm -rf $OUT_TMP/usr/lib/share/ieee-data/*
+$root rm -rf $OUT_TMP/usr/share/man/*
+$root rm -rf $OUT_TMP/usr/lib/share/man/*
 
 # Fix apt-get issue: Android requires _apt user to be in the
 # AID_INET group which is also android specific.
 grep -ri _apt:x:100:65534 $OUT_TMP/etc/passwd > /dev/null 2>&1
 if [ $? -ne 0 ]; then
 	c_warning "_apt user cannot be added to AID_INET group"
 else
-	sed -i -e 's/_apt:x:100:65534/_apt:x:100:3003/' $OUT_TMP/etc/passwd
+	$root sed -i -e 's/_apt:x:100:65534/_apt:x:100:3003/' \
+		$OUT_TMP/etc/passwd
 fi
 
 # Add a default DNS server
-echo "nameserver 4.2.2.2" > $OUT_TMP/etc/resolv.conf
+$root tee -a $OUT_TMP/etc/resolv.conf >/dev/null <<EOF
+nameserver 4.2.2.2
+EOF
 
 # Clone BCC if needed
 if [ $INSTALL_BCC -eq 1 ]; then
@@ -71,12 +78,10 @@ if [ $INSTALL_BCC -eq 1 ]; then
 	popd
 fi
 
-# Should be really do this?
-chmod -R 0777 $TDIR/
-
 [ $SKIP_DEVICE -eq 0 ] || exit 0
 
 c_info "Compressing new filesystem to prepare to push to Android /data/androdeb/"
-tar -zcf $TDIR/deb.tar.gz -C $TDIR debian
 
-chmod 0777 $TDIR/deb.tar.gz
+$root tar -zpcf $TDIR/deb.tar.gz -C $TDIR debian
+
+$root chown --reference=$TDIR $TDIR/deb.tar.gz