From 2f34061827b147c8c32f5dd812cdebda4f8c868d Mon Sep 17 00:00:00 2001
From: Ian Jackson <ian@anarres>
Date: Thu, 15 Feb 2007 18:34:46 +0000
Subject: [PATCH] get adtxenu username right; suppress debug properly when
 !--debug

---
 debian/changelog  | 6 ++++++
 runner/adt-run    | 8 ++++----
 xen/readconfig.in | 2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index aa9d844..c43ed23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+autopkgtest (0.6.2~iwj.3) unstable; urgency=low
+
+  * Get username right.
+
+ -- Ian Jackson <ian@davenant.greenend.org.uk>  Thu, 15 Feb 2007 18:18:50 +0000
+
 autopkgtest (0.6.2~iwj.2) unstable; urgency=low
 
   * adt-xenlvm: fix up adt_normaluser so that it actually works.
diff --git a/runner/adt-run b/runner/adt-run
index 38290b7..d329d00 100755
--- a/runner/adt-run
+++ b/runner/adt-run
@@ -1108,10 +1108,10 @@ def build_source(act):
 
 	script = [
 			'cd '+work.write(True),
-			'apt-get update >&4',
-			'apt-get -qy install build-essential >&4',
-			'gdebi '+dsc.read(True) +'>&4 ||apt-get -y install dpatch bison >&4', # fixme fixme
-			'dpkg-source -x '+dsc.read(True)+' >&4',
+			'apt-get update',
+			'apt-get -qy install build-essential',
+			'gdebi '+dsc.read(True) +' ||apt-get -y install dpatch bison', # fixme fixme
+			'dpkg-source -x '+dsc.read(True),
 			'cd */.',
 			'dpkg-checkbuilddeps',
 			'pwd >&3',
diff --git a/xen/readconfig.in b/xen/readconfig.in
index 7ed706b..15c58b9 100644
--- a/xen/readconfig.in
+++ b/xen/readconfig.in
@@ -44,7 +44,7 @@ adt_fw_allowglobalports='80'
 
 adt_guest_macaddr=00:16:3e:7c:aa:7f
 adt_net_vifscript=/etc/xen/scripts/vif-route-adt
-adt_normaluser=adtxenlvm
+adt_normaluser=adtxenu
 
 #---------- arguments and config file ----------
 
-- 
2.30.2