Declare this as 4.4 RC1

(which is fine)

KNOWN_BUGS.markdown

@@ -32,12 +32,3 @@ Bugs to fix rather soon
   Current (unreleased) fix is to sort by mountpoint length.
 
   Fix would be to reproduce what mount does with mount `-a`.
-
-
-Bugs to fix later
------------------
-
-`t/xen-tools.t` can't really test Xen::Tools as the latter requires a
-local Xen installation. For proper testing, a dummy set of Xen
-configuration files and configurable paths to them in `Xen::Tools`
-would be necessary.

Makefile

@@ -14,7 +14,7 @@
 #
 TMP        ?= /tmp
 DIST_PREFIX = ${TMP}
-VERSION     = 4.4~dev
+VERSION     = 4.4rc1
 DEBVERSION  = $(shell echo $(VERSION)|sed 's/\(rc\|pre\|beta\|alpha\)/~\1/')
 BASE        = xen-tools
 VCS         = git
@@ -201,6 +201,8 @@ install-hooks:
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d precise.d
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d quantal.d
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d raring.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d saucy.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d trusty.d
 	cp hooks/common.sh ${prefix}/usr/share/xen-tools
 	cp -r hooks/common ${prefix}/usr/share/xen-tools
 
@@ -210,7 +212,6 @@ install-hooks:
 #
 install-libraries:
 	-mkdir -p ${prefix}/usr/share/perl5/Xen/Tools
