From: Reto Buerki <reet@codelabs.ch>
Date: Thu, 6 Dec 2012 13:39:51 +0000 (+0100)
Subject: Add chroot() helper function
X-Git-Tag: 5.0.2rc1~1^2~89
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c9df38c5e81eb9e7b3e1bf1f6ca6a7573c877ed;p=thirdparty%2Fstrongswan.git

Add chroot() helper function
---

diff --git a/testing/scripts/build-baseimage b/testing/scripts/build-baseimage
index 08d05d12a0..0964b6a437 100755
--- a/testing/scripts/build-baseimage
+++ b/testing/scripts/build-baseimage
@@ -26,6 +26,11 @@ execute()
 	fi
 }
 
+execute_chroot()
+{
+	execute "chroot $LOOPDIR $@"
+}
+
 # additional packages
 EXTRAS=build-essential,gperf,libgmp-dev,libldap2-dev,libcurl4-openssl-dev,libxml2-dev,libtspi-dev,libsqlite3-dev,openssh-server,tcpdump,psmisc,openssl,vim,sqlite3,conntrack,gdb,cmake,libxerces-c2-dev,libltdl-dev,liblog4cxx10-dev,libboost-thread-dev,libboost-system-dev,git-core
 SERVICES="isc-dhcp-server apache2 slapd"
@@ -51,14 +56,14 @@ echo " * Running debootstrap ..."
 execute "debootstrap --arch=$ROOTFSARCH --include=$PACKAGES $ROOTFSSUITE $LOOPDIR $ROOTFSMIRROR"
 
 echo " * Disabling root password ..."
-execute "chroot $LOOPDIR passwd -d root"
+execute_chroot "passwd -d root"
 
 echo " * Disabling services ..."
 for service in $SERVICES
 do
 	echo -n "  - $service ... "
-	execute "chroot $LOOPDIR /etc/init.d/$service stop"
-	execute "chroot $LOOPDIR update-rc.d -f $service remove"
+	execute_chroot "/etc/init.d/$service stop"
+	execute_chroot "update-rc.d -f $service remove"
 	echo "done"
 done