[Fusionforge-commits] r12566 - trunk/tests/lxc
Christian Bayle
cbayle at fusionforge.org
Fri Mar 4 15:06:53 CET 2011
Author: cbayle
Date: 2011-03-04 15:06:53 +0100 (Fri, 04 Mar 2011)
New Revision: 12566
Modified:
trunk/tests/lxc/lxc-centos5
Log:
use mirror defined in rinse.conf
Modified: trunk/tests/lxc/lxc-centos5
===================================================================
--- trunk/tests/lxc/lxc-centos5 2011-03-04 12:14:53 UTC (rev 12565)
+++ trunk/tests/lxc/lxc-centos5 2011-03-04 14:06:53 UTC (rev 12566)
@@ -127,8 +127,8 @@
sed -i -e '/start_udev/d' $rootfs/etc/rc.d/rc.sysinit
-rm -f $rootfs/etc/mtab
-ln -s /proc/mounts $rootfs/etc/mtab
+#rm -f $rootfs/etc/mtab
+#ln -s /proc/mounts $rootfs/etc/mtab
mv $rootfs/dev $rootfs/dev.old
mkdir $rootfs/dev
@@ -175,16 +175,33 @@
echo "Downloading centos minimal ..."
#febootstrap $DISTRO $cache/partial-$arch
rinsearch=`dpkg-architecture -qDEB_BUILD_ARCH`
- cat <<EOF > /var/cache/rinse/centos5-arch.pkglist
-openssh-server
-man
-zsh
-bind-utils
-openssh-clients
-php
-wget
+ pkglist="openssh-server man zsh bind-utils openssh-clients php wget"
+
+ cat <<EOF > /var/cache/rinse/$DISTRO-$arch.before_post_install
+echo "Rinse defines mirror=\$mirror in config"
+server=`echo \$mirror | cut -d/ -f3`
+echo "Disable mirrorlists"
+sed -i -e "s/^mirrorlist=/#mirrorlist=/" $cache/partial-$arch/etc/yum.repos.d/CentOS-Base.repo
+echo "Setup baseurl on server \$server"
+sed -i -e "s!#baseurl=http://mirror.centos.org!baseurl=http://\$server!" $cache/partial-$arch/etc/yum.repos.d/CentOS-Base.repo
+rm -f $cache/partial-$arch/etc/mtab
+ln -s /proc/mounts $cache/partial-$arch/etc/mtab
EOF
- rinse --config /etc/rinse/rinse.conf --arch $rinsearch --distribution $DISTRO --add-pkg-list /var/cache/rinse/centos5-arch.pkglist --directory $cache/partial-$arch
+ chmod 755 /var/cache/rinse/$DISTRO-$arch.before_post_install
+
+ cat <<EOF > /var/cache/rinse/$DISTRO-$arch.after_post_install
+chroot $cache/partial-$arch /bin/mount proc /proc -t proc
+chroot $cache/partial-$arch /usr/bin/yum -y install $pkglist
+chroot $cache/partial-$arch /bin/umount /proc
+EOF
+ chmod 755 /var/cache/rinse/$DISTRO-$arch.after_post_install
+
+ rinse --config /etc/rinse/rinse.conf \
+ --arch $rinsearch \
+ --distribution $DISTRO \
+ --before-post-install /var/cache/rinse/$DISTRO-$arch.before_post_install \
+ --after-post-install /var/cache/rinse/$DISTRO-$arch.after_post_install \
+ --directory $cache/partial-$arch
if [ $? -ne 0 ]; then
echo "Failed to download the rootfs, aborting."
More information about the Fusionforge-commits
mailing list