New adt_normaluser configuration option for adt-xenlvm-*

diff --git a/debian/changelog b/debian/changelog
index 383ad3a5bf8afc8b0acff3ef9b62cebe7a1b3fc6..6c5c232893f87f721cf39b49f86ec914ece8ed1c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ autopkgtest (0.6.2~iwj) unstable; urgency=low
   * Concatenate arguments to dchroot et al, to stop them looking inside
     the args and getting confused.
   * New adt-virt-xenlvm WIP
+  * New adt_normaluser configuration option for adt-xenlvm-*
 
- -- Ian Jackson <ian@davenant.greenend.org.uk>  Tue, 31 Oct 2006 15:03:05 +0000
+ -- Ian Jackson <ian@davenant.greenend.org.uk>  Wed,  1 Nov 2006 16:55:03 +0000
 
 autopkgtest (0.6.1) edgy; urgency=low
 

diff --git a/xen/README b/xen/README
index b3da73fa8e17925a2e29090951450b2c7ff1bf40..2dc6e46f831215fe6fa10e0ffedd4b79864aa2c4 100644 (file)
--- a/xen/README
+++ b/xen/README
@@ -230,6 +230,10 @@ adt_nominum                adt
 adt_guest_macaddr      00:16:3e:7c:aa:7f
 adt_net_vifscript      /etc/xen/scripts/vif-route-adt
 
+adt_normaluser         adtxenu
+       Create a normal user account of this name, with disabled
+       password.
+
 ---------- Items which should not usually need to be changed ----------
 
 adt_host_hostname      `hostname -f`

diff --git a/xen/fixups-inside b/xen/fixups-inside
index eca190e5fd6778f87831c2905cccb142fa6d1303..d4aae6d9640bdcaddba745f6faaf69e7ef8972d3 100755 (executable)
--- a/xen/fixups-inside
+++ b/xen/fixups-inside
@@ -61,4 +61,9 @@ perl -wne '
 ' $essc >$essc.new
 mv $essc.new $essc
 
+if [ x"$adt_normaluser" != x ]; then
+       adduser --gecos 'adtxenlvm testing normal user account' \
+               --disabled-password ${adt_normaluser}
+fi
+
 echo '---)'

diff --git a/xen/readconfig.in b/xen/readconfig.in
index 19aa750d8999ab9a598d7a678f68d0451e49770c..56c0657a20fdac7959b339e8250537a8d010607d 100644 (file)
--- a/xen/readconfig.in
+++ b/xen/readconfig.in
@@ -44,6 +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
 
 #---------- arguments and config file ----------