Call it a release (4.2.1)

Move KNOWN_BUGS items to 4.3

AUTHORS

@@ -33,6 +33,9 @@ Contributions
   Stefan Fritsch  <sf [at] de.sfritsch>
    - Contributed the policy-rc.d fixups for common.sh
 
+  Raphaël Halimi <raphael.halimi [at] com.gmail>
+    - Contribute bashism fix
+
   Sven Hertge <sven [at] de.svenhartge>
    - Bugfix for Debian/Gentoo package installation.
 
@@ -62,6 +65,9 @@ Contributions
   Nathan O'Sullivan <nathan [at] au.com.mammoth>
    - New features wrt. options and helper functions
 
+  Guillaume Pernot <gpernot [at] org.praksys>
+    - Fixed Sarge amd64 special case
+
   Walter Reiner <walter [at] at.wreiner>
    - Provided --image-dev + --swap-dev patch.
 

KNOWN_BUGS

@@ -1,6 +1,6 @@
 KNOWN BUGS in xen-tools
 
-Bugs to fix before a 4.2 release
+Bugs to fix before a 4.3 release
 --------------------------------
 
 * xen-delete-image doesn't remove all logical volumes if --partitions is used.

Makefile

@@ -14,7 +14,7 @@
 #
 TMP        ?= /tmp
 DIST_PREFIX = ${TMP}
-VERSION     = 4.2
+VERSION     = 4.2.1
 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; \

bin/xen-create-image

@@ -806,7 +806,7 @@ my $FAIL = 0;
 #
 # Release number.
 #
-my $RELEASE = '4.2';
+my $RELEASE = '4.2.1';
 
 
 #
@@ -1560,6 +1560,10 @@ sub checkOption
             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]?)$/,
             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]?))$/,
+            message => "must be valid IPv4 or the keyword 'auto'.\n",
+        },
         hostname => {
             check   => qr/^[a-z0-9][a-z0-9.-]{0,254}$/i,
             message => "must be a valid hostname.\n",
@@ -1624,7 +1628,7 @@ sub checkOption
         output        => 'existingDir',
         extension     => 'filename',
         mac           => 'mac',
-        ip            => 'ipv4',
+        ip            => 'ipv4_or_auto',
         hash_method   => 'hashMethod',
     );
 
@@ -1918,9 +1922,10 @@ sub checkArguments
     #  Sarge amd64 needs different default mirror
     #
     if ( $CONFIG{ 'dist' } =~ /sarge/ and
+         $CONFIG{ 'arch' } =~ /amd64/ and
          $CONFIG{ 'mirror_sarge' } eq 'http://archive.debian.org/debian' )
     {
-        $CONFIG{ 'mirror_sarge' } = 'http://amd64.debian.net/debian';
+        $CONFIG{ 'mirror_sarge' } = 'http://archive.debian.org/debian-amd64';
     }
 
     #
@@ -3727,12 +3732,6 @@ sub runCustomisationHooks
     } else {
         unlink "$MOUNT_POINT/etc/resolv.conf";
     }
-
-    #
-    #  Unmount /proc and /dev/pts in the guest install.
-    #
-    runCommand("umount $MOUNT_POINT/proc");
-    runCommand("umount $MOUNT_POINT/dev/pts");
 }
 
 
@@ -4261,6 +4260,12 @@ sub unMountImage
 {
     my ($point) = (@_);
 
+    #
+    #  First we unmount /proc and /dev/pts in the guest install.
+    #
+    runCommand("umount $MOUNT_POINT/proc");
+    #runCommand("umount $MOUNT_POINT/dev/pts");
+
     #
     #  Open /proc/mount and get a list of currently mounted paths
     # which begin with our mount point.

bin/xen-create-nfs

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

bin/xen-delete-image

@@ -171,7 +171,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.2';
+my $RELEASE = '4.2.1';
 
 
 

bin/xen-list-images

@@ -101,7 +101,7 @@ $CONFIG{ 'prefix' } = "/etc/xen";
 #
 # Release number.
 #
-my $RELEASE = '4.2';
+my $RELEASE = '4.2.1';
 
 
 

bin/xen-resize-guest

@@ -116,7 +116,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.2';
+my $RELEASE = '4.2.1';
 
 
 

bin/xen-update-image

@@ -120,7 +120,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.2';
+my $RELEASE = '4.2.1';
 
 
 #

bin/xt-create-xen-config

@@ -156,7 +156,7 @@ $CONFIG{ 'extension' } = '.cfg';
 #
 # Release number.
 #
-my $RELEASE = '4.2';
+my $RELEASE = '4.2.1';
 
 
 

bin/xt-customize-image

@@ -98,7 +98,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.2';
+my $RELEASE = '4.2.1';
 
 
 

bin/xt-guess-suite-and-mirror

@@ -80,7 +80,7 @@ use strict;
 #
 # Release number.
 #
-my $RELEASE = '4.2';
+my $RELEASE = '4.2.1';
 
 # Init
 my $mirror = '';

bin/xt-install-image

@@ -117,7 +117,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.2';
+my $RELEASE = '4.2.1';
 
 
 #

debian/changelog

@@ -1,3 +1,17 @@
+xen-tools (4.2.1-1) unstable; urgency=low
+
+  * New upstream release
+    - Fixes bashism in "editor" roles script. Thanks Raphaël Halimi for
+      the patch! (Closes: #605203)
+    - Fixes missing architecture check in Sarge amd64 special case. Thanks
+      to Guillaume Pernot! (Closes: #611397) Also changes default Sarge
+      amd64 mirror to http://archive.debian.org/debian-amd64/.
+    - Allows --ip=auto again (Closes: #611407)
+    - Unmounts /proc and /dev/pts of the freshly installed DomU just
+      before unmounting the disk image. (Closes: #588783)
+
+ -- Axel Beckert <abe@debian.org>  Thu, 17 Mar 2011 01:00:47 +0100
+
 xen-tools (4.2-1) unstable; urgency=low
 
   * New upstream release

roles/editor

@@ -61,8 +61,7 @@ for i in `find ${source} -name '*.sed' -print`; do
    #
    #  Get the name of the file, minus the source prefix
    #
-   sourcelen=${#source}
-   file=/${i:$sourcelen}
+   file=${i#$source}
 
    #
    #  Strip the .sed suffix