Declare this as 4.4 RC1

(which is fine)

Makefile

@@ -14,7 +14,7 @@
 #
 TMP        ?= /tmp
 DIST_PREFIX = ${TMP}
-VERSION     = 4.4beta1
+VERSION     = 4.4rc1
 DEBVERSION  = $(shell echo $(VERSION)|sed 's/\(rc\|pre\|beta\|alpha\)/~\1/')
 BASE        = xen-tools
 VCS         = git
@@ -202,6 +202,7 @@ install-hooks:
 	-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
 

bin/xen-create-image

@@ -134,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.
@@ -418,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.
@@ -798,6 +806,8 @@ 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;
 
 
@@ -831,7 +841,7 @@ my $MOUNT_POINT = undef;
 #
 # Release number.
 #
-my $RELEASE = '4.4beta1';
+my $RELEASE = '4.4rc1';
 
 
 #
@@ -1334,7 +1344,7 @@ sub setupDefaultOptions
         $CONFIG{ 'mirror_'.$debdist } = 'http://http.debian.net/debian-archive/debian';
     }
     # Initialize per distribution mirror defaults: Ubuntu
-    foreach my $ubuntudist (qw(lucid precise quantal raring saucy)) {
+    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 hardy intrepid jaunty karmic maverick natty oneiric)) {
@@ -1427,8 +1437,8 @@ sub checkOption
     # Define argument types
     my %types = (
         integerWithSuffix => {
-            check   => qr/^[0-9.]+[GMk]B?$/i,
+            check   => qr/^[0-9.]+[GM]B?$/i,
-            message => "takes a suffixed (mb, MB, G, k, etc.) integer.\n",
+            message => "takes a suffixed (mb, MB, G, etc.) integer.\n",
         },
         distribution => {
             check   => sub { -d "/usr/share/xen-tools/$_[0].d" },
@@ -1509,6 +1519,7 @@ sub checkOption
         swap          => 'integerWithSuffix',
         image         => 'imageType',
         memory        => 'integerWithSuffix',
+        maxmem        => 'integerWithSuffix',
         kernel        => 'existingFile',
         initrd        => 'existingFile',
         modules       => 'existingDir',
@@ -1607,6 +1618,7 @@ sub parseCommandLineArguments
             "noswap",   \&checkOption,
             "image=s",  \&checkOption,
             "memory=s", \&checkOption,
+            "maxmem=s", \&checkOption,
             "vcpus=i",  \&checkOption,
 
             # Locations
@@ -2639,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");
@@ -3927,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
         {
@@ -4233,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

@@ -121,7 +121,7 @@ $CONFIG{ 'template' } = '/etc/xen-tools/xm-nfs.tmpl';
 #
 # Release number.
 #
-my $RELEASE = '4.4beta1';
+my $RELEASE = '4.4rc1';
 
 
 # store version number away.

bin/xen-delete-image

@@ -56,7 +56,8 @@ 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.
@@ -163,7 +164,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.4beta1';
+my $RELEASE = '4.4rc1';
 
 
 #
@@ -309,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;
+        print "Error: --test only works with --dir.\n";
-        $CONFIG{ 'evms' } = undef;
+        exit 1;
     }
 
     #
@@ -334,7 +335,7 @@ sub checkArguments
         print " --dir\n";
         print " --evms\n";
         print " --lvm\n";
-        exit;
+        exit 2;
     }
 }
 

bin/xen-list-images

@@ -106,7 +106,7 @@ $CONFIG{ 'extension' } = '.cfg';
 #
 # Release number.
 #
-my $RELEASE = '4.4beta1';
+my $RELEASE = '4.4rc1';
 
 
 
@@ -249,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;
         }
@@ -264,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

@@ -111,7 +111,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.4beta1';
+my $RELEASE = '4.4rc1';
 
 
 #

bin/xen-update-image

@@ -113,7 +113,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.4beta1';
+my $RELEASE = '4.4rc1';
 
 
 #

bin/xt-create-xen-config

@@ -148,7 +148,7 @@ $CONFIG{ 'extension' } = '.cfg';
 #
 # Release number.
 #
-my $RELEASE = '4.4beta1';
+my $RELEASE = '4.4rc1';
 
 
 
@@ -369,11 +369,23 @@ sub createXenConfig
     #
     #  Remove any trailing Mb.
     #
-    if ( $ENV{ 'memory' } =~ /^(\d+)Mb?.*$/i )
+    $ENV{ 'memory' } =~ s/^(\d+)Mb?.*$/$1/i;
-    {
-        $ENV{ 'memory' } = $1;
-    }
 
+    #
+    #  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

@@ -91,7 +91,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.4beta1';
+my $RELEASE = '4.4rc1';
 
 
 

bin/xt-guess-suite-and-mirror

@@ -79,7 +79,7 @@ use strict;
 #
 # Release number.
 #
-my $RELEASE = '4.4beta1';
+my $RELEASE = '4.4rc1';
 
 # Init
 my $mirror = '';

bin/xt-install-image

@@ -112,7 +112,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.4beta1';
+my $RELEASE = '4.4rc1';
 
 
 #

debian/changelog

@@ -1,3 +1,42 @@
+xen-tools (4.4~rc1-1) unstable; urgency=low
+
+  * 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

debian/control

@@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 9~),
                libtest-pod-coverage-perl,
                libtest-pod-perl,
                libtext-template-perl
-Standards-Version: 3.9.4
+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
@@ -28,6 +28,7 @@ Depends: debootstrap | cdebootstrap,
          libdata-validate-uri-perl,
          libfile-slurp-perl,
          libfile-which-perl,
+         libterm-ui-perl | perl (<< 5.17.0),
          libtext-template-perl,
          openssh-client,
          perl-modules,

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,10 +273,10 @@ 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_squeeze = http://http.debian.net/debian
-# mirror_wheezy = http://cdn.debian.net/debian
+# mirror_wheezy = http://http.debian.net/debian
-# mirror_jessie = http://cdn.debian.net/debian
+# mirror_jessie = http://http.debian.net/debian
-# mirror_sid = http://cdn.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
@@ -292,6 +293,7 @@ mirror = `xt-guess-suite-and-mirror --mirror`
 # 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"
+      if [ -e "${daemonfile}" ]; then
-      echo '#!/bin/sh' > "${daemonfile}"
+         mv "${daemonfile}" "${daemonfile}.REAL"
-      echo "echo \"Warning: Fake ${starter} called, doing nothing\"" >> "${daemonfile}"
+         echo '#!/bin/sh' > "${daemonfile}"
+         echo "echo \"Warning: Fake ${starter} called, doing nothing\"" >> "${daemonfile}"
 
-      chmod 755 "${daemonfile}"
+         chmod 755 "${daemonfile}"
-      logMessage "${starter} disabled / made a stub."
+         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
+    if [ -n "${p2p}" ]; then
-        point="pointopoint ${p2p}"
+        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}
+${bcast}
- ${point}
+${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/Common.pm

@@ -2,6 +2,8 @@
 
 package Xen::Tools::Common;
 
+=encoding utf8
+
 =head1 NAME
 
 Xen::Tools::Common - Common funtions used in xen-tools' Perl scripts
@@ -402,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.
 

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