debian/changelog: UNRELEASED -> unstable

manpage -> man page

AUTHORS

@@ -3,6 +3,7 @@ Primary Authors
 
   Axel Beckert <abe@deuxchevaux.org>
   Dmitry Nedospasov <dmitry@nedos.net>
+  Stéphane Jourdois <sjourdois [at] com.gmail>
   Steve Kemp <steve [at] uk.org.steve>
 
 
@@ -41,10 +42,6 @@ Contributions
   Kirk Ismay <captain [at] com.netidea>
    - Added hook for automatic CFEngine installation.
 
-  Stéphane Jourdois <sjourdois [at] com.gmail>
-   - Fixed a lot of typos and other small bugs
-   - Fixed the test suite
-
   Sascha Kettler <kettler [at] net.gmx>
    - Implemented support for arbitary partitioning schemes.
 
@@ -52,6 +49,9 @@ Contributions
    - Improved binary detection and good suggestions.
    - Better portability for non-bash shells.
 
+  Jorge Armando Medina <jmedina [at] com.e-compugraf>
+   - Fix for backward compatibility with xvc0 serial consoles
+
   Gordon Messmer <gmessmer [at] edu.washington.u>
    - Supplied .spec file for building .rpm packages.
 
@@ -76,7 +76,7 @@ Contributions
 
   Radu Spineanu <radu [at] org.debian>
    - Supplied many small tweaks, bugfixes, and suggestions.
-   - Radu is also the Debian package maintainer and has CVS commit access.
+   - Radu is also one of the former Debian package maintainers.
 
   Henning Sprang <henning_sprang [at] de.gmx>
    - Many suggestions and useful Debian bug reports.

Makefile

@@ -14,7 +14,7 @@
 #
 TMP        ?= /tmp
 DIST_PREFIX = ${TMP}
