From 2fd8e643fce82609475e250b8a17d3fc4a0b488e Mon Sep 17 00:00:00 2001
From: Anders Ingemann <anders@ingemann.de>
Date: Sun, 11 Aug 2013 23:46:22 +0200
Subject: [PATCH] Run apt-get upgrade before we remove resolv.conf This way we
 can still resolve domain names even when running chrooted

---
 common/tasks/apt.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/common/tasks/apt.py b/common/tasks/apt.py
index e039df4..fe3e0c9 100644
--- a/common/tasks/apt.py
+++ b/common/tasks/apt.py
@@ -1,8 +1,9 @@
 from base import Task
 from common import phases
 from common.tools import log_check_call
+import network
+import locale
 import os
-from locale import GenerateLocale
 
 
 class AptSources(Task):
@@ -41,7 +42,8 @@ class DisableDaemonAutostart(Task):
 class AptUpgrade(Task):
 	description = 'Upgrading packages and fixing broken dependencies'
 	phase = phases.system_modification
-	after = [GenerateLocale, AptSources, DisableDaemonAutostart]
+	before = [network.RemoveDNSInfo]
+	after = [locale.GenerateLocale, AptSources, DisableDaemonAutostart]
 
 	def run(self, info):
 		log_check_call(['/usr/sbin/chroot', info.root, '/usr/bin/apt-get', 'update'])