From 541e6307cb009ce5cf94e36b394128c3e282e027 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Thu, 23 Jan 2014 14:46:31 +0100 Subject: [PATCH] addition for adding the universe feed to ubuntu for python-rpm that is crucially needed for our builds --- lbuild-initvm.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lbuild-initvm.sh b/lbuild-initvm.sh index 2cb3dc27..45fdb8d8 100755 --- a/lbuild-initvm.sh +++ b/lbuild-initvm.sh @@ -720,6 +720,14 @@ function devel_or_vtest_tools () { chroot $rootfs_path rpm -aq > $rootfs_path/init-lxc.rpms ;; debootstrap) + # for ubuntu + if grep -iq ubuntu /vservers/$vserver/rootfs/etc/lsb-release 2> /dev/null; then + # on ubuntu, at this point we end up with a single feed in /etc/apt/sources.list + # we need at least to add the 'universe' feed for python-rpm + ( cd /vservers/$vserver/rootfs/etc/apt ; head -1 sources.list | sed -e s,main,universe, > sources.list.d/universe.list ) + # also adding a link to updates sounds about right + ( cd /vservers/$vserver/rootfs/etc/apt ; head -1 sources.list | sed -e 's, main,-updates main,' > sources.list.d/updates.list ) + fi chroot $rootfs_path apt-get update for package in $packages ; do # close stdin in an attempt to avoid this hanging -- 2.43.0