-VERSION     = 4.2rc1
+VERSION     = 4.2
 DEBVERSION  = $(shell echo $(VERSION)|sed 's/\(rc\|pre\|beta\|alpha\)/~\1/')
 BASE        = xen-tools
 VCS         = $(shell if git ls-files > /dev/null; then echo git; \
@@ -145,6 +145,7 @@ install-bin:
 #
 install-hooks:
 	for i in roles/* ; do if [ -f $$i ]; then cp $$i ${prefix}/etc/xen-tools/role.d; fi ; done
+	for i in ${prefix}/usr/lib/xen-tools/*.d; do if [ -L "$$i" ]; then rm -vf "$$i"; fi; done
 	mkdir -p ${prefix}/usr/lib/xen-tools/centos-4.d/
 	mkdir -p ${prefix}/usr/lib/xen-tools/centos-5.d/
 	mkdir -p ${prefix}/usr/lib/xen-tools/fedora-core-6.d/
@@ -166,6 +167,7 @@ install-hooks:
 	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d etch.d
 	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d lenny.d
 	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d squeeze.d
+	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d wheezy.d
 	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d sid.d
 	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d testing.d
 	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d stable.d
@@ -185,6 +187,7 @@ install-hooks:
 	cp -R hooks/karmic/*-* ${prefix}/usr/lib/xen-tools/karmic.d/
 	-cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d lucid.d
 	-cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d maverick.d
+	-cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d natty.d
 	cp hooks/common.sh ${prefix}/usr/lib/xen-tools
 
 

README

@@ -1,3 +1,5 @@
+xen-tools
+---------
 
 Homepage:
     http://www.xen-tools.org/software/xen-tools
@@ -6,32 +8,28 @@ Git Repository:
     http://gitorious.org/xen-tools
 
 Mailing Lists:
-    http://xen-tools.org/software/xen-tools/lists.html
+    http://www.xen-tools.org/software/xen-tools/lists.html
 
-
+About:
-
+  Xen-tools contains a collection of Perl scripts for working with Xen
-xen-tools
+ guest images under Linux.
----------
-
-  The xen-tools package contains a collection of Perl scripts for
- working with Xen guest images under Debian GNU/Linux.
 
   Using this software, you can easily create new Xen guests configured
- to be accessible over your local network and complete with an installed
+ to be accessible over the network via OpenSSH.
- copy of OpenSSH.
 
   xen-tools currently has scripts to install most releases of Debian
  (starting with 3.1 "Sarge") and Ubuntu (starting with 6.06 LTS
  "Dapper") and some RPM-based distributions.
 
-  However currently only Debian and Ubuntu releases are tested and
+  However, currently only Debian and Ubuntu releases are tested and
-  known to work, i.e.:
+ known to work, i.e.:
 
 	Debian:
 	  * Sarge 3.1 (i386 only)
 	  * Etch 4.0
 	  * Lenny 5.0
 	  * Squeeze 6.0
+	  * Wheezy 7.0 (preliminary support as it's not yet available)
 	  * Sid (works at least at the moment of writing :-)
 
 	Ubuntu:
@@ -43,22 +41,18 @@ xen-tools
 	  * Interpid Ibex 8.10
 	  * Jaunty Jackaplope 9.04
 	  * Karmic Koala 9.10
-	  * Lucid Lynx 10.04 (see [2])
+	  * Lucid Lynx 10.04
 	  * Maverick Meerkat 10.10 (works at least at the moment of writing :-)
+	  * Natty Narwhal 11.04 (preliminary support as it's not yet available)
 
   [1] There is an issue with debootstrap on hardy not installing ksyslogd
       This can be fixed by chrooting into the newly installed system
       and removing the startup scripts. See:
       http://www.linux-vserver.org/Installing_Ubuntu_8.04_Hardy_as_guest
 
-  [2] As of writing this 24.04.10, there is an issue with tar on
+  Xen-Tools are available prepackaged in Debian and as source tar-ball
-      Lucid with kernels < 2.6.22 this should however be patched right
+ for local installation. Installing from source should work flawlessly
-      after release. See:
+ on most Linux systems that meet the installation requirements.
-      https://bugs.launchpad.net/ubuntu/+source/tar/+bug/539814
-
-  Older versions of ubuntu may work, however you will have to have to find
- a mirror that still hosts them. Currently the oldest Ubuntu Distribution
- on Canonical's archive.ubuntu.com is Hardy Heron.
 
 Requirements
 ------------
@@ -74,24 +68,31 @@ Requirements
         * Make, if you are not installing through a package manager
 
   You can try to install RPM-based distributions such as CentOS, or
- Fedora Core you will need a correctly installed and configured
+ Fedora Core, but you will need a correctly installed and configured
  "rinse" package. This is currently not supported.
 
   If you wish to create new Xen instances which may be controlled by
- users via a login shell you should also install the xen-shell package
+ users via a login shell you can have a look at the (currently
- which is available from:
+ unmaintained) xen-shell package which is available from:
 
           http://xen-tools.org/software/xen-shell/
 
 
+Installation
+------------
+
+As root or with sudo, execute "make install".
+
+See debian/README.source how to build the Debian package from a
+checked out copy of the git repository (i.e. without a source tar
+ball).
+
 
 The Scripts
 -----------
 
-  There now follows a brief description of each included script,
+  Here is a brief description of each included script, for more
- for more thorough documentation please consult the appropriate
+ thorough documentation please consult the appropriate man page.
- manpage.
-
 
 
 xen-create-image
@@ -100,10 +101,6 @@ xen-create-image
   This script is designed to create new images which may be used
  with the Xen hypervisor.
 
-  The virtual images will have their networking settings created and,
- you may optionally cause the new instance to boot once it has
- been created.
-
   This script performs the initial setup, then delegates the real
  work to a collection of helper scripts:
 
@@ -118,6 +115,11 @@ xen-create-image
       Create a configuration file in /etc/xen such that Xen can
       boot the newly created machine.
 
+    * xt-guess-suite-and-mirror
+      In case of a Debian or Ubuntu Dom0, this script tries to guess
+      the most suitable suite and mirror for DomUs based on the Dom0's
+      /etc/apt/sources.list.
+
 
 xen-create-nfs
 --------------
@@ -159,6 +161,5 @@ xen-update-image
     a Debian-derived distribution.
 
 
-Steve
+-- 
---
+The Xen-Tools Developer Team
-

TODO

@@ -3,8 +3,8 @@ TODO
 
 See KNOWN_BUGS for real bugs.
 
-Minor bugs to fix and features to add before a 4.2 release
+Bugs to fix and features to add for 5.0
-----------------------------------------------------------
+---------------------------------------
 
 * xen-create-image man page overhaul:
 
@@ -22,8 +22,11 @@ Minor bugs to fix and features to add before a 4.2 release
    Currently no locales are set and this causes several domU errors
    which appear in the domU's logs.
 
-Maybe for a 4.3 or 5.0 release
+* Documentation overhaul
-------------------------------
+
+   Better explain what roles /should be/ used for, and that roles
+   are examples, and shouldn't cover every single scenario. They
+   are also easy to write.
 
 * xen-create-image --dist=... / sources.list generation should be more fine-grained
 
@@ -118,12 +121,28 @@ Maybe for a 4.3 or 5.0 release
    Like e.g. readConfigurationFile in xen-create-image and
    xen-resize-image which are not completely identical.
 
+* Refactor the code for less variants of calling cp, rm, mv, etc.
+
+   E.g. always use either cp() from File::Copy or /bin/cp, but not
+   both. To allow verbose copying, I (Axel) would prefer /bin/cp over
+   cp();
+
 * Parse numerical parameters transparently for the user
 
    The user shouldn't have to know weather he should specify size
    as <size>G or <size>Gb or <size>. This should be parsed without
    user interaction and rely on a common format.
 
+* xen-update-image should mount /dev/pts before running apt-get
+
+* xen-update-image should have options for using ...
+
+   ... aptitude instead of apt-get
+
+   ... dist-upgrade instead of upgrade
+
+* Use Perl::Critic
+
 Stuff from Steve's TODO list / Generic TODOs
 --------------------------------------------
 

bin/xen-create-image

@@ -45,6 +45,8 @@ xen-create-image - Easily create new Xen instances with networking and OpenSSH.
                 Read the specified file in addition to the global
                 configuration file.
 
+   --copyhosts  Copy entries from the dom0's /etc/hosts file to the guest
+
    --copy-cmd   NOP:  Ignored.
 
    --debootstrap-cmd=/path/to/command
@@ -52,14 +54,36 @@ xen-create-image - Easily create new Xen instances with networking and OpenSSH.
                 debootstrap if both, debootstrap and cdebootstrap are
                 installed. Specifying the path is optional.
 
+   --disk_device=diskname
+                Use specified device name for virtual devices instead of
+                the default value "xvda".
+
+   --extension=ext
+                Specify the suffix to give the Xen configuration
+                file. (Default value: ".cfg")
+
    --force      Force overwriting existing images. This will remove
                 existing images or LVM volumes which match those which
                 are liable to be used by the new invocation.
 
    --fs=fs      Specify the filesystem type to use for the new guest.
                 Valid choices are 'ext2', 'ext3', 'ext4', 'reiserfs',
-                'xfs' or 'btrfs'.
+                'xfs' or 'btrfs'. (Note: pygrub *DOES NOT* support xfs)
 
+   --genpass=1  Generate a random root password (default, set to 0 to turn off)
+
+   --genpass_len=N
+                Override the default password length of 8 and generate a
+                random password of length N. Note: this only works in
+                conjunction with --genpass
+
+   --hash_method=algorithm
+                Override the default hashing method of sha256 and use the
+                provided algorithm. Can be : md5, sha256 or sha512
+
+   --hooks=1    Specify whether to run hooks after the image is created.
+
+   --ide        Use IDE names for virtual devices (i.e. hda not xvda)
 
    --image=str  Specify whether to create "sparse" or "full" disk images.
                 Full images are mandatory when using LVM, so this setting
@@ -72,6 +96,8 @@ xen-create-image - Easily create new Xen instances with networking and OpenSSH.
                 Specify the initial ramdisk. If an image is specified it
                 must exist.
 
+   --install=1  Specify whether to install the guest system or not.
+
    --keep       Don't delete our images if installation fails.
 
    --kernel=/path/to/kernel
@@ -85,16 +111,15 @@ xen-create-image - Easily create new Xen instances with networking and OpenSSH.
                 Set the path to the kernel modules to use for domU.
                 If modules are specified they must exist.
 
+   --nohosts    Don't touch /etc/hosts on the dom0.
+
+   --noswap     Do not create a swap partition. When this option is
+                used the system will not have a swap entry added to
+                its /etc/fstab file either.
+
    --output=dir Specify the output directory to create the xen configuration
                 file within.
 
-   --install=1  Specify whether to install the guest system or not.
-
-   --hooks=1    Specify whether to run hooks after the image is created.
-
-   --nohosts    Don't touch /etc/hosts on the dom0.
-
-   --copyhosts  Copy entries from the dom0's /etc/hosts file to the guest
 
    --partitions=file
                 Use a specific partition layout configuration file.
@@ -104,23 +129,14 @@ xen-create-image - Easily create new Xen instances with networking and OpenSSH.
                 fs, size, swap and noswap are ignored when using this
                 option.
 
-   --genpass=1  Generate a random root password (default, set to 0 to turn off)
-
-   --genpass_len=N
-                Override the default password length of 8 and generate a
-                random password of length N. Note: this only works in
-                conjunction with --genpass
-
    --password=passphrase
                 Set the root password for the new guest.
 
-   --hash_method=algorithm
-                Override the default hashing method of sha256 and use the
-                provided algorithm. Can be : md5, sha256 or sha512
-
    --passwd     Ask for a root password interactively during setup.
                 NOTE:  This overrides --genpass --password
 
+   --pygrub     DomU should be booted using pygrub.
+
    --role=role  Run the specified role script(s) post-install.
                 Role scripts are discussed later in this manpage.
                 Can be an absolute path. Otherwise it's relative to the
@@ -134,36 +150,20 @@ xen-create-image - Easily create new Xen instances with networking and OpenSSH.
                 Specify the directory which contains the role scripts.
                 This defaults to /etc/xen-tools/role.d/
 
+   --scsi       Use SCSI names for virtual devices (i.e. sda not xvda)
+
+   --serial_device=serialname
+                Install a getty on the specified serial device instead
+                of the default device.
+
    --size=size  Set the size of the primary disk image.
 
-   --tar-cmd    NOP: Ignored.
-
-   --extension=ext
-                Specify the suffix to give the Xen configuration
-                file. (Default value: ".cfg")
-
    --swap=size  Set the size of the swap partition.
 
    --swap-dev=/path/to/device
                 Specify a physical/logical volume for swap usage.
 
-   --noswap     Do not create a swap partition. When this option is
+   --tar-cmd    NOP: Ignored.
-                used the system will not have a swap entry added to
-                its /etc/fstab file either.
-
-   --pygrub     DomU should be booted using pygrub.
-
-   --ide        Use IDE names for virtual devices (i.e. hda not xvda)
-
-   --scsi       Use SCSI names for virtual devices (i.e. sda not xvda)
-
-   --disk_device=diskname
-                Use specified device name for virtual devices instead of
-                the default value "xvda".
-
-   --serial_device=serialname
-                Install a getty on the specified serial device instead
-                of the default device.
 
    --vcpus=num
                 Set the number of vcpus that the new instance will have
@@ -212,6 +212,14 @@ xen-create-image - Easily create new Xen instances with networking and OpenSSH.
 
   Networking options:
 
+   --bridge=brname
+                Optionally, set a specific bridge for the new instance.
+                This can be especially useful when running multiple
+                bridges on a dom0.
+
+   --broadcast=123.456.789.ABC
+                Setup the broadcast address for the new instance.
+
    --dhcp       The guest will be configured to fetch its networking
                 details via DHCP.
 
@@ -236,20 +244,12 @@ xen-create-image - Easily create new Xen instances with networking and OpenSSH.
    --netmask=123.456.789.ABC
                 Setup the netmask for the new instance.
 
-   --broadcast=123.456.789.ABC
-                Setup the broadcast address for the new instance.
-
    --nameserver="123.456.789.ABC 123.456.789.DEF"
                 Setup the nameserver of the machine, multiple space
                 separated nameservers are allowed.
                 If not provided, Dom0's /etc/resolv.conf will be copied
                 to guest.
 
-   --bridge=brname
-                Optionally, set a specific bridge for the new instance.
-                This can be especially useful when running multiple
-                bridges on a machine.
-
    --vifname=vifname
                 Optionally, set a specific vif name for the new instance.
 
@@ -262,10 +262,6 @@ xen-create-image - Easily create new Xen instances with networking and OpenSSH.
                 If you do not wish to use loopback images specify --lvm
                 or --evms.  (These three options are mutually exclusive.)
 
-   --lvm=vg     Specify the volume group to save images within.
-                If you do not wish to use LVM specify --dir or --evms.
-                (These three options are mutually exclusive.)
-
    --evms=lvm2/container
                 Specify the container to save images within, i.e. '--evms
                 lvm2/mycontainer'.  If you do not wish to use EVMS specify
@@ -277,6 +273,10 @@ xen-create-image - Easily create new Xen instances with networking and OpenSSH.
                 scripts will expect to be able to parse a domain name
                 out of it for various purposes.
 
+   --lvm=vg     Specify the volume group to save images within.
+                If you do not wish to use LVM specify --dir or --evms.
+                (These three options are mutually exclusive.)
+
 =cut
 
 
@@ -322,6 +322,9 @@ Create a Xen configuration file in so that xm can start the new domain.
  than being restricted to just the two standard volumes.  For more
  details on this please see the later section in this manual "PARTITIONING".
 
+  If you wish to install additional packages or do any additional
+ configuration of your new guests, please read the section on "ROLES".
+
 =cut
 
 =head1 CONFIGURATION
@@ -639,7 +642,7 @@ Create a Xen configuration file in so that xm can start the new domain.
 =head1 ROLES
 
   Currently there are some roles scripts included which work for
- the Debian and Ubuntu distrubtions only.   They are included
+ the Debian and Ubuntu distrubtions only. They are included
  primarily as examples of the kind of things you could accomplish.
 
   The supplied scripts are:
@@ -731,17 +734,19 @@ Install an X11 server, using VNC and XDM
 =for example cut
 
 
-=head1 AUTHOR
+=head1 AUTHORS
 
- Steve
+ Steve Kemp, http://www.steve.org.uk/
- --
+ Axel Beckert, http://noone.org/abe/
- http://www.steve.org.uk/
+ Dmitry Nedospasov, http://nedos.net/
+ Stéphane Jourdois
 
 =cut
 
 =head1 LICENSE
 
-Copyright (c) 2005-2009 by Steve Kemp.  All rights reserved.
+Copyright (c) 2005-2009 by Steve Kemp, (c) 2010 by The Xen-Tools
+Development Team. All rights reserved.
 
 This module is free software;
 you can redistribute it and/or modify it under
@@ -801,7 +806,7 @@ my $FAIL = 0;
 #
 # Release number.
 #
-my $RELEASE = '4.2rc1';
+my $RELEASE = '4.2';
 
 
 #
@@ -1346,17 +1351,17 @@ sub setupDefaultOptions
     $CONFIG{ 'mirror' }        = '';
 
     # Initialize per distribution mirror defaults: Debian
-    foreach my $debdist (qw(etch lenny squeeze sid testing stable unstable)) {
+    foreach my $debdist (qw(lenny squeeze wheezy sid testing stable unstable)) {
         $CONFIG{ 'mirror_'.$debdist } = $CONFIG{ 'mirror' }
     }
-    foreach my $debdist (qw(sarge)) {
+    foreach my $debdist (qw(sarge etch)) {
         $CONFIG{ 'mirror_'.$debdist } = 'http://archive.debian.org/debian';
     }
     # Initialize per distribution mirror defaults: Ubuntu
-    foreach my $ubuntudist (qw(dapper hardy intrepid jaunty karmic lucid maverick)) {
+    foreach my $ubuntudist (qw(dapper hardy jaunty karmic lucid maverick natty)) {
         $CONFIG{ 'mirror_'.$ubuntudist } = 'http://archive.ubuntu.com/ubuntu';
     }
-    foreach my $ubuntudist (qw(edgy feisty gutsy)) {
+    foreach my $ubuntudist (qw(edgy feisty gutsy intrepid)) {
         $CONFIG{ 'mirror_'.$ubuntudist } = 'http://old-releases.ubuntu.com/ubuntu';
     }
     $CONFIG{ 'arch' }          = '';
@@ -1544,8 +1549,8 @@ sub checkOption
             message => "must be an existing directory.\n",
         },
         serialDev => {
-            check   => qr/^(?:\/dev\/)?(?:tty|hvc)[0-9]+$/,
+            check   => qr/^(?:\/dev\/)?(?:tty|[xh]vc)[0-9]+$/,
-            message => "must be a serial device (tty*, hvc*).\n",
+            message => "must be a serial device (tty*, hvc* or xvc*).\n",
         },
         diskDev => {
             check   => qr/^(?:\/dev\/)?(?:tty|hvc)[0-9]+$/,
@@ -1902,9 +1907,9 @@ sub checkArguments
     }
 
     #
-    #  Lucid doesn't work without pygrub
+    #  Lucid and probably all later Ubuntus, too, don't work without pygrub
     #
-    if ( $CONFIG{ 'dist' } =~ /lucid|maverick/ )
+    if ( $CONFIG{ 'dist' } =~ /lucid|maverick|natty/ )
     {
         $CONFIG{ 'pygrub' } = 1;
     }
@@ -2106,11 +2111,21 @@ EOF
         exit 127;
     }
 
-    if ( $CONFIG{ 'image-dev' } && $CONFIG{ 'partitions' } )
+    if ( $CONFIG{ 'image-dev' } )
     {
-        logprint("Please choose either image-dev or partitions, not both!\n");
+        if ( $CONFIG{ 'partitions' } )
-        $FAIL = 1;
+        {
-        exit 127;
+            logprint("Please choose either image-dev or partitions, not both!\n");
+            $FAIL = 1;
+            exit 127;
+        }
+
+        if ( !$CONFIG{ 'swap-dev' } && !$CONFIG{ 'noswap' } )
+        {
+            logprint("Please choose swap-dev or noswap with image-dev!\n");
+            $FAIL = 1;
+            exit 127;
+        }
     }
 
 

bin/xen-create-nfs

@@ -19,9 +19,9 @@ xen-create-nfs - Create a Xen configuration file for an NFS-root guest.
    --dhcp       Configure the guest to use DHCP for IP allocation.
    --gateway    The gateway address to use when configured with a static IP.
    --hostname   The hostname to configure for the guest.
+   --ip         The IP address to use when configured with a static IP.
    --netmask    The netmask to use when configured with a static IP.
    --nameserver The nameserver to use when configured with a static IP.
-   --ip         The IP address to use when configured with a static IP.
 
   General options:
    --admins     Specify which users should be setup as xen-shell admins.
@@ -84,18 +84,18 @@ Show the version number and exit.
 =cut
 
 
-=head1 AUTHOR
+=head1 AUTHORS
 
- Steve
+ Steve Kemp, http://www.steve.org.uk/
- --
+ Stéphane Jourdois
- http://www.steve.org.uk/
 
 =cut
 
 
 =head1 LICENSE
 
-Copyright (c) 2005-2009 by Steve Kemp.  All rights reserved.
+Copyright (c) 2005-2009 by Steve Kemp, (c) 2010 by The Xen-Tools
+Development Team. All rights reserved.
 
 This module is free software;
 you can redistribute it and/or modify it under
@@ -131,7 +131,7 @@ $CONFIG{ 'template' } = '/etc/xen-tools/xm-nfs.tmpl';
 #
 # Release number.
 #
-my $RELEASE = '4.2rc1';
+my $RELEASE = '4.2';
 
 
 # store version number away.

bin/xen-delete-image

@@ -16,8 +16,8 @@ xen-delete-image - Delete previously created Xen instances.
 
   General options:
    --dir      Specify the output directory where images were previously saved.
-   --lvm      Specify the LVM volume to use.
    --evms     Specify the EVMS container to use.
+   --lvm      Specify the LVM volume to use.
 
   Specifying hosts:
    --hostname Specify the image name to delete.
@@ -130,18 +130,19 @@ Show the version number and exit.
 =cut
 
 
-=head1 AUTHOR
+=head1 AUTHORS
 
- Steve
+ Steve Kemp, http://www.steve.org.uk/
- --
+ Axel Beckert, http://noone.org/abe/
- http://www.steve.org.uk/
+ Stéphane Jourdois
 
 =cut
 
 
 =head1 LICENSE
 
-Copyright (c) 2005-2009 by Steve Kemp.  All rights reserved.
+Copyright (c) 2005-2009 by Steve Kemp, (c) 2010 by The Xen-Tools
+Development Team. All rights reserved.
 
 This module is free software;
 you can redistribute it and/or modify it under
@@ -170,7 +171,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.2rc1';
+my $RELEASE = '4.2';
 
 
 

bin/xen-list-images

@@ -58,18 +58,17 @@ Show the version number and exit.
 =cut
 
 
-=head1 AUTHOR
+=head1 AUTHORS
 
- Steve
+ Steve Kemp, http://www.steve.org.uk/
- --
+ Stéphane Jourdois
- http://www.steve.org.uk/
 
 =cut
 
-
 =head1 LICENSE
 
-Copyright (c) 2005-2009 by Steve Kemp.  All rights reserved.
+Copyright (c) 2005-2009 by Steve Kemp, (c) 2010 by The Xen-Tools
+Development Team. All rights reserved.
 
 This module is free software;
 you can redistribute it and/or modify it under
@@ -102,7 +101,7 @@ $CONFIG{ 'prefix' } = "/etc/xen";
 #
 # Release number.
 #
-my $RELEASE = '4.2rc1';
+my $RELEASE = '4.2';
 
 
 

bin/xen-resize-guest

@@ -76,18 +76,18 @@ Show the version number and exit.
 
 =cut
 
-=head1 AUTHOR
+=head1 AUTHORS
 
- Steve
+ Steve Kemp, http://www.steve.org.uk/
- --
+ Axel Beckert, http://noone.org/abe/
- http://www.steve.org.uk/
 
 =cut
 
 
 =head1 LICENSE
 
-Copyright (c) 2005-2009 by Steve Kemp.  All rights reserved.
+Copyright (c) 2005-2009 by Steve Kemp, (c) 2010 by The Xen-Tools
+Development Team. All rights reserved.
 
 This module is free software;
 you can redistribute it and/or modify it under
@@ -116,7 +116,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.2rc1';
+my $RELEASE = '4.2';
 
 
 

bin/xen-update-image

@@ -80,19 +80,18 @@ Show the version number and exit.
 =cut
 
 
-=head1 AUTHOR
+=head1 AUTHORS
 
-
+ Steve Kemp, http://www.steve.org.uk/
- Steve
+ Axel Beckert, http://noone.org/abe/
- --
+ Stéphane Jourdois
- http://www.steve.org.uk/
 
 =cut
 
-
 =head1 LICENSE
 
-Copyright (c) 2005-2009 by Steve Kemp.  All rights reserved.
+Copyright (c) 2005-2009 by Steve Kemp, (c) 2010 by The Xen-Tools
+Development Team. All rights reserved.
 
 This module is free software;
 you can redistribute it and/or modify it under
@@ -121,7 +120,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.2rc1';
+my $RELEASE = '4.2';
 
 
 #

bin/xt-create-xen-config

@@ -104,19 +104,18 @@ xt-create-config - Create a Xen configuration file for a new guest
 
 =cut
 
+=head1 AUTHORS
 
-=head1 AUTHOR
+ Steve Kemp, http://www.steve.org.uk/
-
+ Axel Beckert, http://noone.org/abe/
- Steve
+ Stéphane Jourdois
- --
- http://www.steve.org.uk/
 
 =cut
 
-
 =head1 LICENSE
 
-Copyright (c) 2005-2009 by Steve Kemp.  All rights reserved.
+Copyright (c) 2005-2009 by Steve Kemp, (c) 2010 by The Xen-Tools
+Development Team. All rights reserved.
 
 This module is free software;
 you can redistribute it and/or modify it under
@@ -157,7 +156,7 @@ $CONFIG{ 'extension' } = '.cfg';
 #
 # Release number.
 #
-my $RELEASE = '4.2rc1';
+my $RELEASE = '4.2';
 
 
 

bin/xt-customize-image

@@ -60,18 +60,19 @@ xt-customize-image - Customize a freshly installed copy of GNU/Linux
 =cut
 
 
-=head1 AUTHOR
+=head1 AUTHORS
 
- Steve
+ Steve Kemp, http://www.steve.org.uk/
- --
+ Axel Beckert, http://noone.org/abe/
- http://www.steve.org.uk/
+ Stéphane Jourdois
 
 =cut
 
 
 =head1 LICENSE
 
-Copyright (c) 2005-2009 by Steve Kemp.  All rights reserved.
+Copyright (c) 2005-2009 by Steve Kemp, (c) 2010 by The Xen-Tools
+Development Team. All rights reserved.
 
 This module is free software;
 you can redistribute it and/or modify it under
@@ -97,7 +98,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.2rc1';
+my $RELEASE = '4.2';
 
 
 

bin/xt-guess-suite-and-mirror

@@ -30,15 +30,17 @@ xen-create-image(1) or the backticks feature in xen-tools.conf.
 
 =cut
 
-=head1 AUTHOR
+=head1 AUTHORS
 
- Axel Beckert <abe@deuxchevaux.org>, http://noone.org/abe/
+ Axel Beckert, http://noone.org/abe/
+ Stéphane Jourdois
 
 =cut
 
 =head1 LICENSE
 
-Copyright (C) 2010 by Steve Kemp.  All rights reserved.
+Copyright (C) 2010 by The Xen-Tools Development Team. All rights
+reserved.
 
 This module is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself. The LICENSE file contains the
@@ -78,7 +80,7 @@ use strict;
 #
 # Release number.
 #
-my $RELEASE = '4.2rc1';
+my $RELEASE = '4.2';
 
 # Init
 my $mirror = '';

bin/xt-install-image

@@ -80,18 +80,19 @@ Untar a .tar file into the new installation location.  This tarfile is assumed t
 =cut
 
 
-=head1 AUTHOR
+=head1 AUTHORS
 
- Steve
+ Steve Kemp, http://www.steve.org.uk/
- --
+ Axel Beckert, http://noone.org/abe/
- http://www.steve.org.uk/
+ Dmitry Nedospasov, http://nedos.net/
+ Stéphane Jourdois
 
 =cut
 
-
 =head1 LICENSE
 
-Copyright (c) 2005-2009 by Steve Kemp.  All rights reserved.
+Copyright (c) 2005-2009 by Steve Kemp, (c) 2010 by The Xen-Tools
+Development Team. All rights reserved.
 
 This module is free software;
 you can redistribute it and/or modify it under
@@ -116,7 +117,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.2rc1';
+my $RELEASE = '4.2';
 
 
 #

debian/README.source

@@ -9,6 +9,7 @@ $ cd xen-tools
 
 If you just want to build the binary package, run
 
+$ make changelog
 $ dpkg-buildpackage -uc -us -b
 
 If you want to build source and binary packages, e.g. for an upload to
@@ -18,4 +19,4 @@ $ make orig-tar-gz
 $ dpkg-buildpackage
 
 
- -- Axel Beckert <abe@debian.org>, Mon, 17 May 2010 13:31:31 +0200
+ -- Axel Beckert <abe@debian.org>, Mon, 13 Sep 2010 14:30:05 +0200

debian/changelog

@@ -1,3 +1,26 @@
+xen-tools (4.2-1) unstable; urgency=low
+
+  * New upstream release
+    - Fixes several cases of broken or incomplete config files with
+      unexpected or seldom parameter combinations. (Closes: #484652)
+    - Updates examples in /etc/xen-tools.conf to better reflect current
+      state
+    - Allows usage of xvc* as serial console as used as default by older
+      Xen versions.
+    - Preliminary support for Ubuntu 11.04 (Natty) and Debian 7.0 (Wheezy)
+      (Closes: #597521)
+    - Switches default mirror for EoL'ed Ubuntu 8.10 (Intrepid) and Debian
+      4.0 (Etch) to the distributions' archives for old releases.
+  * Does no more try extract the upstream changelog during debian package
+    build. The commit which introduced this problem has been reverted.
+    Document more clearly in debian/README.source how to build the package
+    from a checked out copy of the git repository, especially that the
+    upstream changelog has to be generated first out of the VCS log.
+    (Closes: #595883)
+  * Update debian/copyright: Add Stéphane Jourdois to list of authors.
+
+ -- Axel Beckert <abe@debian.org>  Tue, 05 Oct 2010 19:01:49 +0200
+
 xen-tools (4.2~rc1-1) unstable; urgency=low
 
   [Axel Beckert]

debian/copyright

@@ -4,8 +4,10 @@ Tue, 20 Dec 2005 02:21:05 +0200.
 It was downloaded from http://xen-tools.org/software/xen-tools/
 
 Copyright 2005-2009: Steve Kemp <steve@steve.org.uk>
-Copyright 2010: Axel Beckert <abe@deuxchevaux.org>
+Copyright 2010: The Xen-Tools Development Team, currently consisting of:
-Copyright 2010: Dmitry Nedospasov <dmitry@nedos.net>
+		Axel Beckert <abe@deuxchevaux.org>,
+		Dmitry Nedospasov <dmitry@nedos.net>, and
+		Stéphane Jourdois <sjourdois@gmail.com>
 
 License:
 

debian/rules

@@ -28,7 +28,6 @@ install: build
 	dh_prep
 
 	make manpages
-	make changelog
 	make install prefix=`pwd`/debian/xen-tools
 
 	dh_installdirs

etc/xen-tools.conf

@@ -134,20 +134,9 @@ dist   = `xt-guess-suite-and-mirror --suite` # Default distribution to install.
 image  = sparse   # Specify sparse vs. full disk images.
 
 #
-#  Currently supported and tested distributions include:
+#  See the README for currently supported and tested distributions. You can
-#
+# either find it in the root directory of the unpacked source or, on Debian
-# via Debootstrap:
+# and Ubuntu based systems, in /usr/share/doc/xen-tools/README.gz
-#
-#  Debian:
-#   sid, sarge, etch, lenny.
-#
-#  Ubuntu:
-#   edgy, feisty, dapper.
-#
-# via Rinse:
-#   centos-4, centos-5.
-#   fedora-core-4, fedora-core-5, fedora-core-6, fedora-core-7
-#
 #
 
 
@@ -273,18 +262,21 @@ mirror = `xt-guess-suite-and-mirror --mirror`
 # http://wiki.debian.org/DebianGeoMirror):
 #
 # mirror_sarge = http://archive.debian.org/debian
+# mirror_etch = http://archive.debian.org/debian
 # mirror_lenny = http://cdn.debian.net/debian
 # mirror_squeeze = http://cdn.debian.net/debian
+# mirror_wheezy = http://cdn.debian.net/debian
 # mirror_sid = http://cdn.debian.net/debian
 # mirror_dapper = http://archive.ubuntu.com/ubuntu
 # mirror_edgy = http://old-releases.ubuntu.com/ubuntu
 # mirror_feisty = http://old-releases.ubuntu.com/ubuntu
 # mirror_gutsy = http://old-releases.ubuntu.com/ubuntu
 # mirror_hardy = http://archive.ubuntu.com/ubuntu
-# mirror_intrepid = http://archive.ubuntu.com/ubuntu
+# mirror_intrepid = http://old-releases.ubuntu.com/ubuntu
 # mirror_karmic = http://archive.ubuntu.com/ubuntu
 # mirror_lucid = http://archive.ubuntu.com/ubuntu
 # mirror_maverick = http://archive.ubuntu.com/ubuntu
+# mirror_natty = http://archive.ubuntu.com/ubuntu
 
 
 #

etc/xm.tmpl

@@ -63,32 +63,20 @@ memory      = '{$memory}'
 #  Physical volumes
 #
 {
-    if ( ( $swap_vbd ) && ( $image_vbd ) )
-    {
-    $OUT .= "root  = '/dev/$device" . "2 ro'\n";
-
-    $OUT .= "disk  = [ ";
-
     if ( $image_vbd )
     {
-         $OUT .= "'$image_vbd," . $device . "2,w'";
+        $OUT .= "root        = '/dev/$device" . "2 ro'\n";
+        $OUT .= "disk        = [\n";
+        $OUT .= "                  '$image_vbd," . $device . "2,w',\n";
 
-    }
+        if ( $swap_vbd )
-
+        {
-    if ( $swap_vbd )
+            $OUT .= "                  '$swap_vbd," . $device . "1,w',\n";
-    {
+        }
-         if ( $image_vbd )
+        $OUT .= "              ]\n";
-         {
-            $OUT .= ",";
-         }
-
-         $OUT .= "'$swap_vbd," . $device . "1,w'";
-    }
-    $OUT .= " ]\n";
     }
 }
 
-
 #
 #  Hostname
 #