From: Stéphane Graber <stgraber@ubuntu.com>
Date: Tue, 3 Sep 2013 15:36:09 +0000 (-0400)
Subject: ubuntu: iproute is now called iproute2
X-Git-Tag: lxc-1.0.0.alpha1~1^2~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d08c3aaebca1ccc47f1f14dcd6fbca39953f8dda;p=thirdparty%2Flxc.git

ubuntu: iproute is now called iproute2

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/templates/lxc-ubuntu.in b/templates/lxc-ubuntu.in
index 4fd2cba79..6f6f3e131 100644
--- a/templates/lxc-ubuntu.in
+++ b/templates/lxc-ubuntu.in
@@ -577,8 +577,14 @@ post_process()
         write_sourceslist $rootfs $hostarch "multiarch"
 
         # Finally update the lists and install upstart using the host architecture
+        HOST_PACKAGES="upstart:${hostarch} mountall:${hostarch} isc-dhcp-client:${hostarch}"
         chroot $rootfs apt-get update
-        chroot $rootfs apt-get install --force-yes -y --no-install-recommends upstart:${hostarch} mountall:${hostarch} iproute:${hostarch} isc-dhcp-client:${hostarch}
+        if chroot $rootfs dpkg -l iproute2 | grep -q ^ii; then
+            HOST_PACKAGES="$HOST_PACKAGES iproute2:${hostarch}"
+        else
+            HOST_PACKAGES="$HOST_PACKAGES iproute:${hostarch}"
+        fi
+        chroot $rootfs apt-get install --force-yes -y --no-install-recommends $HOST_PACKAGES
     fi
 
     # rmdir /dev/shm for containers that have /run/shm