-	cp ./lib/Xen/*.pm ${prefix}/usr/share/perl5/Xen
 	cp ./lib/Xen/Tools/*.pm ${prefix}/usr/share/perl5/Xen/Tools
 
 #

README.markdown

@@ -32,9 +32,9 @@ known to work reliably, i.e.:
 * Etch 4.0 (Dom0 no more tested)
 * Lenny 5.0
 * Squeeze 6.0
-* Wheezy 7.0
-* Jessie 8.0 (preliminary support as it's not yet available)
-* Sid (works at least at the moment of writing :-)
+* Wheezy 7
+* Jessie 8 (under developement)
+* Sid (always under developement; works at least at the moment of writing :-)
 
 ### Ubuntu
 
@@ -54,7 +54,8 @@ known to work reliably, i.e.:
 * Oneiric Ocelot 11.10
 * Precise Pangolin 12.04
 * Quantal Quetzal 12.10
-* Raring Ringtail 13.04 (preliminary support as it's not yet available)
+* Raring Ringtail 13.04
+* Saucy Salamander 13.10 (under developement)
 
 [1]: http://bugs.debian.org/659360
     "debootstrap in Wheezy can no more build Ubuntu Edgy or earlier"
@@ -83,11 +84,22 @@ Requirements
 To use these tools you'll need the following software:
 
 * [debootstrap](http://packages.debian.org/debootstrap)
-* Perl
-  * The Perl module [Text::Template](http://search.cpan.org/dist/Text-Template/)
-	([Debian Package libtext-template-perl](http://packages.debian.org/libtext-template-perl))
-  * The Perl module [Config::IniFiles](http://search.cpan.org/dist/Config-IniFiles/)
+* Perl and the following Perl modules
+  * [Config::IniFiles](http://metacpan.org/release/Config-IniFiles)
 	([Debian Package libconfig-inifiles-perl](http://packages.debian.org/libconfig-inifiles-perl))
+  * [Text::Template](http://metacpan.org/release/Text-Template)
+	([Debian Package libtext-template-perl](http://packages.debian.org/libtext-template-perl))
+  * [Data::Validate::Domain](http://metacpan.org/release/Data-Validate-Domain)
+	([Debian Package libdata-validate-domain-perl](http://packages.debian.org/libdata-validate-domain-perl))
+  * [Data::Validate::IP](http://metacpan.org/release/Data-Validate-IP)
+	([Debian Package libdata-validate-ip-perl](http://packages.debian.org/libdata-validate-ip-perl))
+  * [Data::Validate::URI](http://metacpan.org/release/Data-Validate-URI)
+	([Debian Package libdata-validate-uri-perl](http://packages.debian.org/libdata-validate-uri-perl))
+  * [File::Slurp](http://metacpan.org/release/File-Slurp)
+	([Debian Package libfile-slurp-perl](http://packages.debian.org/libfile-slurp-perl))
+  * [File::Which](http://metacpan.org/release/File-Which)
+	([Debian Package libfile-which-perl](http://packages.debian.org/libfile-which-perl))
+  * and some more modules which are part of the Perl core and hence do not need to be installed separately.
 * Make, if you are not installing through a package manager
 
 You can try to install RPM-based distributions such as CentOS, or

TODO.markdown

@@ -73,12 +73,6 @@ Bugs to fix and features to add for 5.0
 
 * LVM snapshot support as an install source.
 
-* Clean up mounts on `Ctrl-C`, causes error while installing otherwise:
-
-    Removing /dev/vg0/acromantula-domu1-disk - since we're forcing the
-    install Can't remove open logical volume "acromantula-domu1-disk"
-    this should be a matter of unmounting the mounted volume from /tmp.
-
 * Generic grub support
 
   This will generate a much nicer `menu.lst` as a side effect, as its
@@ -128,6 +122,9 @@ Bugs to fix and features to add for 5.0
   `authorized_keys` (e.g. a users public key) or to just add the Dom0's
   `/root/.ssh/authorized_keys` as the DomU's one.
 
+* Generate ECDSA host keys where possible. (Likely depends on the
+  to-be-installed SSH version.)
+
 * More generic roles
 
   Deploy a web server or setup ssmtp directly via flag when setting up
@@ -165,11 +162,6 @@ Bugs to fix and features to add for 5.0
 
 * Make used Xen toolstack configurable, i.e. via --xen-toolstack=xl
 
-* Code Deduplication / Refactor the code for less code duplication
-
-  `bin/x*` currently contain the same or similar code like e.g. in the
-  function readConfigurationFile. This needs to be cleaned up.
-
 * Unify --debug and --dumpconfig. Likely make --debug exit
   gracefully. Document --debug if --dumpconfig is removed.
 
@@ -182,8 +174,6 @@ Bugs to fix and features to add for 5.0
   distributions the same. Currently Debian is a special case and
   Ubuntu half a special case.
 
-* Replace findBinary() with File::Which
-
 * Remove from the (unused) Xen::Tools what's already in the used
   Xen::Tools::Common.
 
@@ -194,6 +184,10 @@ Bugs to fix and features to add for 5.0
     `xen-create-image` first. Which probably both would be a good
     idea.
 
+* Replace several occurences of backticks with runCommand. (Mostly
+  mount commands in `xen-update-image`. The calls to uname or
+  lsb_release should be fine.)
+
 Stuff from Steve's TODO list / Generic TODOs
 --------------------------------------------
 
@@ -238,10 +232,14 @@ Axel's Break-Backwards-Compatibility Wishlist
 
   Maybe add some `--autostart` or such.
 
-* Maybe replace findBinary with File::Which
-
 * MAC addresses should no more depend on the distribution.
 
 * Let the admin switch between MAC addresses based on XenSource's OUI,
   its organisation's own OUI or locally administrated MAC addresses.
   See also http://wiki.xen.org/wiki/Xen_Networking#MAC_addresses
+
+* More radical Code Deduplication
+
+  `bin/x*` currently still contain similar code like e.g. in the
+  function parseCommandLineArguments. This should be cleaned up, too,
+  but may need a bigger redesign.

bin/xen-create-image

@@ -1,15 +1,16 @@
 #!/usr/bin/perl -w
 
+=encoding utf8
+
 =head1 NAME
 
 xen-create-image - Easily create new Xen instances with networking and OpenSSH.
 
-=cut
-
 =head1 SYNOPSIS
 
 xen-create-image --hostname=<hostname> <further options>
 
+
 =head1 EXAMPLES
 
 xen-create-image --hostname=some-domu --dist=wheezy --lvm=vg0
@@ -19,6 +20,7 @@ xen-create-image --hostname=some-domu --dist=precise --dir=/srv/xen
 See below for more specific examples: LOOPBACK EXAMPLES, LVM EXAMPLE
 and EVMS EXAMPLE.
 
+
 =head1 OPTIONS
 
   Help Options:
@@ -132,6 +134,13 @@ and EVMS EXAMPLE.
                 "MB", "G" and "GB" (case does not matter). If there's
                 no unit given, megabytes are assumed.
 
+   --maxmem=size
+                Setup the maximum amount of memory that can be allocated
+                to the new instance. As suffix recognized size units are "M",
+                "MB", "G" and "GB" (case does not matter). If there's
+                no unit given, megabytes are assumed.
+                Required for dynamic memory ballooning.
+
    --modules=/path/to/modules
                 Set the path to the kernel modules to use for domU.
                 If modules are specified they must exist.
@@ -243,9 +252,10 @@ and EVMS EXAMPLE.
                 Debian mirror. See http://http.debian.net/ for
                 details.
 
-   --apt_proxy=url
+   --apt_proxy=protocol://hostname:port/
                 Specify a proxy to be used by debootstrap, and within
-                the guest.
+                the guest. Needs the same syntax as APT's
+                Acquire::http::Proxy. See apt.conf(5).
 
    --template=tmpl
                 Specify which template file to use when creating the
@@ -326,8 +336,6 @@ and EVMS EXAMPLE.
                 If you do not wish to use LVM specify --dir or --evms.
                 (These three options are mutually exclusive.)
 
-=cut
-
 
 =head1 NOTES
 
@@ -350,8 +358,6 @@ Create a Xen configuration file in so that xm/xl can start the new domain.
   The result of invoking these three scripts, and some minor glue between
  them, is a simple means of creating new Xen guest domains.
 
-=cut
-
 
 =head1 DESCRIPTION
 
@@ -374,7 +380,6 @@ Create a Xen configuration file in so that xm/xl can start the new domain.
   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
 
@@ -420,6 +425,7 @@ Create a Xen configuration file in so that xm/xl can start the new domain.
   size       = 2Gb      # Disk image size.
   image      = full     # Allocate the full disk size immediately.
   memory     = 128Mb    # Memory size
+  maxmem     = 512Mb    # Memory size
   swap       = 128Mb    # Swap size
   fs         = ext3     # use EXT3 filesystems
   dist       = stable   # Default distribution to install.
@@ -454,9 +460,6 @@ Create a Xen configuration file in so that xm/xl can start the new domain.
   This makes use of loopback images stored beneath /home/xen and
  will be installed via the debootstrap command.
 
-=cut
-
-
 
 =head1 NETWORKING AUTO-SETUP
 
@@ -492,8 +495,6 @@ Create a Xen configuration file in so that xm/xl can start the new domain.
  and would no longer be available.  If all the IP addresses are taken
  then the system will fail.
 
-=cut
-
 
 =head1 PARTITIONING
 
@@ -508,8 +509,6 @@ Create a Xen configuration file in so that xm/xl can start the new domain.
   Now when you create a new image specify the name of this file with as
  an argument to the --partition option.
 
-=cut
-
 
 =head1 XEN CONFIGURATION FILE
 
@@ -527,8 +526,6 @@ Create a Xen configuration file in so that xm/xl can start the new domain.
   Alternatively you can create multiple configuration files and
  specify the one to use with the --template option.
 
-=cut
-
 
 =head1 LOOPBACK EXAMPLES
 
@@ -564,8 +561,6 @@ Create a Xen configuration file in so that xm/xl can start the new domain.
 
   The '/domains/' subdirectory will be created if necessary.
 
-=cut
-
 
 =head1 LVM EXAMPLE
 
@@ -587,7 +582,6 @@ Create a Xen configuration file in so that xm/xl can start the new domain.
     mkdir -p /mnt/foo
     mount /dev/myvolumegroup/vm01.my.flat-disk /mnt/foo
 
-=cut
 
 =head1 EVMS EXAMPLE
 
@@ -609,8 +603,6 @@ Create a Xen configuration file in so that xm/xl can start the new domain.
     mkdir -p /mnt/foo
     mount /dev/evms/vm01.my.flat-disk /mnt/foo
 
-=cut
-
 
 =head1 INSTALLATION METHODS
 
@@ -626,7 +618,6 @@ Create a Xen configuration file in so that xm/xl can start the new domain.
  arguments, or settings in the configuration file.  Only one installation
  method may be specified at a time; they are mutually-exclusive.
 
-=cut
 
 =head1 INSTALLATION SPEEDUPS
 
@@ -656,8 +647,6 @@ Create a Xen configuration file in so that xm/xl can start the new domain.
           --lvm=myvolumegroup --hostname=vm01.my.flat \
           --install-method=copy --install-source=/path/to/copy/from
 
-=cut
-
 
 =head1 DEBOOTSTRAP CACHING
 
@@ -685,8 +674,6 @@ Create a Xen configuration file in so that xm/xl can start the new domain.
   If you set your cache directory to anything else, simply rm the
  contents of the directory.
 
-=cut
-
 
 =head1 ROLES
 
@@ -763,9 +750,6 @@ Install an X11 server, using VNC and XDM
   NOTE: Multiple role scripts may be invoked if you separate their
  names with commas.
 
-=cut
-
-
 
 =head1 THE SKELETON DIRECTORY
 
@@ -793,7 +777,6 @@ Install an X11 server, using VNC and XDM
  Dmitry Nedospasov, http://nedos.net/
  Stéphane Jourdois
 
-=cut
 
 =head1 LICENSE
 
@@ -820,6 +803,11 @@ use File::Which;
 use Getopt::Long;
 use Pod::Usage;
 use Data::Dumper;
+use Data::Validate::URI qw/ is_uri /;
+use Data::Validate::IP qw/ is_ipv4 /;
+use Data::Validate::Domain qw/ is_hostname /;
+use Term::UI;
+use Term::ReadLine;
 use Xen::Tools::Common;
 
 
@@ -853,7 +841,7 @@ my $MOUNT_POINT = undef;
 #
 # Release number.
 #
-my $RELEASE = '4.4~dev';
+my $RELEASE = '4.4rc1';
 
 
 #
@@ -1171,11 +1159,11 @@ E_O_ERROR
     #  Check that all the binaries have been installed properly
     #
     my @required =
-      qw ( / xt-customize-image xt-install-image xt-create-xen-config / );
+      qw(xt-customize-image xt-install-image xt-create-xen-config);
 
     foreach my $bin (@required)
     {
-        if ( !defined( findBinary($bin) ) )
+        if ( !defined( which($bin) ) )
         {
             logprint( "The script '$bin' was not found.\nAborting\n\n" );
             $CONFIG{'FAIL'} = 1;
@@ -1356,10 +1344,10 @@ sub setupDefaultOptions
         $CONFIG{ 'mirror_'.$debdist } = 'http://http.debian.net/debian-archive/debian';
     }
     # Initialize per distribution mirror defaults: Ubuntu
-    foreach my $ubuntudist (qw(hardy lucid oneiric precise quantal raring)) {
+    foreach my $ubuntudist (qw(lucid precise quantal raring saucy trusty)) {
         $CONFIG{ 'mirror_'.$ubuntudist } = 'http://archive.ubuntu.com/ubuntu';
     }
-    foreach my $ubuntudist (qw(dapper edgy feisty gutsy intrepid jaunty karmic maverick natty)) {
+    foreach my $ubuntudist (qw(dapper edgy feisty gutsy hardy intrepid jaunty karmic maverick natty oneiric)) {
         $CONFIG{ 'mirror_'.$ubuntudist } = 'http://old-releases.ubuntu.com/ubuntu';
     }
     $CONFIG{ 'apt_proxy' }     = '';
@@ -1449,8 +1437,8 @@ sub checkOption
     # Define argument types
     my %types = (
         integerWithSuffix => {
-            check   => qr/^[0-9.]+[GMk]B?$/i,
-            message => "takes a suffixed (mb, MB, G, k, etc.) integer.\n",
+            check   => qr/^[0-9.]+[GM]B?$/i,
+            message => "takes a suffixed (mb, MB, G, etc.) integer.\n",
         },
         distribution => {
             check   => sub { -d "/usr/share/xen-tools/$_[0].d" },
@@ -1478,15 +1466,15 @@ sub checkOption
             message => "must be a disk device (xvd[a-z]+, sd[a-z]+).\n",
         },
         ipv4 => {
-            check   => qr/^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/,
+            check   => sub { is_ipv4($_[0]) },
             message => "must be valid IPv4.\n",
         },
         ipv4_or_auto => {
-            check   => qr/^(?:auto|(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))$/,
+            check   => sub { is_ipv4($_[0]) or $_[0] eq 'auto' },
             message => "must be valid IPv4 or the keyword 'auto'.\n",
         },
         hostname => {
-            check   => qr/^[a-z0-9][a-z0-9.-]{0,254}$/i,
+            check   => sub { is_hostname($_[0]) },
             message => "must be a valid hostname.\n",
         },
         supportedFs => {
@@ -1517,6 +1505,10 @@ sub checkOption
             check   => qr/^md5|sha256|sha512$/i,
             message => "must be md5, sha256 or sha512.\n",
         },
+        uri => {
+            check   => sub { is_uri($_[0]) },
+            message => "must be an URI including the protocol\n",
+        },
     );
 
     # Define what argument each option accepts.
@@ -1527,6 +1519,7 @@ sub checkOption
         swap          => 'integerWithSuffix',
         image         => 'imageType',
         memory        => 'integerWithSuffix',
+        maxmem        => 'integerWithSuffix',
         kernel        => 'existingFile',
         initrd        => 'existingFile',
         modules       => 'existingDir',
@@ -1551,6 +1544,7 @@ sub checkOption
         mac           => 'mac',
         ip            => 'ipv4_or_auto',
         hash_method   => 'hashMethod',
+        apt_proxy     => 'uri',
     );
 
     # If given option does not exists in optionsTypes,
@@ -1624,6 +1618,7 @@ sub parseCommandLineArguments
             "noswap",   \&checkOption,
             "image=s",  \&checkOption,
             "memory=s", \&checkOption,
+            "maxmem=s", \&checkOption,
             "vcpus=i",  \&checkOption,
 
             # Locations
@@ -1845,7 +1840,7 @@ sub checkArguments
     #
     #  Lucid and probably all later Ubuntus, too, don't work without pygrub
     #
-    if ( $CONFIG{ 'dist' } =~ /lucid|maverick|natty|oneiric|precise|quantal|raring/ )
+    if ( $CONFIG{ 'dist' } =~ /lucid|maverick|natty|oneiric|precise|quantal|raring|saucy/ )
     {
         $CONFIG{ 'pygrub' } = 1;
     }
@@ -2293,7 +2288,7 @@ sub checkBinariesPresent
 
     foreach my $file (@required)
     {
-        if ( !defined( findBinary($file) ) )
+        if ( !defined( which($file) ) )
         {
             logprint("The following binary is required to run this tool\n");
             logprint("\t$file\n");
@@ -2309,7 +2304,7 @@ sub checkBinariesPresent
     {
 
         # loopback image
-        if ( !defined( findBinary("dd") ) )
+        if ( !defined( which("dd") ) )
         {
             logprint("The following binary is required to run this tool\n");
             logprint("\tdd\n");
@@ -2330,7 +2325,7 @@ sub checkBinariesPresent
 
         foreach my $file (@evms)
         {
-            if ( !defined( findBinary($file) ) )
+            if ( !defined( which($file) ) )
             {
                 logprint("The following binary is required to run this tool\n");
                 logprint("\t$file\n");
@@ -2350,7 +2345,7 @@ sub checkBinariesPresent
 
         foreach my $file (@lvm)
         {
-            if ( !defined( findBinary($file) ) )
+            if ( !defined( which($file) ) )
             {
                 logprint("The following binary is required to run this tool\n");
                 logprint("\t$file\n");
@@ -2656,6 +2651,11 @@ sub showSummary
     logprint("Image type     :  $CONFIG{'image'}\n");
     logprint("Memory size    :  $CONFIG{'memory'}\n");
 
+    if ( defined( $CONFIG{ 'maxmem' } ) )
+    {
+        logprint("Max mem size   : $CONFIG{'maxmem'}\n");
+    }
+
     if ( defined( $CONFIG{ 'kernel' } ) && length( $CONFIG{ 'kernel' } ) )
     {
         logprint("Kernel path    :  $CONFIG{'kernel'}\n");
@@ -3324,7 +3324,7 @@ sub createFilesystem
     #
     my ($binary, $args) = split(/ /, $command, 2);
 
-    if ( !defined( findBinary($binary) ) )
+    if ( !defined( which($binary) ) )
     {
         logprint(
             "The binary '$binary' required to create the filesystem $fs is missing\n"
@@ -3944,7 +3944,19 @@ sub setupRootPassword
     {
         if ( -x $MOUNT_POINT . "/usr/bin/passwd" )
         {
-            runCommand("chroot $MOUNT_POINT /usr/bin/passwd", \%CONFIG);
+            my $tryagain = 1;
+            my $term = Term::ReadLine->new('Password change failed');
+            while ($tryagain) {
+                my $rc = system("chroot $MOUNT_POINT /usr/bin/passwd");
+                if ($rc >> 8) {
+                    $tryagain = $term->ask_yn(
+                        prompt => 'Do you want to try to change the password again??',
+                        default => 'y',
+                    );
+                } else {
+                    $tryagain=0;
+                }
+            }
         }
         else
         {
@@ -4250,7 +4262,8 @@ END
         logprint("---------------------\n");
         logprint("Hostname        :  $CONFIG{'hostname'}\n");
         logprint("Distribution    :  $CONFIG{'dist'}\n");
-        logprint("IP-Address(es)  :  ");
+        logprint("MAC Address     :  $CONFIG{'mac'}\n");
+        logprint("IP Address(es)  :  ");
         if ( $CONFIG{ 'dhcp' } ) {
            logprint("dynamic");
         } elsif( $CONFIG{ 'ip' } ) {

bin/xen-create-nfs

@@ -1,5 +1,7 @@
 #!/usr/bin/perl -w
 
+=encoding utf8
+
 =head1 NAME
 
 xen-create-nfs - Create a Xen configuration file for an NFS-root guest.
@@ -36,8 +38,6 @@ xen-create-nfs - Create a Xen configuration file for an NFS-root guest.
    --nfs_server Specify the NFS server to mount the root partition from.
    --nfs_root   Specify the path, upon the NFS server, to mount.
 
-=cut
-
 
 =head1 OPTIONS
 
@@ -55,11 +55,8 @@ Read the manual for this script.
 =item B<--version>
 Show the version number and exit.
 
-
 =back
 
-=cut
-
 
 =head1 DESCRIPTION
 
@@ -71,8 +68,6 @@ Show the version number and exit.
  support more than the minimal number of options to completement the
  existing xen-create-image script, however it is hopefully useful.
 
-=cut
-
 
 =head1 REFERENCE
 
@@ -81,16 +76,12 @@ Show the version number and exit.
 
     http://www.debian-administration.org/articles/505
 
-=cut
-
 
 =head1 AUTHORS
 
  Steve Kemp, http://www.steve.org.uk/
  Stéphane Jourdois
 
-=cut
-
 
 =head1 LICENSE
 
@@ -102,7 +93,6 @@ you can redistribute it and/or modify it under
 the same terms as Perl itself.
 The LICENSE file contains the full text of the license.
 
-
 =cut
 
 
@@ -131,7 +121,7 @@ $CONFIG{ 'template' } = '/etc/xen-tools/xm-nfs.tmpl';
 #
 # Release number.
 #
-my $RELEASE = '4.4~dev';
+my $RELEASE = '4.4rc1';
 
 
 # store version number away.

bin/xen-delete-image

@@ -1,5 +1,7 @@
 #!/usr/bin/perl -w
 
+=encoding utf8
+
 =head1 NAME
 
 xen-delete-image - Delete previously created Xen instances.
@@ -30,8 +32,6 @@ xen-delete-image - Delete previously created Xen instances.
    --test      Don't complain if we're not invoked by root.
    --no-xen-ok Don't complain if xen seems not installed or xend is not running
 
-=cut
-
 
 =head1 OPTIONS
 
@@ -56,16 +56,14 @@ Specify the LVM volume group where images were previously saved.
 Read the manual for this script.
 
 =item B<--test>
-Do not complain, or exit, if the script is not executed by the root user.
+Do not complain, or exit, if the script is not executed by the root
+user. (Only works in conjunction with --dir.)
 
 =item B<--version>
 Show the version number and exit.
 
-
 =back
 
-=cut
-
 
 =head1 DESCRIPTION
 
@@ -79,8 +77,6 @@ Show the version number and exit.
  but will fail to remove anything which the user does not have permission
  to delete.)
 
-=cut
-
 
 =head1 LOOPBACK EXAMPLE
 
@@ -96,8 +92,6 @@ Show the version number and exit.
   (The matching Xen configuration files beneath /etc/xen will also be
  removed.)
 
-=cut
-
 
 =head1 LVM EXAMPLE
 
@@ -114,8 +108,6 @@ Show the version number and exit.
 
   The Xen configuration files will also be removed from beneath /etc/xen.
 
-=cut
-
 
 =head1 EVMS EXAMPLE
 
@@ -132,8 +124,6 @@ Show the version number and exit.
 
   The Xen configuration files will also be removed.
 
-=cut
-
 
 =head1 AUTHORS
 
@@ -141,8 +131,6 @@ Show the version number and exit.
  Axel Beckert, http://noone.org/abe/
  Stéphane Jourdois
 
-=cut
-
 
 =head1 LICENSE
 
@@ -154,7 +142,6 @@ you can redistribute it and/or modify it under
 the same terms as Perl itself.
 The LICENSE file contains the full text of the license.
 
-
 =cut
 
 
@@ -177,7 +164,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.4~dev';
+my $RELEASE = '4.4rc1';
 
 
 #
@@ -323,10 +310,10 @@ sub checkArguments
     #
     #  When testing we only care about loopback images, not disk images.
     #
-    if ( $CONFIG{ 'test' } )
+    if ( $CONFIG{ 'test' } and ( $CONFIG{ 'lvm' } or $CONFIG{ 'evms' } ))
     {
-        $CONFIG{ 'lvm' }  = undef;
-        $CONFIG{ 'evms' } = undef;
+        print "Error: --test only works with --dir.\n";
+        exit 1;
     }
 
     #
@@ -348,7 +335,7 @@ sub checkArguments
         print " --dir\n";
         print " --evms\n";
         print " --lvm\n";
-        exit;
+        exit 2;
     }
 }
 

bin/xen-list-images

@@ -1,5 +1,7 @@
 #!/usr/bin/perl -w
 
+=encoding utf8
+
 =head1 NAME
 
 xen-list-images - List all the created and configured Xen images.
@@ -20,6 +22,7 @@ xen-list-images - List all the created and configured Xen images.
   Testing options:
    --test     Specify an alternate Xen configuration directory.
 
+
 =head1 OPTIONS
 
 =over 8
@@ -52,22 +55,18 @@ Show the version number and exit.
  and then either the IP address configured, or "DHCP" to denote
  a dynamic host.
 
-=cut
 
 =head1 TODO
 
   It should be possible to determine the disk(s) used by the images,
  and then display their sizes.
 
-=cut
-
 
 =head1 AUTHORS
 
  Steve Kemp, http://www.steve.org.uk/
  Stéphane Jourdois
 
-=cut
 
 =head1 LICENSE
 
@@ -107,7 +106,7 @@ $CONFIG{ 'extension' } = '.cfg';
 #
 # Release number.
 #
-my $RELEASE = '4.4~dev';
+my $RELEASE = '4.4rc1';
 
 
 
@@ -250,7 +249,7 @@ sub displayInstance
         {
             $name = $1;
         }
-        if ( $line =~ /.*memory[^0-9]*([0-9]+)/i )
+        if ( $line =~ /^\s*memory[^0-9]*([0-9]+)/i )
         {
             $mem = $1;
         }
@@ -265,7 +264,7 @@ sub displayInstance
     }
 
     print "Name: $name\n";
-    print "Memory: $mem\n";
+    print "Memory: $mem MB\n";
     print "IP: " . $ip . $mac . "\n" if length($ip);
     print "DHCP" . $mac . "\n" if $dhcp;
     print "Config: $file\n";

bin/xen-resize-guest

@@ -1,5 +1,7 @@
 #!/usr/bin/perl -w
 
+=encoding utf8
+
 =head1 NAME
 
 xen-resize-guest - Resize a loopback or LVM based xen guest.
@@ -20,8 +22,6 @@ xen-resize-guest - Resize a loopback or LVM based xen guest.
    --force    Force the resize to happen without a last-chance delay.
    --hostname Specify the hostname of the guest to resize.
 
-=cut
-
 
 =head1 OPTIONS
 
@@ -53,8 +53,6 @@ Show the version number and exit.
 
 =back
 
-=cut
-
 
 =head1 DESCRIPTION
 
@@ -74,15 +72,12 @@ Show the version number and exit.
   More than once I've heard of users making mistakes and breaking their
  filesystems; hence this tool.
 
-=cut
 
 =head1 AUTHORS
 
  Steve Kemp, http://www.steve.org.uk/
  Axel Beckert, http://noone.org/abe/
 
-=cut
-
 
 =head1 LICENSE
 
@@ -94,7 +89,6 @@ you can redistribute it and/or modify it under
 the same terms as Perl itself.
 The LICENSE file contains the full text of the license.
 
-
 =cut
 
 
@@ -117,7 +111,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.4~dev';
+my $RELEASE = '4.4rc1';
 
 
 #

bin/xen-update-image

@@ -1,5 +1,7 @@
 #!/usr/bin/perl -w
 
+=encoding utf8
+
 =head1 NAME
 
 xen-update-image - Update the software installed upon offline Xen images.
@@ -18,9 +20,6 @@ xen-update-image - Update the software installed upon offline Xen images.
    --lvm       Specify the LVM volume group which contains the image(s).
    --evms      Specify the EVMS container which contains the image(s).
 
-=cut
-
-
 
 =head1 OPTIONS
 
@@ -46,8 +45,6 @@ Show the version number and exit.
 
 =back
 
-=cut
-
 
 =head1 DESCRIPTION
 
@@ -65,8 +62,6 @@ Show the version number and exit.
  corruption otherwise it will allow you to update your image without
  booting it.
 
-=cut
-
 
 =head1 EXAMPLES
 
@@ -77,8 +72,6 @@ Show the version number and exit.
 
      xen-update-images --dir=/home/xen test.my.flat x11.my.flat
 
-=cut
-
 
 =head1 AUTHORS
 
@@ -86,7 +79,6 @@ Show the version number and exit.
  Axel Beckert, http://noone.org/abe/
  Stéphane Jourdois
 
-=cut
 
 =head1 LICENSE
 
@@ -121,7 +113,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.4~dev';
+my $RELEASE = '4.4rc1';
 
 
 #

bin/xt-create-xen-config

@@ -1,11 +1,11 @@
 #!/usr/bin/perl -w
 
+=encoding utf8
+
 =head1 NAME
 
 xt-create-config - Create a Xen configuration file for a new guest
 
-=cut
-
 =head1 SYNOPSIS
 
   xt-create-config [options]
@@ -39,7 +39,6 @@ xt-create-config - Create a Xen configuration file for a new guest
   All other options from xen-create-image, such as the new IP address(es)
  to give to the new instance, will be passed as environmental variables.
 
-=cut
 
 =head1 ABOUT
 
@@ -53,8 +52,6 @@ xt-create-config - Create a Xen configuration file for a new guest
 
   By default the script will use /etc/xen-tools/xm.tmpl as its input.
 
-=cut
-
 
 =head1 INVOCATION
 
@@ -75,9 +72,6 @@ xt-create-config - Create a Xen configuration file for a new guest
 =for example end
 
 
-=cut
-
-
 =head1 ARGUMENT PASSING
 
   This script will be invoked with a full copy of the arguments from
@@ -102,7 +96,6 @@ xt-create-config - Create a Xen configuration file for a new guest
  for the "Text::Template" perl module.   (If you have the perldoc
  package installed you can read this with "perldoc Text::Template".)
 
-=cut
 
 =head1 AUTHORS
 
@@ -110,7 +103,6 @@ xt-create-config - Create a Xen configuration file for a new guest
  Axel Beckert, http://noone.org/abe/
  Stéphane Jourdois
 
-=cut
 
 =head1 LICENSE
 
@@ -156,7 +148,7 @@ $CONFIG{ 'extension' } = '.cfg';
 #
 # Release number.
 #
-my $RELEASE = '4.4~dev';
+my $RELEASE = '4.4rc1';
 
 
 
@@ -377,11 +369,23 @@ sub createXenConfig
     #
     #  Remove any trailing Mb.
     #
-    if ( $ENV{ 'memory' } =~ /^(\d+)Mb?.*$/i )
-    {
-        $ENV{ 'memory' } = $1;
-    }
+    $ENV{ 'memory' } =~ s/^(\d+)Mb?.*$/$1/i;
 
+    #
+    #  The maxmem size:  Convert Gb -> Mb.
+    #
+    if ( exists($ENV{ 'maxmem' }) and defined($ENV{ 'maxmem' })) {
+
+        if ($ENV{ 'maxmem' } =~ /^(\d+)Gb?.*$/i )
+        {
+            $ENV{ 'maxmem' } = $1 * 1024;
+        }
+
+    #
+    #  Remove any trailing Mb.
+    #
+        $ENV{ 'maxmem' } =~ s/^(\d+)Mb?.*$/$1/i;
+    }
 
     #
     # Images as presented to Xen - either loopback images, or LVM partitions.

bin/xt-customize-image

@@ -1,11 +1,11 @@
 #!/usr/bin/perl -w
 
+=encoding utf8
+
 =head1 NAME
 
 xt-customize-image - Customize a freshly installed copy of GNU/Linux
 
-=cut
-
 =head1 SYNOPSIS
 
   xt-customize-image [options]
@@ -25,7 +25,6 @@ xt-customize-image - Customize a freshly installed copy of GNU/Linux
   All other options from xen-create-image, such as the new IP address(es)
  to give to the new instance, will be passed as environmental variables.
 
-=cut
 
 =head1 NOTES
 
@@ -41,8 +40,6 @@ xt-customize-image - Customize a freshly installed copy of GNU/Linux
    --location  - The temporary installation root of the new install
    --dist      - The distribution which has been installed.
 
-=cut
-
 
 =head1 HOOK SCRIPTS
 
@@ -57,8 +54,6 @@ xt-customize-image - Customize a freshly installed copy of GNU/Linux
  executed from '/usr/share/xen-tools/foo.d'.  Each executable will
  be loaded and executed in sorted order.
 
-=cut
-
 
 =head1 AUTHORS
 
@@ -66,8 +61,6 @@ xt-customize-image - Customize a freshly installed copy of GNU/Linux
  Axel Beckert, http://noone.org/abe/
  Stéphane Jourdois
 
-=cut
-
 
 =head1 LICENSE
 
@@ -98,7 +91,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.4~dev';
+my $RELEASE = '4.4rc1';
 
 
 

bin/xt-guess-suite-and-mirror

@@ -1,12 +1,12 @@
 #!/usr/bin/perl -w
 
+=encoding utf8
+
 =head1 NAME
 
 xt-guess-suite-and-mirror - Tries to guess the most suitable suite and
 mirror for DomUs on Debian and Ubuntu Dom0s.
 
-=cut
-
 =head1 SYNOPSIS
 
   --suite       Show suite
@@ -20,7 +20,6 @@ mirror for DomUs on Debian and Ubuntu Dom0s.
    --manual     Show the manual for this script.
    --version    Show the version number and exit.
 
-=cut
 
 =head1 DESCRIPTION
 
@@ -28,14 +27,12 @@ xt-guess-suite-and-mirror tries to find the mirror and suite the Xen
 Dom0 is currently using and returns them in a way suitable for
 xen-create-image(1) or the backticks feature in xen-tools.conf.
 
-=cut
 
 =head1 AUTHORS
 
  Axel Beckert, http://noone.org/abe/
  Stéphane Jourdois
 
-=cut
 
 =head1 LICENSE
 
@@ -74,6 +71,7 @@ my @sources_list_files = ( '/etc/apt/sources.list',
 use File::Slurp;
 use Getopt::Long;
 use Pod::Usage;
+use File::Which;
 
 use strict;
 
@@ -81,7 +79,7 @@ use strict;
 #
 # Release number.
 #
-my $RELEASE = '4.4~dev';
+my $RELEASE = '4.4rc1';
 
 # Init
 my $mirror = '';
@@ -153,10 +151,8 @@ all_sources_list_files: foreach my $sources_list_file (@sources_list_files) {
 die "Couldn't find a useful entry in the sources.list files of the Dom0. Tried:\n  ".
     join("\n  ", @sources_list_files)."\n" unless $found;
 
-my $lsb_release = `which lsb_release`;
-chomp($lsb_release);
-
-if (!$found and $lsb_release and -x $lsb_release) {
+my $lsb_release = which('lsb_release');
+if (!$found and defined($lsb_release) and -x $lsb_release) {
     my $vendor = `$lsb_release -s -i`;
 
     if ($vendor eq 'Debian' or $vendor eq 'Ubuntu') {

bin/xt-install-image

@@ -1,11 +1,11 @@
 #!/usr/bin/perl -w
 
+=encoding utf8
+
 =head1 NAME
 
 xt-install-image - Install a fresh copy of GNU/Linux into a directory
 
-=cut
-
 =head1 SYNOPSIS
 
   xt-install-image [options]
@@ -39,8 +39,6 @@ xt-install-image - Install a fresh copy of GNU/Linux into a directory
   All other options from xen-create-image will be passed as environmental
  variables.
 
-=cut
-
 
 =head1 NOTES
 
@@ -50,8 +48,6 @@ xt-install-image - Install a fresh copy of GNU/Linux into a directory
  configuration, etc.
 
 
-=cut
-
 =head1 INSTALLATION METHODS
 
   There are several available methods of installation, depending upon the
@@ -78,8 +74,6 @@ Untar a .tar file into the new installation location.  This tarfile is assumed t
 
 =back
 
-=cut
-
 
 =head1 AUTHORS
 
@@ -88,7 +82,6 @@ Untar a .tar file into the new installation location.  This tarfile is assumed t
  Dmitry Nedospasov, http://nedos.net/
  Stéphane Jourdois
 
-=cut
 
 =head1 LICENSE
 
@@ -119,7 +112,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.4~dev';
+my $RELEASE = '4.4rc1';
 
 
 #

debian/NEWS

@@ -1,4 +1,4 @@
-xen-tools (4.4~dev-1) UNRELEASED; urgency=low
+xen-tools (4.4~beta1-1) unstable; urgency=low
 
   * Exported environment variables no more contain dashes ("-"). Dashes in
     environment variable names are from now on converted to underscores
@@ -11,7 +11,7 @@ xen-tools (4.4~dev-1) UNRELEASED; urgency=low
     which all should be empty at that point, i.e. "rmdir -p
     /usr/lib/xen-tools/*" should do the trick.
 
- -- Axel Beckert <abe@debian.org>  Fri, 05 Apr 2013 20:19:02 +0200
+ -- Axel Beckert <abe@debian.org>  Fri, 23 Aug 2013 19:01:16 +0200
 
 xen-tools (4.2~rc1-1) unstable; urgency=low
 

debian/changelog

@@ -1,6 +1,45 @@
-xen-tools (4.4~dev-1) UNRELEASED; urgency=low
+xen-tools (4.4~rc1-1) unstable; urgency=low
 
-  * New upstream release
+  * New upstream release candidate
+    - Also switch from cdn.debian.net to http.debian.net in xen-tools.conf
+    - Do not run "passwd" via runCommand as that one captures STDOUT for
+      logging. Makes --passwd usable again. Thanks to Christian Herzog for
+      the bug report.
+    - Loop around calling "passwd" to get a second chance to change the
+      password. (Closes: #703159) Thanks to Joan <aseques@gmail.com> for a
+      bug fix in this new code.
+      + Add dependency on "libterm-ui-perl | perl (<< 5.17.0)"
+    - Declares one more POD encoding and recode Xen::Tools::Common to
+      UTF-8. Fixes FTBFS with Perl 5.18. (Finally closes: #720519)
+    - Apply patch by Philipp Erbelding to fix overzealous line matching in
+      xen-list-images. (Gitorious merge request #5)
+    - xen-list-images now displays a unit after the memory size
+    - Drop support for memory size in kilobytes in xen-create-image,
+      neither xt-create-xen-config nor xm support it.
+    - Refactoring: Replace all occurrences of "! -z" by "-n" in hooks and
+      bash completion.
+    - Handle potentially empty gateway setting properly in
+      hooks/common/40-setup-networking-deb. Thanks Simone Caruso!
+    - Reformat hooks/common/40-setup-networking-deb so that the result
+      neither has trailing whitespace nor broken indentation.
+    - Also display MAC address after the DomU has been created.
+    - Preliminary support for Ubuntu 14.04 Trusty Tahr.
+    - Added --maxmem flag to set a maximum value for dynamic memory
+      ballooning. Thanks to Joan <aseques@gmail.com> for the patch!
+    - Added fix by Patryk Ściborek againsat disableStartStopDaemon()
+      aborting under some circumstances. (Closes: #725192)
+    - Abort early and with proper error message if "xen-delete-image
+      --test" is not used with "--dir". (Closes: #704878)
+    - xen-delete-image: Exit with return code != 0 in all error cases.
+    - Refactoring: xt-create-xen-config: Use s/// to strip trailing MB
+      size suffixes.
+  * Bump Standards-Version to 3.9.5 (no changes).
+
+ -- Axel Beckert <abe@debian.org>  Mon, 28 Oct 2013 22:31:03 +0100
+
+xen-tools (4.4~beta1-1) unstable; urgency=low
+
+  * New upstream beta release
     - Code deduplication to unify the xen-*-image scripts
     - Moves /usr/lib/xen-tools/ to /usr/share/xen-tools/
     - Use http.debian.net as default Debian mirror if no mirror is given
@@ -20,14 +59,17 @@ xen-tools (4.4~dev-1) UNRELEASED; urgency=low
     - Fixes "--extension=" with empty parameter.
     - Sarge amd64 case handle properly
     - Remove CVS revisions from --version output
-    - Preliminary support for Debian Jessie and Ubuntu Raring
+    - Support for Debian Jessie, Ubuntu Raring and preliminary support for
+      Ubuntu Saucy (debootstrap doesn't have support for Saucy at the time
+      of writing)
     - Preliminary support for xl toolstack
     - xen-create-image: Consistently use runCommand() instead of system()
     - xt-install-image: Don't bail out if only cdebootstrap is installed
       but not debootstrap (Thanks Elmar Heeb!)
     - Makefile accepts DESTDIR=…
     - Move examples from debian/examples to examples.
-    - Uses File::Which, added (build-) dependency on libfile-which-perl
+    - Uses File::Which exclusively (no more findBinary, no more `which`),
+      added (build-) dependency on libfile-which-perl
     - Knows about module-init-tools → kmod transition in wheezy/raring.
     - Adds default mount options for ext4, identical to ext2/ext3.
     - Ships /etc/initramfs-tools/conf.d/xen-tools for generating Dom0
@@ -41,13 +83,25 @@ xen-tools (4.4~dev-1) UNRELEASED; urgency=low
       Add installCentOS4Package wrapper for backward compatibility.
     - Fix filesystem tools installation in 91-install-fs-tools (which was
       broken since 4.3~rc1-1) by merging 91-install-fs-tools back into
-      90-make-fstab. Also supports RPM-based distributions now.
+      90-make-fstab. (Closes: #715340) Also supports RPM-based
+      distributions now.
     - Fixes export of environment variables. Previously they could contain
       dashes and then were only accessible from within Perl, but not from
       within Bash.
     - Fixes creation of "ARRAY(0x…).log" named log files.
     - Makes some options (like --pygrub) negatable.
     - Uses Test::NoTabs; add according build-dependency.
+    - Removes unused Perl modules Xen::Tools and Xen::Tools::Log from
+      source code. Also removes the according tests from the test suite.
+      → Remove no more needed build-dependency on Moose.
+    - Better documents and checks requirements for the --apt_proxy
+      value. (See #623443 for the corresponding apt issue.) Add (build-)
+      dependency on libdata-validate-uri-perl.
+    - Use Data::Validate::{Domain,IP} for IP addresses and hostname checks.
+      Add corresponding (build-) dependencies on
+      libdata-validate-{domain,ip}-perl.
+    - Fixes broken quoting in list of required binaries
+    - Declares POD encoding. Fixes FTBFS with Perl 5.18. (Closes: #720519)
   * Add debian/gbp.conf to be able to to build xen-tools with
     git-buildpackage.
   * Clean up debian/rules:
@@ -59,10 +113,14 @@ xen-tools (4.4~dev-1) UNRELEASED; urgency=low
       dh_auto_* can't help. No more explicitly call "make manpages", it's
       a depedency of "make install" in the next line anyway.
     - Finally switch to a minimal dh style debian/rules.
+  * Bump debhelper compatibility to 9
+    - Update versioned debhelper build-dependency
+  * Bump Standards-Version to 3.9.4 (no changes)
+  * Add dependency on ${perl:Depends} to fix dpkg-gencontrol warning.
   * Bump copyright years in debian/copyright.
   * Apply wrap-and-sort.
 
- -- Axel Beckert <abe@debian.org>  Thu, 17 Jan 2013 17:09:02 +0100
+ -- Axel Beckert <abe@debian.org>  Fri, 23 Aug 2013 19:00:03 +0200
 
 xen-tools (4.3.1-1) unstable; urgency=low
 

debian/compat

@@ -1 +1 @@
-7
+9

debian/control

@@ -2,17 +2,19 @@ Source: xen-tools
 Section: utils
 Priority: extra
 Maintainer: Axel Beckert <abe@debian.org>
-Build-Depends: debhelper (>= 7.0.0),
+Build-Depends: debhelper (>= 9~),
                devscripts,
                git,
+               libdata-validate-domain-perl,
+               libdata-validate-ip-perl,
+               libdata-validate-uri-perl,
                libfile-slurp-perl,
                libfile-which-perl,
-               libmoose-perl,
                libtest-notabs-perl,
                libtest-pod-coverage-perl,
                libtest-pod-perl,
                libtext-template-perl
-Standards-Version: 3.9.3
+Standards-Version: 3.9.5
 Homepage: http://xen-tools.org/software/xen-tools
 Vcs-Browser: http://gitorious.org/xen-tools/xen-tools
 Vcs-Git: git://gitorious.org/xen-tools/xen-tools.git
@@ -21,12 +23,17 @@ Package: xen-tools
 Architecture: all
 Depends: debootstrap | cdebootstrap,
          libconfig-inifiles-perl,
+         libdata-validate-domain-perl,
+         libdata-validate-ip-perl,
+         libdata-validate-uri-perl,
          libfile-slurp-perl,
          libfile-which-perl,
+         libterm-ui-perl | perl (<< 5.17.0),
          libtext-template-perl,
          openssh-client,
          perl-modules,
-         ${misc:Depends}
+         ${misc:Depends},
+         ${perl:Depends}
 Recommends: libexpect-perl,
             rinse (>= 1.9.1-1),
             xen-hypervisor-amd64 | xen-hypervisor-i386 | xen-hypervisor-i386-pae,
@@ -47,7 +54,8 @@ Description: Tools to manage Xen virtual servers
    * Debian 4.0 Etch
    * Debian 5.0 Lenny
    * Debian 6.0 Squeeze
-   * Debian 7.0 Wheezy
+   * Debian 7 Wheezy
+   * Debian 8 Jessie (under development)
    * Debian Sid (Unstable)
    * Ubuntu 6.06 Dapper Drake (LTS)
    * Ubuntu 6.10 Edgy Eft
@@ -62,5 +70,8 @@ Description: Tools to manage Xen virtual servers
    * Ubuntu 11.04 Natty Narwhal
    * Ubuntu 11.10 Oneiric Ocelot
    * Ubuntu 12.04 Precise Pangolin (LTS)
+   * Ubuntu 12.10 Quantal Quetzal
+   * Ubuntu 13.04 Raring Ringtail
+   * Ubuntu 13.10 Saucy Salamander (under development)
    * CentOS 5
    * CentOS 6

etc/xen-tools.conf

@@ -127,6 +127,7 @@ install-method = debootstrap
 #
 size   = 4G       # Root disk, suffix (G, M, k) required
 memory = 128M     # Suffix (G, M, k) required
+#maxmem = 256M     # Suffix (G, M, k) optional
 swap   = 128M     # Suffix (G, M, k) required
 # noswap = 1      # Don't use swap at all for new systems.
 fs     = ext3     # Default file system for any disk
@@ -272,15 +273,15 @@ mirror = `xt-guess-suite-and-mirror --mirror`
 # mirror_sarge = http://archive.debian.org/debian
 # mirror_etch = http://archive.debian.org/debian
 # mirror_lenny = http://archive.debian.org/debian
-# mirror_squeeze = http://cdn.debian.net/debian
-# mirror_wheezy = http://cdn.debian.net/debian
-# mirror_jessie = http://cdn.debian.net/debian
-# mirror_sid = http://cdn.debian.net/debian
+# mirror_squeeze = http://http.debian.net/debian
+# mirror_wheezy = http://http.debian.net/debian
+# mirror_jessie = http://http.debian.net/debian
+# mirror_sid = http://http.debian.net/debian
 # mirror_dapper = http://old-releases.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_hardy = http://old-releases.ubuntu.com/ubuntu
 # mirror_intrepid = http://old-releases.ubuntu.com/ubuntu
 # mirror_jaunty = http://old-releases.ubuntu.com/ubuntu
 # mirror_karmic = http://old-releases.ubuntu.com/ubuntu
@@ -291,6 +292,8 @@ mirror = `xt-guess-suite-and-mirror --mirror`
 # mirror_precise = http://archive.ubuntu.com/ubuntu
 # mirror_quantal = http://archive.ubuntu.com/ubuntu
 # mirror_raring = http://archive.ubuntu.com/ubuntu
+# mirror_saucy = http://archive.ubuntu.com/ubuntu
+# mirror_trusty = http://archive.ubuntu.com/ubuntu
 
 # If this is defined it will be used by debootstrap, and configured as the
 # proxy for the guest

etc/xm-nfs.tmpl

@@ -17,6 +17,11 @@
   }
 }
 memory  = '{$memory}'
+{ if ( $maxmem )
+  {
+    $OUT .= "maxmem      = '$maxmem'\n";
+  }
+}
 
 
 # Name

etc/xm.tmpl

@@ -37,6 +37,11 @@
 }
 vcpus       = '{$vcpus}'
 memory      = '{$memory}'
+{ if ( $maxmem )
+  {
+    $OUT .= "maxmem      = '$maxmem'\n";
+  }
+}
 
 #
 #  Disk device(s).

hooks/centos-5/25-setup-kernel

@@ -41,7 +41,7 @@ EOF
 for i in `seq 1 $NUMPARTITIONS`; do
   echo -n "/dev/xvde$i " >> ${prefix}/etc/fstab
   eval part=\$PARTITION$i
-  if [ ! -z "`echo $part | grep swap`" ]; then
+  if [ -n "`echo $part | grep swap`" ]; then
      echo "none swap ws 0 0" >> ${prefix}/etc/fstab
   else
      echo $part | awk -F: '{print $4,$3,$5,0,1}' >> ${prefix}/etc/fstab

hooks/centos-6/25-setup-kernel

@@ -41,7 +41,7 @@ EOF
 for i in `seq 1 $NUMPARTITIONS`; do
   echo -n "/dev/sda$i " >> ${prefix}/etc/fstab
   eval part=\$PARTITION$i
-  if [ ! -z "`echo $part | grep swap`" ]; then
+  if [ -n "`echo $part | grep swap`" ]; then
      echo "none swap ws 0 0" >> ${prefix}/etc/fstab
   else
      echo $part | awk -F: '{print $4,$3,$5,0,1}' >> ${prefix}/etc/fstab

hooks/common.sh

@@ -24,7 +24,7 @@ logMessage ()
 {
     message="$*"
 
-    if [ ! -z "${verbose}" ]; then
+    if [ -n "${verbose}" ]; then
         echo $message
     fi
 }
@@ -261,12 +261,14 @@ disableStartStopDaemon ()
    for starter in start-stop-daemon initctl; do
       local daemonfile="${prefix}/sbin/${starter}"
 
-      mv "${daemonfile}" "${daemonfile}.REAL"
-      echo '#!/bin/sh' > "${daemonfile}"
-      echo "echo \"Warning: Fake ${starter} called, doing nothing\"" >> "${daemonfile}"
+      if [ -e "${daemonfile}" ]; then
+         mv "${daemonfile}" "${daemonfile}.REAL"
+         echo '#!/bin/sh' > "${daemonfile}"
+         echo "echo \"Warning: Fake ${starter} called, doing nothing\"" >> "${daemonfile}"
 
-      chmod 755 "${daemonfile}"
-      logMessage "${starter} disabled / made a stub."
+         chmod 755 "${daemonfile}"
+         logMessage "${starter} disabled / made a stub."
+      fi
    done
 }
 

hooks/common/30-disable-gettys

@@ -49,7 +49,7 @@ rm -f ${prefix}/etc/event.d/tty[!1]
 #
 #  Are we using an alternative serial device?
 #
-if [ ! -z "${serial_device}" ]; then
+if [ -n "${serial_device}" ]; then
 
     serial_device=`basename ${serial_device}`
 

hooks/common/40-setup-networking-deb

@@ -71,8 +71,8 @@ setupStaticNetworking ()
     #  if $p2p is set then add a "pointopoint" setting.
     #
     point='';
-    if [ ! -z "${p2p}" ]; then
-        point="pointopoint ${p2p}"
+    if [ -n "${p2p}" ]; then
+        point=" pointopoint ${p2p}"
     else
         point=''
     fi
@@ -81,10 +81,18 @@ setupStaticNetworking ()
     # broadcast address?
     #
     bcast='';
-    if [ ! -z "${broadcast}" ]; then
+    if [ -n "${broadcast}" ]; then
       bcast=" broadcast ${broadcast}"
     fi
 
+    #
+    # gateway address?
+    #
+    gateway='';
+    if [ -n "${gateway}" ]; then
+      gateway=" gateway ${gateway}"
+    fi
+
     #
     # We have a static IP address
     #
@@ -100,10 +108,10 @@ iface lo inet loopback
 auto eth0
 iface eth0 inet static
  address ${ip1}
- gateway ${gateway}
+${gateway}
  netmask ${netmask}
- ${bcast}
- ${point}
+${bcast}
+${point}
  # post-up  ethtool -K eth0 tx off
 
 #

hooks/common/90-make-fstab

@@ -48,7 +48,7 @@ if [ "${ide}" ]; then
 elif [ "${scsi}" ]; then
     device=sda
 else
-    if [ ! -z "${disk_device}" ]; then
+    if [ -n "${disk_device}" ]; then
         device=`basename $disk_device`
     fi
 fi

hooks/gentoo/40-setup-networking

@@ -61,7 +61,7 @@ setupStaticNetworking ()
     #  if $p2p is set then add a "pointopoint" setting.
     #
     point='';
-    if [ ! -z "${p2p}" ]; then
+    if [ -n "${p2p}" ]; then
         point="pointopoint ${p2p}"
     else
         point=''

lib/Xen/Tools.pm

@@ -1,332 +0,0 @@
-package Xen::Tools;
-
-use warnings;
-use strict;
-use Moose;
-
-use Xen::Tools::Log;
-
-=head1 NAME
-
-Xen::Tools - Build Xen domains with Perl
-
-=head1 VERSION
-
-Version 0.01
-
-=cut
-
-our $VERSION = '0.01';
-
-=head1 SYNOPSIS
-
- my $xt = Xen::Tools->new();
-
-=head1 FUNCTIONS
-
-=head2 new
-
-  Instantiate the object.
-
-=cut
-
-override 'new' => sub {
-  my $class = shift;
-
-  # Initialize the base class
-  my $self = $class->super(@_);
-
-  $self->{_xtl} = Xen::Tools::Log->new( hostname => $self->hostname,
-                                        logpath  => $self->logpath,
-                                      );
-
-  $self->_checkSystem();
-
-  return $self;
-};
-
-=head2 meta
-
-  This is a method which provides access to the current class's meta-
-  class.  Inherited from Moose.
-
-=cut
-
-=head2 log
-
-  This method sends a log message to the current object's logging
-  mechanism
-
-=cut
-
-sub log {
-  my $self = shift;
-
-  $self->{_xtl}->print(@_);
-}
-
-=head2 hostname
-
- Attribute which indicates the domain's hostname
-
-=cut
-
-has 'hostname' => ( is => 'ro', isa => 'Str', required => 1 );
-
-=head2 logpath
-
- Attribute which indicates the log directory.  Defaults to /var/log/xen-tools
-
-=cut
-
-has 'logpath'  => ( is      => 'ro',
-                    isa     => 'Str',
-                    default => '/var/log/xen-tools'
-                    );
-
-=begin doc
-
-_findBinary
-
-  Find the location of the specified binary on the curent user's PATH.
-
-  Return undef if the named binary isn't found.
-
-=end doc
-
-=cut
-
-sub _findBinary {
-  my $self = shift;
-    my( $bin ) = (@_);
-
-    # strip any path which might be present.
-    $bin  = $2 if ( $bin  =~ /(.*)[\/\\](.*)/ );
-
-    foreach my $entry ( split( /:/, $ENV{'PATH'} ) )
-    {
-        # guess of location.
-        my $guess = $entry . "/" . $bin;
-
-        # return it if it exists and is executable
-        return $guess if ( -e $guess && -x $guess );
-    }
-
-    return;
-}
-
-=begin doc
-
-_checkSystem
-
-  Test that this system is fully setup for the new xen-create-image
- script.
-
-  This means that the the companion scripts xt-* are present on the
- host and executable.
-
-=end doc
-
-=cut
-
-sub _checkSystem {
-  my $self = shift;
-    my @required = qw ( / xt-customize-image
-                          xt-install-image
-                          xt-create-xen-config / );
-
-    foreach my $bin ( @required )
-    {
-        if ( ! defined( $self->_findBinary( $bin ) ) )
-        {
-            $self->log("The script '$bin' was not found.\n",
-                       "Aborting\n\n"
-                      );
-            exit;
-        }
-    }
-
-    #
-    #  Make sure that we have Text::Template installed - this
-    # will be used by `xt-create-xen-config` and if that fails then
-    # running is pointless.
-    #
-    my $test = "use Text::Template";
-    eval( $test );
-    if ( ( $@ ) && ( ! $self->{_force} ) )
-    {
-        print <<E_O_ERROR;
-
-  Aborting:  The Text::Template perl module isn't installed or available.
-
-  Specify '--force' to skip this check and continue regardless.
-
-E_O_ERROR
-        exit;
-    }
-
-
-    #
-    #  Make sure that xen-shell is installed if we've got an --admin
-    # flag specified
-    #
-    if ( $self->{_admins} )
-    {
-        my $shell = undef;
-        $shell = "/usr/bin/xen-login-shell" if ( -x "/usr/bin/xen-login-shell" );
-        $shell = "/usr/local/bin/xen-login-shell" if ( -x "/usr/bin/local/xen-login-shell" );
-
-        if ( !defined( $shell ) )
-        {
-            print <<EOF;
-
-  You've specified administrator accounts for use with the xen-shell,
- however the xen-shell doesn't appear to be installed.
-
-  Aborting.
-EOF
-            exit;
-        }
-    }
-
-
-    #
-    #  Test the system has a valid (network-script) + (vif-script) setup.
-    #
-    return $self->_testXenConfig();
-}
-
-=begin doc
-
-  Test that the current Xen host has a valid network configuration,
- this is designed to help newcomers to Xen.
-
-=end doc
-
-=cut
-
-sub _testXenConfig {
-  my $self = shift;
-    # wierdness.
-    return if ( ! -d "/etc/xen" );
-
-    #
-    #  Temporary hash.
-    #
-    my %cfg;
-
-    #
-    # Read the configuration file.
-    #
-    open( my $config_fh, q{<}, '/etc/xen/xend-config.sxp' )
-      or die "Failed to read /etc/xen/xend-config.sxp: $!";
-    while( <$config_fh> )
-    {
-        next if ( ! $_ || !length( $_ ) );
-
-        # vif
-        if ( $_ =~ /^\(vif-script ([^)]+)/ )
-        {
-            $cfg{'vif-script'} = $1;
-        }
-
-        # network
-        if ( $_ =~ /^\(network-script ([^)]+)/ )
-        {
-            $cfg{'network-script'} = $1;
-        }
-    }
-    close( $config_fh );
-
-    if ( !defined( $cfg{'network-script'} ) ||
-         !defined( $cfg{'vif-script'} ) )
-    {
-        print <<EOF;
-
-WARNING
--------
-
-  You appear to have a missing vif-script, or network-script, in the
- Xen configuration file /etc/xen/xend-config.sxp.
-
-  Please fix this and restart Xend, or your guests will not be able
- to use any networking!
-
-EOF
-    }
-    else
-    {
-        if ( ( $cfg{'network-script'} =~ /dummy/i ) ||
-             ( $cfg{'vif-script'}     =~ /dummy/i ) )
-        {
-
-            print <<EOF;
-WARNING
--------
-
-  You appear to have a "dummy" vif-script, or network-script, setting
- in the Xen configuration file /etc/xen/xend-config.sxp.
-
-  Please fix this and restart Xend, or your guests will not be able to
- use any networking!
-
-EOF
-        }
-    }
-    return 1;
-}
-
-
-=head1 AUTHOR
-
-C.J. Adams-Collier, C<< <cjac at colliertech.org> >>
-
-=head1 BUGS
-
-Please report any bugs or feature requests to C<bug-xen-tools at rt.cpan.org>, or through
-the web interface at L<http://rt.cpan.org/NoAuth/ReportBug.html?Queue=Xen-Tools>.  I will be notified, and then you'll
-automatically be notified of progress on your bug as I make changes.
-
-
-
-
-=head1 SUPPORT
-
-You can find documentation for this module with the perldoc command.
-
-    perldoc Xen::Tools
-
-
-You can also look for information at:
-
-=over 4
-
-=item * RT: CPAN's request tracker
-
-L<http://rt.cpan.org/NoAuth/Bugs.html?Dist=Xen-Tools>
-
-=item * AnnoCPAN: Annotated CPAN documentation
-
-L<http://annocpan.org/dist/Xen-Tools>
-
-=item * CPAN Ratings
-
-L<http://cpanratings.perl.org/d/Xen-Tools>
-
-=item * Search CPAN
-
-L<http://search.cpan.org/dist/Xen-Tools>
-
-=back
-
-=head1 COPYRIGHT & LICENSE
-
-Copyright 2007 C.J. Adams-Collier, all rights reserved.
-
-This program is free software; you can redistribute it and/or modify it
-under the same terms as Perl itself.
-
-
-=cut
-
-1; # End of Xen::Tools

lib/Xen/Tools/Common.pm

@@ -2,10 +2,13 @@
 
 package Xen::Tools::Common;
 
+=encoding utf8
+
 =head1 NAME
 
 Xen::Tools::Common - Common funtions used in xen-tools' Perl scripts
 
+
 =head1 SYNOPSIS
 
  use Xen::Tools::Common;
@@ -19,9 +22,10 @@ use Exporter 'import';
 use vars qw(@EXPORT_OK @EXPORT);
 
 use English;
+use File::Which;
 
 @EXPORT = qw(readConfigurationFile xenRunning runCommand setupAdminUsers
-             findXenToolstack findBinary
+             findXenToolstack
              logprint_with_config logonly_with_config fail_with_config);
 
 =head1 FUNCTIONS
@@ -138,38 +142,6 @@ sub xenRunning ($$)
     return ($running);
 }
 
-=head2 findBinary
-
-=begin doc
-
-  Find the location of the specified binary on the curent user's PATH.
-
-  Return undef if the named binary isn't found.
-
-=end doc
-
-=cut
-
-sub findBinary
-{
-    my ($bin) = (@_);
-
-    # strip any path which might be present.
-    $bin = $2 if ( $bin =~ /(.*)[\/\\](.*)/ );
-
-    foreach my $entry ( split( /:/, $ENV{ 'PATH' } ) )
-    {
-
-        # guess of location.
-        my $guess = $entry . "/" . $bin;
-
-        # return it if it exists and is executable
-        return $guess if ( -e $guess && -x $guess );
-    }
-
-    return undef;
-}
-
 =head2 findXenToolstack
 
 =begin doc
@@ -191,12 +163,12 @@ sub findXenToolstack
         return $toolstack if $toolstack;
     }
 
-    my $xm = findBinary('xm');
+    my $xm = which('xm');
     if ($xm and system("$xm list >/dev/null 2>/dev/null") == 0) {
         return $xm;
     }
 
-    my $xl = findBinary('xl');
+    my $xl = which('xl');
     if ($xl and system("$xl list >/dev/null 2>/dev/null") == 0) {
         return $xl;
     }
@@ -432,7 +404,7 @@ sub logprint_with_config ($$)
  Steve Kemp, http://www.steve.org.uk/
  Axel Beckert, http://noone.org/abe/
  Dmitry Nedospasov, http://nedos.net/
- Stéphane Jourdois
+ Stéphane Jourdois
 
  Merged from several scripts by Axel Beckert.
 

lib/Xen/Tools/Log.pm

@@ -1,212 +0,0 @@
-package Xen::Tools::Log;
-
-use warnings;
-use strict;
-use Moose;
-use File::Spec;
-use POSIX; # strftime
-use Carp;
-
-=head1 NAME
-
-Xen::Tools::Log - Log Xen::Tools events
-
-=head1 VERSION
-
-Version 0.01
-
-=cut
-
-our $VERSION = '0.01';
-
-
-=head1 SYNOPSIS
-
-Mostly internal to Xen::Tools.  Use this to create a logging mechanism.
-
- my $xtl = Xen::Tools::Log->new( hostname => 'firewall' );
-
- $xtl->print("Yay for logging.");
-
-=head1 FUNCTIONS
-
-=head2 new
-
- Create the log object
-
-=cut
-
-=head2 print
-
-  Print the given string both to our screen, and to the logfile.
-
-=cut
-
-sub print {
-  my $self = shift;
-
-  $self->print_screen( @_ );
-  $self->print_log( @_ );
-}
-
-=head2 print_screen
-
-  Print the given string to our screen
-
-=cut
-
-sub print_screen {
-  my $self = shift;
-
-  print map { "$_\n" } @_;
-}
-
-=head2 print_log
-
-  Print the given string to the logfile.
-
-=cut
-
-sub print_log {
-  my $self = shift;
-
-  # Create an RFC 822 conformant date string
-  my $date = strftime( "%a, %d  %b  %Y  %H:%M:%S  %z", localtime );
-  my $fh = $self->log_fh();
-  print $fh ( map { "$date - $_" } @_ );
-}
-
-=head2 hostname
-
-  Attribute storing the hostname this log describes
-
-=cut
-
-has 'hostname' => ( is => 'rw', isa => 'Str', required => 1 );
-
-=head2 logpath
-
-  Attribute storing the directory in which the log file resides
-
-=cut
-
-has 'logpath'  => ( is      => 'rw',
-                    isa     => 'Str',
-                    default => '/var/log/xen-tools'
-                  );
-
-=head2 log_fh
-
-  FileHandle attribute storing the filehandle of the log
-
-=cut
-
-has 'log_fh'   => ( is      => 'ro',
-                    isa     => 'FileHandle',
-                    lazy    => 1,
-                    default => \&_init_fh,
-                  );
-
-=head2 clean_up
-
-  Boolean attribute indicating whether the log will be cleaned up when the
-  logger is closed
-
-=cut
-
-has 'clean_up' => ( is      => 'ro',
-                    isa     => 'Bool',
-                    default => 0,
-                  );
-
-before 'DESTROY' => sub {
-    my $self = shift;
-
-    # Deconstructor
-};
-
-=head2 meta
-
-  This is a method which provides access to the current class's meta-
-  class.  Inherited from Moose.
-
-=cut
-
-=begin doc
-
-_init_fh
-
-  This private method initializes the logging filehandle, creating the
-  containing directory if it does not exist.
-
-=end doc
-
-=cut
-
-sub _init_fh {
-  my $self = shift;
-
-  my $logFile =
-    File::Spec->catfile( $self->logpath(), $self->hostname() . '.log' );
-
-  system( qw(mkdir -p), $self->logpath() ) unless -d $self->logpath();
-
-  carp "Couldn't create log directory: $!" unless $? == 0;
-  
-  open( $self->{log_fh}, q{>>}, $logFile ) or
-    carp "Couldn't open log file for append: $!";
-};
-
-=head1 AUTHOR
-
-C.J. Adams-Collier, C<< <cjac at colliertech.org> >>
-
-=head1 BUGS
-
-Please report any bugs or feature requests to C<bug-xen-tools-log at rt.cpan.org>, or through
-the web interface at L<http://rt.cpan.org/NoAuth/ReportBug.html?Queue=Xen-Tools>.  I will be notified, and then you'll
-automatically be notified of progress on your bug as I make changes.
-
-
-
-
-=head1 SUPPORT
-
-You can find documentation for this module with the perldoc command.
-
-    perldoc Xen::Tools
-
-
-You can also look for information at:
-
-=over 4
-
-=item * RT: CPAN's request tracker
-
-L<http://rt.cpan.org/NoAuth/Bugs.html?Dist=Xen-Tools>
-
-=item * AnnoCPAN: Annotated CPAN documentation
-
-L<http://annocpan.org/dist/Xen-Tools>
-
-=item * CPAN Ratings
-
-L<http://cpanratings.perl.org/d/Xen-Tools>
-
-=item * Search CPAN
-
-L<http://search.cpan.org/dist/Xen-Tools>
-
-=back
-
-=head1 COPYRIGHT & LICENSE
-
-Copyright 2007 C.J. Adams-Collier, all rights reserved.
-
-This program is free software; you can redistribute it and/or modify it
-under the same terms as Perl itself.
-
-
-=cut
-
-1; # End of Xen::Tools::Log

misc/xen-tools.bash-completion

@@ -31,7 +31,7 @@ function _find_xen_images
 
     for i in /etc/xen/*.cfg ; do
         name=`grep ^name $i 2>/dev/null | awk -F\'  '{print $2}'`
-        if [ ! -z "${name}" ] ; then
+        if [ -n "${name}" ] ; then
             names="${names} ${name}"
         fi
     done

t/modules.sh

@@ -25,7 +25,7 @@ use Test::More qw( no_plan );
 EOF
 
 
-for i in `grep '^use ' -r .. | grep -v Expect | grep -v POSIX | grep -v Xen:: | grep -v Moose | awk '{print $2}' | tr -d 
+for i in `grep '^use ' -r .. | grep -v Expect | grep -v POSIX | grep -v Xen:: | awk '{print $2}' | tr -d 
 \;\(\) | sort | uniq`; \
     do \
      echo "BEGIN{ use_ok( '$i' ); }"; \

t/perl-syntax.t

@@ -13,11 +13,6 @@ use strict;
 use File::Find;
 use Test::More;
 
-eval "use Moose";
-plan skip_all => "Moose required for testing Perl syntax"
-    if $@;
-
-
 #
 #  Find all the files beneath the current directory,
 # and call 'checkFile' with the name.

t/xen-tools-log.t.disabled

@@ -1,15 +0,0 @@
-#!/usr/bin/perl -I../lib -I./lib
-
-use strict;
-use warnings;
-use Test::More tests => 1, skip_all => 'Xen::Tools::Log is not used for now';
-use File::Temp;
-
-use Xen::Tools::Log;
-
-my $dir = File::Temp::tempdir( CLEANUP => 1 );
-
-my $xtl = Xen::Tools::Log->new( hostname => 'xen-tools-log-test',
-                                logpath  => $dir );
-
-ok( $xtl->isa('Xen::Tools::Log') );

t/xen-tools.t.disabled

@@ -1,23 +0,0 @@
-#!/usr/bin/perl -I../lib -I./lib
-#
-#  Test we can load the (stub) Xen::Tools package.
-#
-
-
-use strict;
-use warnings;
-use Test::More skip_all => 'Xen::Tools is not used for now';
-
-SKIP: {
-    skip "Test only works as root", 1 if $< > 0;
-
-    eval {
-        use Xen::Tools;
-
-        my $xt = Xen::Tools->new( hostname => 'xen-tools-test' );
-
-        ok( $xt->isa('Xen::Tools') );
-    };
-}
-
-done_testing();