get adtxenu username right; suppress debug properly when !--debug

diff --git a/debian/changelog b/debian/changelog
index aa9d84440a404c8f0e8cab1ccd04df6e98f44901..c43ed233305a205bcec5bd7c678158d0efde61e4 100644 (file)
--- 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 38290b7a42414d36469561283e62e38a4f5f6cd1..d329d00ee48f13014416c723c074901eadbde6f5 100755 (executable)
--- 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 7ed706be621f39178623031b303c0396bf7feabd..15c58b98457c935b0563985b44ec39c3b26e25ba 100644 (file)
--- 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 ----------