aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReto Buerki <reet@codelabs.ch>2012-12-06 14:39:51 +0100
committerTobias Brunner <tobias@strongswan.org>2013-01-17 15:22:09 +0100
commit3c9df38c5e81eb9e7b3e1bf1f6ca6a7573c877ed (patch)
treec482dbf93c3deb3d201c5b0ec86c744cdf85e8cd
parent3b75c7ddc8b6cf39a51c610abd4df65f1343be85 (diff)
downloadstrongswan-3c9df38c5e81eb9e7b3e1bf1f6ca6a7573c877ed.tar.bz2
strongswan-3c9df38c5e81eb9e7b3e1bf1f6ca6a7573c877ed.tar.xz
Add chroot() helper function
-rwxr-xr-xtesting/scripts/build-baseimage11
1 files changed, 8 insertions, 3 deletions
diff --git a/testing/scripts/build-baseimage b/testing/scripts/build-baseimage
index 08d05d12a..0964b6a43 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