Commits 15da01b3938d7ba45472e6c9d3b183a94dd86ca9 and
2e44ed1e647d9fd1544b7ad855bda22ca71abd12 conflicted and resulted in
some duplicate functionality. Drop the poorer version of that block.
Signed-off-by: Serge Hallyn <serge.hal...@ubuntu.com>
---
templates/lxc-ubuntu.in | 28 ----------------------------
1 file changed, 28 deletions(-)
diff --git a/templates/lxc-ubuntu.in b/templates/lxc-ubuntu.in
index 3e84e74..822554f 100644
--- a/templates/lxc-ubuntu.in
+++ b/templates/lxc-ubuntu.in
@@ -160,34 +160,6 @@ download_ubuntu()
return 1
fi
- echo "Installing updates"
- if [ -z "$MIRROR" ]; then
- MIRROR="http://archive.ubuntu.com/ubuntu";
- fi
- cat >> "$1/partial-${arch}/etc/apt/sources.list" << EOF
-deb $MIRROR ${release}-updates main universe
-deb http://security.ubuntu.com/ubuntu ${release}-security main universe
-EOF
- chroot "$1/partial-${arch}" apt-get update
- if [ $? -ne 0 ]; then
- echo "Failed to update the apt cache"
- return 1
- fi
- cat > "$1/partial-${arch}"/usr/sbin/policy-rc.d << EOF
-#!/bin/sh
-exit 101
-EOF
- chmod +x "$1/partial-${arch}"/usr/sbin/policy-rc.d
-
- chroot "$1/partial-${arch}" apt-get dist-upgrade -y
- ret=$?
-
- rm -f "$1/partial-${arch}"/usr/sbin/policy-rc.d
- if [ $ret -ne 0 ]; then
- echo "Failed to upgrade the cache"
- return 1
- fi
-
# Serge isn't sure whether we should avoid doing this when
# $release == `distro-info -d`
echo "Installing updates"
--
1.7.9.5
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Lxc-devel mailing list
Lxc-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/lxc-devel
