attempt fixup of adt_normaluser

diff --git a/debian/changelog b/debian/changelog
index 9edb237f407d15a152162a10df218303328d0182..aa9d84440a404c8f0e8cab1ccd04df6e98f44901 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+autopkgtest (0.6.2~iwj.2) unstable; urgency=low
+
+  * adt-xenlvm: fix up adt_normaluser so that it actually works.
+
+ -- Ian Jackson <ian@davenant.greenend.org.uk>  Thu, 15 Feb 2007 17:36:16 +0000
+
 autopkgtest (0.6.2~iwj.1) unstable; urgency=low
 
   * WIP making xen work again in feisty

diff --git a/xen/fixups b/xen/fixups
index b7d725bdc9fdecb8bd68dab597d04f990986cece..1382a63b29516026a6b71dd3e06f9909e09e951a 100755 (executable)
--- a/xen/fixups
+++ b/xen/fixups
@@ -44,7 +44,7 @@ ln -s ../init.d/xenethtoolk $dest/etc/rc2.d/S21xenethtoolk
 chroot $dest root/fixups-inside \
        "$adt_host_hostname" "$adt_guest_hostname" \
        "$adt_host_ipaddr" "$adt_guest_ipaddr" \
-       "$adt_fs_type"
+       "$adt_fs_type" "$adt_normaluser"
 
 kh=/etc/ssh/ssh_known_hosts
 test ! -f $kh || cp $kh $kh.new

diff --git a/xen/fixups-inside b/xen/fixups-inside
index d35a03d677d5050a98cb722298b7469c705e69da..048cd63de05d4f142e65705e270a94c0a9d04158 100755 (executable)
--- a/xen/fixups-inside
+++ b/xen/fixups-inside
@@ -6,6 +6,7 @@ adt_guest_hostname=$2
 adt_host_ipaddr=$3
 adt_guest_ipaddr=$4
 adt_fs_type=$5
+adt_normaluser=$6
 
 echo '(---'