Release as xen-tools 4.7

Also upload to Debian as 4.7-1.
release-testing: Add some helpful output and raise waiting time to 10 seconds
2026-02-20 05:45:15 +00:00 · 2017-01-23 00:41:40 +01:00 · 2017-01-17 21:20:01 +01:00 · 2017-01-17 21:06:39 +01:00 · 2017-01-17 20:46:44 +01:00 · 2017-01-17 20:45:44 +01:00
74 changed files with 326 additions and 180 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@
 /build-stamp
 /configure-stamp
 /man
+/debian/*-stamp
 /debian/files
 /debian/xen-tools
 /debian/xen-tools.debhelper.log
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,6 @@
 language: perl
 perl:
+  - "5.24"
  - "5.22"
  - "5.20"
  - "5.18"
--- a/2
+++ b/2
@@ -65,7 +65,7 @@ Contributions
   - Added hook for automatic CFEngine installation.

  Sascha Kettler <kettler [at] net.gmx>
-   - Implemented support for arbitary partitioning schemes.
+   - Implemented support for arbitrary partitioning schemes.

  Eric Lemoine <eric.lemoine [at] com.gmail>
   - Improved binary detection and good suggestions.
--- a/2
+++ b/2
@@ -19,7 +19,7 @@ The text of both of these licenses follows below.

 Steve
 --
-http://www.steve.org.uk/
+https://steve.fi/



--- a/9
+++ b/9
@@ -6,7 +6,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 #

 #
@@ -14,7 +14,7 @@
 #
 TMPDIR     ?= /tmp
 DIST_PREFIX = ${TMPDIR}
-VERSION     = 4.6.2
+VERSION     = 4.7
 DEBVERSION  = $(shell echo $(VERSION)|sed 's/\(rc\|pre\|beta\|alpha\)/~\1/')
 BASE        = xen-tools
 VCS         = git
@@ -181,6 +181,8 @@ install-hooks:
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d wheezy.d
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d jessie.d
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d stretch.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d buster.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d bullseye.d
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d sid.d
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d unstable.d
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d testing.d
@@ -214,6 +216,9 @@ install-hooks:
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d vivid.d
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d wily.d
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d xenial.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d yakkety.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d zesty.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d devel.d
 	cp hooks/common.sh ${prefix}/usr/share/xen-tools
 	cp -r hooks/common ${prefix}/usr/share/xen-tools

--- a/NEWS.markdown
+++ b/NEWS.markdown
@@ -1,3 +1,65 @@
+xen-tools 4.7 (released 23 Jan 2017)
+====================================
+
+New Features
+------------
+
+New keywords in distributions.conf: default-keyring, dont-test
+
+* Support situations where distributions (e.g. Squeeze) might be end
+  of life, but its archive signing key is still not removed from the
+  default keyring. (As of this writing, that's the case for Debian 6
+  Squeeze on Debian 8 Jessie.)
+
+Bug Fixes
+---------
+
+* Fixes reported error code in case of subcommand failure (Reported
+  and fixed by Yuri Sakhno, thanks!)
+* Fixes inconsistent/non-functional handling of --nopygrub parameter.
+  Thanks Daniel Reichelt for the bug report and patch! (Closes
+  Debian bug report #842609)
+* Fixes possible missing gateway in generated /etc/network/interfaces.
+  Thanks Santiago Vila for the bug report and patch! (Closes Debian
+  bug report #764625)
+* Fixes typo found by Lintian.
+* Work around LVM related race condition when using --force with LVM:
+  If an "lvremove" is immediately followed by an "lvcreate" for an LV
+  with the same name, "mkswap" (and maybe other commands) occasionally
+  fail with "Device or resource busy". Work around it by using sync
+  and sleep.
+
+Distribution Releases Changes
+-----------------------------
+
+* Support for Ubuntu 16.10 Yakkety Yak.
+* Preliminary support for Ubuntu 17.04 Zesty Zapus.
+* Knows about code names for Debian 10 (Buster) and 11 (Bullseye).
+* Considers Debian Squeeze, Ubuntu Vivid and Wily being EoL.
+* Knows about Ubuntu's "devel" alias.
+
+Other Changes
+-------------
+
+* Risen default values for RAM sizes in /etc/xen-tools/xen-tools.cfg
+  to cope with risen resource consumption and availability. (Closes
+  Debian bug report #776487)
+* Default file system is now ext4 (instead of ext3).
+
+Test Suite
+----------
+
+* release-testing:
+  + Mitigate race conditions with immediately re-used LVs:
+    - Use per-test-unique host names.
+    - Delete potential old images by testing xen-delete-image before
+      calling xen-create-image. Add sync and sleep calls inbetween
+      those two commands, too.
+  + Use "set -e" instead of "|| break".
+  + Declare testability in distributions.conf instead of hardcoding
+    it. Mark buster and bullseye as not testable, too, for now.
+
+
 xen-tools 4.6.2 (released 23 Dec 2015)
 ======================================

@@ -71,7 +133,7 @@ Distribution Releases Changes
 -----------------------------

 * Debian 9 Stretch (preliminary support)
-* Ubuntu 15.10 Wily Werewolf (preliminary support; not yet suported by
+* Ubuntu 15.10 Wily Werewolf (preliminary support; not yet supported by
  debootstrap, see Debian bug report #787117)
 * Ubuntu 10.04 Lucid Lynx is now EoL.
 * Ubuntu 14.10 Utopic Unicorn is now EoL.
@@ -333,7 +395,7 @@ New Features and Major Changes
 * Also supports `cdebootstrap`
 * Preliminary btrfs support.
 * Uses GeoIP for Debian mirrors: Default Debian mirror is now
-  `cdn.debian.net`, see http://wiki.debian.org/DebianGeoMirror for
+  `cdn.debian.net`, see https://wiki.debian.org/DebianGeoMirror for
  details.
 * New helper program `xt-guess-suite-and-mirror`, used to find the
  default mirror and suite.
--- a/README.markdown
+++ b/README.markdown
@@ -3,12 +3,12 @@ xen-tools

 [![Travis CI Build Status](https://api.travis-ci.org/xen-tools/xen-tools.svg)](https://travis-ci.org/xen-tools/xen-tools)

-* [Homepage](http://www.xen-tools.org/software/xen-tools)
-* Offical Git Repositories:
-  * [at GitHub](http://github.com/xen-tools/xen-tools) (primary, includes [Issue Tracker](https://github.com/xen-tools/xen-tools/issues))
-  * [at GitLab](http://gitlab.com/xen-tools/xen-tools) (secondary, doesn't support the `git://` protocol.)
-* Historical Git Repository: [at Gitorious](http://gitorious.org/xen-tools) (_outdated_, no more updated, for historical reference only)
-* [Mailing Lists](http://www.xen-tools.org/software/xen-tools/lists.html)
+* [Homepage](https://www.xen-tools.org/software/xen-tools)
+* Official Git Repositories:
+  * [at GitHub](https://github.com/xen-tools/xen-tools) (primary, includes [Issue Tracker](https://github.com/xen-tools/xen-tools/issues))
+  * [at GitLab](https://gitlab.com/xen-tools/xen-tools) (secondary, doesn't support the `git://` protocol.)
+* Historical Git Repository: [at Gitorious](https://gitorious.org/xen-tools) (_outdated_, no more updated, for historical reference only)
+* [Mailing Lists](https://www.xen-tools.org/software/xen-tools/lists.html)

 About
 -----
@@ -21,7 +21,7 @@ Using this software, you can easily create new
 network via [OpenSSH](http://www.openssh.org/).

 xen-tools currently has scripts to install most releases of
-[Debian](http://www.debian.org/) (starting with 3.1 "Sarge") and
+[Debian](https://www.debian.org/) (starting with 3.1 "Sarge") and
 [Ubuntu](http://www.ubuntu.com/) (starting with 6.06 LTS "Dapper") and
 some RPM-based distributions. On the Dom0 side all current Xen
 supporting distributions should work.
@@ -38,6 +38,8 @@ known to work reliably, i.e.:
 * Wheezy 7
 * Jessie 8
 * Stretch 9 (under development)
+* Buster 10 (knows about this future release name)
+* Bullseye 11 (knows about this future release name)
 * Sid (always under development; works at least at the moment of writing :-)

 ### Ubuntu
@@ -64,9 +66,11 @@ known to work reliably, i.e.:
 * Utopic Unicorn 14.10
 * Vivid Vervet 15.04
 * Wily Werewolf 15.10
-* Xenial Xerus 16.04 (under development, LTS)
+* Xenial Xerus 16.04 (LTS)
+* Yakkety Yak 16.10
+* Zesty Zapus 17.04 (under development)

-[1]: http://bugs.debian.org/659360
+[1]: https://bugs.debian.org/659360
    "debootstrap in Wheezy can no more build Ubuntu Edgy or earlier"

 [2]: http://www.linux-vserver.org/Installing_Ubuntu_8.04_Hardy_as_guest
@@ -92,33 +96,33 @@ Requirements

 To use these tools you'll need the following software:

-* [debootstrap](http://packages.debian.org/debootstrap)
+* [debootstrap](https://packages.debian.org/debootstrap)
 * 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))
+  * [Config::IniFiles](https://metacpan.org/release/Config-IniFiles)
+	([Debian Package libconfig-inifiles-perl](https://packages.debian.org/libconfig-inifiles-perl))
+  * [Text::Template](https://metacpan.org/release/Text-Template)
+	([Debian Package libtext-template-perl](https://packages.debian.org/libtext-template-perl))
+  * [Data::Validate::Domain](https://metacpan.org/release/Data-Validate-Domain)
+	([Debian Package libdata-validate-domain-perl](https://packages.debian.org/libdata-validate-domain-perl))
+  * [Data::Validate::IP](https://metacpan.org/release/Data-Validate-IP)
+	([Debian Package libdata-validate-ip-perl](https://packages.debian.org/libdata-validate-ip-perl))
+  * [Data::Validate::URI](https://metacpan.org/release/Data-Validate-URI)
+	([Debian Package libdata-validate-uri-perl](https://packages.debian.org/libdata-validate-uri-perl))
+  * [File::Slurp](https://metacpan.org/release/File-Slurp)
+	([Debian Package libfile-slurp-perl](https://packages.debian.org/libfile-slurp-perl))
+  * [File::Which](https://metacpan.org/release/File-Which)
+	([Debian Package libfile-which-perl](https://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
 Fedora Core, but you will need a correctly installed and configured
-[rinse](http://packages.debian.org/rinse) package. This is currently
+[rinse](https://packages.debian.org/rinse) package. This is currently
 not fully supported.

 If you wish to create new Xen instances which may be controlled by
 users via a login shell you can have a look at the (currently
-unmaintained) [xen-shell](http://xen-tools.org/software/xen-shell/)
+unmaintained) [xen-shell](https://xen-tools.org/software/xen-shell/)
 project.


@@ -239,7 +243,7 @@ test case would be a useful bonus.
 ### Known/Open Issues

 * [xen-tools Issue Tracker at GitHub](https://github.com/xen-tools/xen-tools/issues/new)
-* [Mailing list archives of the xen-tools mailing lists](http://xen-tools.org/software/xen-tools/lists.html)
+* [Mailing list archives of the xen-tools mailing lists](https://xen-tools.org/software/xen-tools/lists.html)
 * [TODO file in the source code](https://github.com/xen-tools/xen-tools/blob/master/TODO.markdown)
 * [xen-tools in the Debian Bug Tracking System](https://bugs.debian.org/xen-tools)
 * [xen-tools in Ubuntu's Launchpad](https://bugs.launchpad.net/ubuntu/+source/xen-tools)
--- a/SUPPORT.markdown
+++ b/SUPPORT.markdown
@@ -3,11 +3,11 @@ Mailing List

 For assistance on using, or customising, these scripts please consult
 the manpages initially, then the
-[website](http://xen-tools.org/software/xen-tools/).
+[website](https://xen-tools.org/software/xen-tools/).

 If these are not sufficient resources please consider posting any
 queries you might have to the [mailing
-list](http://xen-tools.org/software/xen-tools/lists.html)
+list](https://xen-tools.org/software/xen-tools/lists.html)

 Included with the release you should find the file `BUGS.markdown`
 which contains some notes on reporting bugs.
@@ -18,13 +18,13 @@ Xen Queries

 If your query is mostly related to Xen, rather than these tools, then
 please consider joining the [xen-users mailing
-list](http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-users)
+list](https://lists.xenproject.org/cgi-bin/mailman/listinfo/xen-users)

 The members of that list are very good at diagnosing issues with
 networking, block devices, and other Xen oddities.

 There's also the IRC channel `##xen` (the double hashmark is not a
- typo) on the [Freenode](http://freenode.net/) IRC network.
+ typo) on the [Freenode](https://freenode.net/) IRC network.


 Contact The Author
@@ -34,7 +34,7 @@ As a last resort you can to contact the current maintainer, Axel
 Beckert, at <abe@deuxchevaux.org>.

 As the previous xen-tools maintainer and original author, Steve
-Kemp, said, I say last resort not because I'm unwilling to help, but
+Kemp, said, I say "last resort" not because I'm unwilling to help, but
 because it may take longer for me to respond to you personally.

 -- 
--- a/TODO.markdown
+++ b/TODO.markdown
@@ -7,6 +7,8 @@ Most things which used to be in here were moved to
 Bugs to fix and features to add for 5.0
 ---------------------------------------

+* Fix xdm and gdm roles wrt. to uptodate package names.
+
 * Test and support more file system types.

  Actually this should be pretty simple now that the parameters are
--- a/bin/xen-create-image
+++ b/bin/xen-create-image
@@ -776,9 +776,9 @@ Install an X11 server, using VNC and XDM

 =head1 AUTHORS

- Steve Kemp, http://www.steve.org.uk/
- Axel Beckert, http://noone.org/abe/
- Dmitry Nedospasov, http://nedos.net/
+ Steve Kemp, https://steve.fi/
+ Axel Beckert, https://axel.beckert.ch/
+ Dmitry Nedospasov, http://www.nedos.net/
 Stéphane Jourdois


@@ -859,7 +859,7 @@ my $MOUNT_POINT = undef;
 #
 # Release number.
 #
-my $RELEASE = '4.6.2';
+my $RELEASE = '4.7';


 #
@@ -1159,7 +1159,7 @@ exit 0;
  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
+  This means that the companion scripts xt-* are present on the
 host and executable.

 =end doc
@@ -1177,13 +1177,13 @@ sub checkSystem
    eval($test);
    if ( ($@) && ( !$CONFIG{ 'force' } ) )
    {
-        print <<E_O_ERROR;
+        print <<EOERROR;

  Aborting:  The Text::Template perl module isn\'t installed or available.

  Specify '--force' to skip this check and continue regardless.

-E_O_ERROR
+EOERROR
        $CONFIG{'FAIL'} = 1;
        exit 127;
    }
@@ -1292,7 +1292,9 @@ sub setupDefaultOptions
                    $CONFIG{ 'mirror_'.$debdist } = $MIRROR{$dist.'_archive'} or
                        die $dist.'_archive not defined in /etc/xen-tools/mirrors.conf';
                    my $removed_keys = "/usr/share/keyrings/$dist-archive-removed-keys.gpg";
-                    $CONFIG{ 'keyring_'.$debdist } = $removed_keys if -s $removed_keys;
+                    if ($debdistinfo !~ /default-keyring/ and -s $removed_keys) {
+                        $CONFIG{ 'keyring_'.$debdist } = $removed_keys;
+                    }
                } else {
                    $CONFIG{ 'mirror_'.$debdist } = $MIRROR{$dist} or
                        die $dist.' not defined in /etc/xen-tools/mirrors.conf';
@@ -1341,7 +1343,7 @@ sub setupDefaultOptions
    #
    # NOTE 2:  Each of these scripts will "force" the creation of a new
    #         filesystem, even if it exists.  This script must detect
-    #         prior existance itself.
+    #         prior existence itself.
    #
    $CONFIG{ 'make_fs_ext2' }     = 'mkfs.ext2 -F';
    $CONFIG{ 'make_fs_ext3' }     = 'mkfs.ext3 -F';
@@ -3064,6 +3066,10 @@ sub createLVMBits
                    logprint(
                        "Removing $lvm_disk - since we're forcing the install\n");
                    runCommand("lvremove --force $lvm_disk", \%CONFIG);
+                    runCommand("sync", \%CONFIG);
+                    logprint(
+                        "Sleeping a few seconds to avoid LVM race conditions...\n");
+                    sleep(3);
                } else {
                    fail("ERROR: Xen guest $CONFIG{'hostname'} appears to be running.\nAborting.\n");
                }
@@ -3161,7 +3167,7 @@ sub createLVMBits

  This function is responsible for creating two new logical volumes within
 a given EVMS container group (which at the moment is either LVM or LVM2), but
- should be compatible with any further extentions of evms.
+ should be compatible with any further extensions of evms.

 =end doc

@@ -3618,7 +3624,7 @@ sub runCustomisationHooks
    delete $ENV{ 'ip' };

    #
-    # Setup a seperate ip$count value for each IP address.
+    # Setup a separate ip$count value for each IP address.
    #
    my $ips   = $CONFIG{ 'ip' };
    my $count = 1;
--- a/bin/xen-create-nfs
+++ b/bin/xen-create-nfs
@@ -74,12 +74,12 @@ Show the version number and exit.
  For more details on what you'll need to support NFS-root Xen guests
 the following article, written by the author, might be useful:

-    http://www.debian-administration.org/articles/505
+    https://debian-administration.org/articles/505


 =head1 AUTHORS

- Steve Kemp, http://www.steve.org.uk/
+ Steve Kemp, https://steve.fi/
 Stéphane Jourdois


@@ -121,7 +121,7 @@ $CONFIG{ 'template' } = '/etc/xen-tools/xm-nfs.tmpl';
 #
 # Release number.
 #
-my $RELEASE = '4.6.2';
+my $RELEASE = '4.7';


 # store version number away.
@@ -282,7 +282,7 @@ sub testArguments
    die "Missing NFS root."   unless ( $CONFIG{ 'nfs_root' } );


-    # Shorthack to fix http://bugs.debian.org/648814 -- xen-create-nfs
+    # Shorthack to fix https://bugs.debian.org/648814 -- xen-create-nfs
    # should better use xt-create-xen-config instead. Guess from where
    # this code is borrowed for now...

--- a/bin/xen-delete-image
+++ b/bin/xen-delete-image
@@ -126,8 +126,8 @@ Show the version number and exit.

 =head1 AUTHORS

- Steve Kemp, http://www.steve.org.uk/
- Axel Beckert, http://noone.org/abe/
+ Steve Kemp, https://steve.fi/
+ Axel Beckert, https://axel.beckert.ch/
 Stéphane Jourdois


@@ -163,7 +163,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.6.2';
+my $RELEASE = '4.7';


 #
--- a/bin/xen-list-images
+++ b/bin/xen-list-images
@@ -64,7 +64,7 @@ Show the version number and exit.

 =head1 AUTHORS

- Steve Kemp, http://www.steve.org.uk/
+ Steve Kemp, https://steve.fi/
 Stéphane Jourdois


@@ -106,7 +106,7 @@ $CONFIG{ 'extension' } = '.cfg';
 #
 # Release number.
 #
-my $RELEASE = '4.6.2';
+my $RELEASE = '4.7';



@@ -212,7 +212,7 @@ sub findXenInstances

 =begin doc

-  Show details about the the Xen instance contained in the given
+  Show details about the Xen instance contained in the given
 configuration file.

 =end doc
--- a/bin/xen-resize-guest
+++ b/bin/xen-resize-guest
@@ -75,8 +75,8 @@ Show the version number and exit.

 =head1 AUTHORS

- Steve Kemp, http://www.steve.org.uk/
- Axel Beckert, http://noone.org/abe/
+ Steve Kemp, https://steve.fi/
+ Axel Beckert, https://axel.beckert.ch/


 =head1 LICENSE
@@ -111,7 +111,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.6.2';
+my $RELEASE = '4.7';


 #
@@ -340,7 +340,7 @@ sub parseCommandLineArguments

    #
    #  Setup mutually exclusive options in such a way that
-    # they will allow the configuration values to be overriden by
+    # they will allow the configuration values to be overridden by
    # the command line.
    #
    if ( $install{ 'lvm' } )
--- a/bin/xen-update-image
+++ b/bin/xen-update-image
@@ -75,8 +75,8 @@ Show the version number and exit.

 =head1 AUTHORS

- Steve Kemp, http://www.steve.org.uk/
- Axel Beckert, http://noone.org/abe/
+ Steve Kemp, https://steve.fi/
+ Axel Beckert, https://axel.beckert.ch/
 Stéphane Jourdois


@@ -113,7 +113,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.6.2';
+my $RELEASE = '4.7';


 #
--- a/bin/xt-create-xen-config
+++ b/bin/xt-create-xen-config
@@ -99,8 +99,8 @@ xt-create-config - Create a Xen configuration file for a new guest

 =head1 AUTHORS

- Steve Kemp, http://www.steve.org.uk/
- Axel Beckert, http://noone.org/abe/
+ Steve Kemp, https://steve.fi/
+ Axel Beckert, https://axel.beckert.ch/
 Stéphane Jourdois


@@ -148,7 +148,7 @@ $CONFIG{ 'extension' } = '.cfg';
 #
 # Release number.
 #
-my $RELEASE = '4.6.2';
+my $RELEASE = '4.7';



@@ -254,7 +254,7 @@ sub checkArguments
    if ( !-d $CONFIG{ 'output' } )
    {
        print
-          "The output directory we've been given, $CONFIG{'output'}, doesnt exist\n";
+          "The output directory we've been given, $CONFIG{'output'}, doesn't exist\n";
        print "Aborting\n";
        exit 1;
    }
--- a/bin/xt-customize-image
+++ b/bin/xt-customize-image
@@ -29,7 +29,7 @@ xt-customize-image - Customize a freshly installed copy of GNU/Linux
 =head1 NOTES

  This script is invoked by xen-create-image after it has created a
- fresh installation of Linux withing a temporary location.
+ fresh installation of Linux within a temporary location.

  This script will be invoked with a full copy of the arguments from
 xen-create-image in its environment, along with several command line
@@ -66,8 +66,8 @@ xt-customize-image - Customize a freshly installed copy of GNU/Linux

 =head1 AUTHORS

- Steve Kemp, http://www.steve.org.uk/
- Axel Beckert, http://noone.org/abe/
+ Steve Kemp, https://steve.fi/
+ Axel Beckert, https://axel.beckert.ch/
 Stéphane Jourdois


@@ -100,7 +100,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.6.2';
+my $RELEASE = '4.7';



--- a/bin/xt-guess-suite-and-mirror
+++ b/bin/xt-guess-suite-and-mirror
@@ -30,7 +30,7 @@ xen-create-image(1) or the backticks feature in xen-tools.conf.

 =head1 AUTHORS

- Axel Beckert, http://noone.org/abe/
+ Axel Beckert, https://axel.beckert.ch/
 Stéphane Jourdois


@@ -79,7 +79,7 @@ use strict;
 #
 # Release number.
 #
-my $RELEASE = '4.6.2';
+my $RELEASE = '4.7';

 # Init
 my $mirror = '';
--- a/bin/xt-install-image
+++ b/bin/xt-install-image
@@ -78,9 +78,9 @@ Untar a .tar file into the new installation location.  This tarfile is assumed t

 =head1 AUTHORS

- Steve Kemp, http://www.steve.org.uk/
- Axel Beckert, http://noone.org/abe/
- Dmitry Nedospasov, http://nedos.net/
+ Steve Kemp, https://steve.fi/
+ Axel Beckert, https://axel.beckert.ch/
+ Dmitry Nedospasov, http://www.nedos.net/
 Stéphane Jourdois


@@ -113,7 +113,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.6.2';
+my $RELEASE = '4.7';


 #
@@ -621,7 +621,7 @@ sub do_debootstrap
    }

    #
-    #  Propogate --verbose appropriately.
+    #  Propagate --verbose appropriately.
    #
    my $EXTRA = '';
    if ( $CONFIG{ 'verbose' } )
@@ -630,7 +630,7 @@ sub do_debootstrap
    }

    #
-    #  Propogate the --arch argument
+    #  Propagate the --arch argument
    #
    if ( $CONFIG{ 'arch' } )
    {
@@ -638,7 +638,7 @@ sub do_debootstrap
    }

    #
-    #  Propogate the --keyring argument
+    #  Propagate the --keyring argument
    #
    if ( $CONFIG{ 'keyring' } )
    {
@@ -701,7 +701,7 @@ sub do_rinse
      "rinse --distribution=$CONFIG{'dist'} --directory=$CONFIG{'location'}";

    #
-    #  Propogate the --arch argument
+    #  Propagate the --arch argument
    #
    if ( $CONFIG{ 'arch' } )
    {
@@ -727,7 +727,7 @@ sub do_rinse
    }

    #
-    #  Propogate the verbosity setting.
+    #  Propagate the verbosity setting.
    #
    if ( $CONFIG{ 'verbose' } )
    {
@@ -751,7 +751,7 @@ sub do_rpmstrap
 {

    #
-    #  Propogate the verbosity setting.
+    #  Propagate the verbosity setting.
    #
    my $EXTRA = '';
    if ( $CONFIG{ 'verbose' } )
@@ -760,7 +760,7 @@ sub do_rpmstrap
    }

    #
-    #  Propogate any arch setting we might have.
+    #  Propagate any arch setting we might have.
    #
    if ( $CONFIG{ 'arch' } )
    {
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -26,7 +26,7 @@ xen-tools (4.2~beta1-1) unstable; urgency=low

  If the DomU hangs with "Waiting for root file system" despite
  /dev/xvd* is used as disk device, adding "xen-blkfront" to
-  /etc/initramfs-tools/modules and runing "update-initramfs -u"
+  /etc/initramfs-tools/modules and running "update-initramfs -u"
  afterwards may help.

  If the Dom0 is a Debian or Ubuntu, the distribution and suite for
@@ -39,4 +39,3 @@ xen-tools (4.2~beta1-1) unstable; urgency=low
  path ending in /debian/ there.

 -- Axel Beckert <abe@debian.org>  Sun, 30 May 2010 22:36:16 +0200
-
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,35 @@
+xen-tools (4.7-1) unstable; urgency=medium
+
+  * New upstream release
+    + release-testing: Several enhancements, race condition avoidance, …
+    + Fixes reported error code in case of subcommand failure (Reported
+      and fixed by Yuri Sakhno, thanks!)
+    + Fixes typo found by lintian.
+    + Support for Ubuntu 16.10 Yakkety Yak.
+    + Preliminary support for Ubuntu 17.04 Zesty Zapus.
+    + Knows future Debian release names Buster (10) and Bullseye (11).
+    + Knows about Ubuntu's "devel" alias.
+    + Risen default values for RAM sizes in /etc/xen-tools/xen-tools.cfg
+      to cope with risen resource consumption and availability.
+      (Closes: #776487)
+    + Default file system is now ext4 (instead of ext3).
+    + Fixes inconsistent/non-functional handling of --nopygrub
+      parameter. Thanks Daniel Reichelt for the bug report and patch!
+      (Closes: #842609)
+    + Fixes possible missing gateway in generated
+      /etc/network/interfaces. (Closes: #764625)
+    + Support situations where distributions (e.g. Squeeze) might be EoL,
+      but its archive signing key is still not removed from the default
+      keyring.
+    + Workaround LVM related race condition when using --force with LVM.
+  * Declare compliance with Debian Policy 3.9.8. (No changes needed.)
+  * Use NEWS.markdown as upstream changelog, don't install it as docs.
+  * Switch many URLs (upstream and in packaging) to https:// and update
+    URLs where they were broken or redirect somewhere else now.
+  * Fix some typos in older debian/changelog and debian/NEWS items.
+
+ -- Axel Beckert <abe@debian.org>  Mon, 23 Jan 2017 00:39:11 +0100
+
 xen-tools (4.6.2-1) unstable; urgency=medium

  * New upstream bugfix release
@@ -263,7 +295,7 @@ xen-tools (4.4~beta1-1) unstable; urgency=low
      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
+  * Add debian/gbp.conf to be able to build xen-tools with
    git-buildpackage.
  * Clean up debian/rules:
    - Don't mention (generated) upstream changelog explicitly,
@@ -551,7 +583,7 @@ xen-tools (3.9-3) unstable; urgency=medium
 xen-tools (3.9-2) unstable; urgency=high

  - Ensure that the hook scripts which setup networking details for
-    Debian & Ubuntu guests will correctly setup teh broadcast address.
+    Debian & Ubuntu guests will correctly setup the broadcast address.

 -- Steve Kemp <skx@debian.org>  Wed, 20 Feb 2007 21:22:23 +0000

@@ -685,7 +717,7 @@ xen-tools (3.1-1) unstable; urgency=low
  [ Steve Kemp ]
  * New upstream release v3.1.
    - Installation of packages in hooks works. (Closes: #402889, #404518)
-    - Xen configuration files are not accidently trashed.  (Closes: #404443)
+    - Xen configuration files are not accidentally trashed.  (Closes: #404443)
    - Hooks are now optional.  (Closes: #404444)
    - Better error handling of image creation. (Closes: #404455, #404516)
    - Avoid copying needless kernel modules to guests.  (Closes: #404508)
--- a/debian/control
+++ b/debian/control
@@ -17,10 +17,10 @@ Build-Depends: debhelper (>= 9~),
               libtest-pod-coverage-perl,
               libtest-pod-perl,
               libtext-template-perl
-Standards-Version: 3.9.6
-Homepage: http://xen-tools.org/software/xen-tools
+Standards-Version: 3.9.8
+Homepage: https://xen-tools.org/software/xen-tools
 Vcs-Browser: https://github.com/xen-tools/xen-tools
-Vcs-Git: git://github.com/xen-tools/xen-tools.git
+Vcs-Git: https://github.com/xen-tools/xen-tools.git
 Testsuite: autopkgtest

 Package: xen-tools
@@ -65,6 +65,8 @@ Description: Tools to manage Xen virtual servers
   * Debian 7 Wheezy
   * Debian 8 Jessie
   * Debian 9 Stretch (under development)
+   * Debian 10 Buster (future release name)
+   * Debian 11 Bullseye (future release name)
   * Debian Sid (Unstable)
   * Ubuntu 6.06 Dapper Drake (LTS)
   * Ubuntu 6.10 Edgy Eft
@@ -86,6 +88,8 @@ Description: Tools to manage Xen virtual servers
   * Ubuntu 14.10 Utopic Unicorn
   * Ubuntu 15.04 Vivid Vervet
   * Ubuntu 15.10 Wily Werewolf
-   * Ubuntu 16.04 Xenial Xerus (preliminary support, under development)
+   * Ubuntu 16.04 Xenial Xerus (LTS)
+   * Ubuntu 16.10 Yakkety Yak
+   * Ubuntu 17.04 Zesty Zapus (preliminary support, under development)
   * CentOS 5
   * CentOS 6
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 This package was debianized by Radu Spineanu <radu@debian.org> on
 Tue, 20 Dec 2005 02:21:05 +0200.

-It was downloaded from http://xen-tools.org/software/xen-tools/
+It was downloaded from https://xen-tools.org/software/xen-tools/

 Copyright 2005-2009: Steve Kemp <steve@steve.org.uk>
 Copyright 2010-2013: The Xen-Tools Development Team, currently consisting of:
--- a/debian/docs
+++ b/debian/docs
@@ -2,4 +2,3 @@ AUTHORS
 README.markdown
 SUPPORT.markdown
 TODO.markdown
-NEWS.markdown
--- a/debian/rules
+++ b/debian/rules
@@ -8,4 +8,7 @@
 override_dh_auto_test:
 	make non-author-test

+override_dh_installchangelogs:
+	dh_installchangelogs NEWS.markdown
+
 override_dh_auto_build:
--- a/debian/watch
+++ b/debian/watch
@@ -12,5 +12,5 @@ version=3
 # to match release tarballs.
 #
 opts=pgpsigurlmangle=s/$/.asc/ \
-http://xen-tools.org/software/xen-tools/releases.html \
+https://xen-tools.org/software/xen-tools/releases.html \
   xen-tools-([\d\.]+)\.tar\.gz
--- a/etc/distributions.conf
+++ b/etc/distributions.conf
@@ -1,29 +1,33 @@
-# xen-tools configuration file for distibution meta data
+# xen-tools configuration file for distribution meta data
 #
 # Syntax:
 #
 # codename = distribution and further keywords
 #
 # Known distributions: debian, ubuntu
-# Known keywords: eol, pygrub
+# Known keywords: eol, pygrub, default-keyring, dont-test
 #
 sarge        = debian eol
 etch         = debian eol
 lenny        = debian eol
-squeeze      = debian
+squeeze      = debian eol default-keyring
 wheezy       = debian
 jessie       = debian
 stretch      = debian
+buster       = debian dont-test
+bullseye     = debian dont-test
 sid          = debian

 testing      = debian
-oldoldstable = debian
+oldoldstable = debian dont-test
 oldstable    = debian
 stable       = debian
 unstable     = debian

-dapper       = ubuntu eol
-edgy         = ubuntu eol
+# dapper and edgy currently need manual adjustments in debootstrap's
+# configuration, see #659360
+dapper       = ubuntu eol dont-test
+edgy         = ubuntu eol dont-test
 feisty       = ubuntu eol
 gutsy        = ubuntu eol
 hardy        = ubuntu eol
@@ -40,6 +44,10 @@ raring       = ubuntu eol pygrub
 saucy        = ubuntu eol pygrub
 trusty       = ubuntu     pygrub
 utopic       = ubuntu eol pygrub
-vivid        = ubuntu     pygrub
-wily         = ubuntu     pygrub
+vivid        = ubuntu eol pygrub
+wily         = ubuntu eol pygrub
 xenial       = ubuntu     pygrub
+yakkety      = ubuntu     pygrub
+zesty        = ubuntu     pygrub
+
+devel        = ubuntu     pygrub
--- a/etc/xen-tools.conf
+++ b/etc/xen-tools.conf
@@ -7,7 +7,7 @@
 #
 #  For more details please see:
 #
-#        http://xen-tools.org/
+#        https://xen-tools.org/
 #
 ##

@@ -126,11 +126,11 @@ 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
+memory = 256M     # Suffix (G, M, k) required
+#maxmem = 2G      # Suffix (G, M, k) optional
+swap   = 512M     # Suffix (G, M, k) required
 # noswap = 1      # Don't use swap at all for new systems.
-fs     = ext3     # Default file system for any disk
+fs     = ext4     # Default file system for any disk
 dist   = `xt-guess-suite-and-mirror --suite`
                  # Default distribution is determined by Dom0's distribution
 image  = sparse   # Specify sparse vs. full disk images (file based images only)
@@ -170,7 +170,7 @@ image  = sparse   # Specify sparse vs. full disk images (file based images only)
 #

 #
-# Setup bridge name for host vif. Usefull if you use bridged networking
+# Setup bridge name for host vif. Useful if you use bridged networking
 # for guests.
 #
 # bridge = xendmz
--- a/examples/release-testing
+++ b/examples/release-testing
@@ -1,6 +1,24 @@
 #!/bin/sh

-# Skip dapper and edgy due to bug #659360 in debootstrap
-for dist in $(awk '!/^#|^$/ {print $1}' /etc/xen-tools/distributions.conf | egrep -v '^(dapper|edgy)$'); do
-    xen-create-image --dist $dist --force --verbose "$@" || break
-done 2>&1 | tee xen-tools-release-testing.log
+set -e
+
+exec 2>&1 | tee xen-tools-release-testing.log
+
+DISTRIBUTIONS=$(awk '!/^#|^$|dont-test/ {print $1}' /etc/xen-tools/distributions.conf)
+
+echo Deleting old release-testing artefacts
+for dist in $DISTRIBUTIONS; do
+    echo "*** Removing potential xen-tools-release-testing-$dist..."
+    xen-delete-image --verbose --hostname "xen-tools-release-testing-$dist"
+done
+
+echo Syncing...
+sync
+seconds=10
+printf "Sleeping for %i seconds to avoid LVM race conditions: " $seconds
+for i in $(seq 1 $seconds); do sleep 1; printf "%i " $i; done; printf '\n';
+
+for dist in $DISTRIBUTIONS; do
+    echo "*** Creating xen-tools-release-testing-$dist..."
+    xen-create-image --verbose --hostname "xen-tools-release-testing-$dist" --dist $dist --force "$@"
+done
--- a/hooks/centos-5/25-setup-kernel
+++ b/hooks/centos-5/25-setup-kernel
@@ -59,9 +59,9 @@ logMessage "Kernel $KERNELVERSION found"
 logMessage "Creating /boot/grub/menu.lst"
 mkdir -p ${prefix}/boot/grub
 cat > ${prefix}/boot/grub/menu.lst << EOF
-# WARNING : Don't forget to update this when you upgrade kernel !
+# WARNING : Don't forget to update this when you upgrade kernel!
 # You can also exclude kernel-xen from updates by putting
-# exclude=kernel-xen in in [main] in yum.conf
+# exclude=kernel-xen in [main] in yum.conf

 default=0
 timeout=5
--- a/hooks/centos-6/25-setup-kernel
+++ b/hooks/centos-6/25-setup-kernel
@@ -59,9 +59,9 @@ logMessage "Kernel $KERNELVERSION found"
 logMessage "Creating /boot/grub/menu.lst"
 mkdir -p ${prefix}/boot/grub
 cat > ${prefix}/boot/grub/menu.lst << EOF
-# WARNING : Don't forget to update this when you upgrade kernel !
+# WARNING : Don't forget to update this when you upgrade kernel!
 # You can also exclude kernel-xen from updates by putting
-# exclude=kernel-xen in in [main] in yum.conf
+# exclude=kernel-xen in [main] in yum.conf

 default=0
 timeout=5
--- a/hooks/common.sh
+++ b/hooks/common.sh
@@ -210,7 +210,7 @@ timeout         2
 # altoptions=(single-user mode) single

 ## controls how many kernels should be put into the menu.lst
-## only counts the first occurence of a kernel, not the
+## only counts the first occurrence of a kernel, not the
 ## alternative kernel options
 ## e.g. howmany=all
 ##      howmany=7
--- a/hooks/common/01-disable-daemons
+++ b/hooks/common/01-disable-daemons
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/


 prefix=$1
--- a/hooks/common/05-shadowconfig-on
+++ b/hooks/common/05-shadowconfig-on
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/


 prefix=$1
--- a/hooks/common/10-disable-tls
+++ b/hooks/common/10-disable-tls
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/



--- a/hooks/common/15-disable-hwclock
+++ b/hooks/common/15-disable-hwclock
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/


 prefix=$1
--- a/hooks/common/20-setup-yum
+++ b/hooks/common/20-setup-yum
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/


 prefix=$1
--- a/hooks/common/35-setup-users
+++ b/hooks/common/35-setup-users
@@ -9,7 +9,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/


 use strict;
--- a/hooks/common/40-setup-networking-deb
+++ b/hooks/common/40-setup-networking-deb
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/


 prefix=$1
@@ -88,8 +88,9 @@ setupStaticNetworking ()
    #
    # gateway address?
    #
+    gway='';
    if [ -n "${gateway}" ]; then
-      gateway=" gateway ${gateway}"
+      gway=" gateway ${gateway}"
    fi

    #
@@ -107,7 +108,7 @@ iface lo inet loopback
 auto eth0
 iface eth0 inet static
 address ${ip1}
-${gateway}
+${gway}
 netmask ${netmask}
 ${bcast}
 ${point}
--- a/hooks/common/40-setup-networking-rpm
+++ b/hooks/common/40-setup-networking-rpm
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/


 prefix=$1
--- a/hooks/common/50-setup-hostname-deb
+++ b/hooks/common/50-setup-hostname-deb
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/



@@ -63,7 +63,7 @@ EOF
    #
    if [ -z "${dhcp}" ]; then
        #
-        #  If dhcp is diabled, FQDN should resolve to our IP
+        #  If DHCP is disabled, FQDN should resolve to our IP
        #
        cat >> ${prefix}/etc/hosts <<EOF
 ${ip1}    $GUEST_FQDN $GUEST_HOSTNAME
--- a/hooks/common/50-setup-hostname-rpm
+++ b/hooks/common/50-setup-hostname-rpm
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/



--- a/hooks/common/55-create-dev
+++ b/hooks/common/55-create-dev
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/


 prefix=$1
--- a/hooks/common/70-install-ssh-deb
+++ b/hooks/common/70-install-ssh-deb
@@ -8,7 +8,7 @@
 #
 # Dmitry Nedospasov
 # --
-# http://nedos.net/
+# http://www.nedos.net/

 prefix=$1

--- a/hooks/common/70-install-ssh-rpm
+++ b/hooks/common/70-install-ssh-rpm
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/


 prefix=$1
--- a/hooks/common/75-fixup-securetty
+++ b/hooks/common/75-fixup-securetty
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/


 prefix=$1
--- a/hooks/common/80-install-modules-deb
+++ b/hooks/common/80-install-modules-deb
@@ -9,7 +9,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/


 prefix=$1
@@ -31,7 +31,7 @@ fi
 #
 logMessage Script $0 starting

-if [ ${pygrub} ]; then
+if [ "${pygrub}" = "1" ]; then
    logMessage "pygrub set, skipping module install"
 else
 #
--- a/hooks/common/80-install-modules-rpm
+++ b/hooks/common/80-install-modules-rpm
@@ -9,7 +9,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/


 prefix=$1
--- a/hooks/common/82-install-grub-legacy
+++ b/hooks/common/82-install-grub-legacy
@@ -26,7 +26,7 @@ fi
 #
 logMessage Script $0 starting

-if [ ${pygrub} ]; then
+if [ "${pygrub}" = "1" ]; then

 #
 #  Install the grub 0.9x package ("grub-legacy" on Debian, "grub" on Ubuntu)
--- a/hooks/common/90-make-fstab
+++ b/hooks/common/90-make-fstab
@@ -9,7 +9,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/


 prefix=$1
--- a/hooks/common/99-clean-image-deb
+++ b/hooks/common/99-clean-image-deb
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/


 prefix=$1
--- a/hooks/common/99-clean-image-rpm
+++ b/hooks/common/99-clean-image-rpm
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/


 prefix=$1
--- a/hooks/common/99-enable-daemons
+++ b/hooks/common/99-enable-daemons
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/



--- a/hooks/debian/80-install-kernel
+++ b/hooks/debian/80-install-kernel
@@ -7,7 +7,7 @@
 #
 # Dmitry Nedospasov
 # --
-# http://nedos.net
+# http://www.nedos.net/

 prefix=$1

@@ -21,7 +21,7 @@ else
    . ./hooks/common.sh
 fi

-if [ "${pygrub}" ]; then
+if [ "${pygrub}" = "1" ]; then
 #
 # Log our start
 #
--- a/hooks/debian/95-configure-locales
+++ b/hooks/debian/95-configure-locales
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/

 prefix=$1

--- a/hooks/edgy/80-install-kernel
+++ b/hooks/edgy/80-install-kernel
@@ -7,7 +7,7 @@
 #
 # Dmitry Nedospasov
 # --
-# http://nedos.net
+# http://www.nedos.net/

 prefix=$1

@@ -27,7 +27,7 @@ fi

 logMessage Script $0 starting

-if [ "${pygrub}" ]; then
+if [ "${pygrub}" = "1" ]; then

 #
 # Attempt to install a xen kernel, if that fails, then install a normal one
--- a/hooks/gentoo/20-enable-su
+++ b/hooks/gentoo/20-enable-su
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/


 prefix=$1
--- a/hooks/gentoo/40-setup-networking
+++ b/hooks/gentoo/40-setup-networking
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/


 prefix=$1
--- a/hooks/gentoo/50-setup-hostname
+++ b/hooks/gentoo/50-setup-hostname
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/



--- a/hooks/gentoo/70-install-ssh
+++ b/hooks/gentoo/70-install-ssh
@@ -7,7 +7,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/


 prefix=$1
--- a/hooks/intrepid/80-install-kernel
+++ b/hooks/intrepid/80-install-kernel
@@ -7,7 +7,7 @@
 #
 # Dmitry Nedospasov
 # --
-# http://nedos.net
+# http://www.nedos.net/

 prefix=$1

@@ -27,7 +27,7 @@ fi

 logMessage Script $0 starting

-if [ "${pygrub}" ]; then
+if [ "${pygrub}" = "1" ]; then

 #
 # Attempt to install a xen kernel, if that fails, then install a normal one
--- a/hooks/karmic/80-install-kernel
+++ b/hooks/karmic/80-install-kernel
@@ -7,7 +7,7 @@
 #
 # Dmitry Nedospasov
 # --
-# http://nedos.net
+# http://www.nedos.net/

 prefix=$1

@@ -26,7 +26,7 @@ fi

 logMessage Script $0 starting

-if [ "${pygrub}" ]; then
+if [ "${pygrub}" = "1" ]; then

 #
 # The type of kernel that we will be installing
--- a/lib/Xen/Tools/Common.pm
+++ b/lib/Xen/Tools/Common.pm
@@ -6,7 +6,7 @@ package Xen::Tools::Common;

 =head1 NAME

-Xen::Tools::Common - Common funtions used in xen-tools' Perl scripts
+Xen::Tools::Common - Common functions used in xen-tools' Perl scripts


 =head1 SYNOPSIS
@@ -246,7 +246,8 @@ sub runCommand ($$;$)

    if (!$rcclose)
    {
-        logprint_with_config("Running command '$cmd' failed with exit code $?.\n", $CONFIG);
+        my $exit_code = $? >> 8;
+        logprint_with_config("Running command '$cmd' failed with exit code $exit_code.\n", $CONFIG);
        logprint_with_config("Aborting\n", $CONFIG);
        print "See /var/log/xen-tools/".$CONFIG->{'hostname'}.".log for details\n";
        unless ($fail_ok) {
@@ -406,9 +407,9 @@ sub logprint_with_config ($$)

 =head1 AUTHORS

- Steve Kemp, http://www.steve.org.uk/
- Axel Beckert, http://noone.org/abe/
- Dmitry Nedospasov, http://nedos.net/
+ Steve Kemp, https://steve.fi/
+ Axel Beckert, https://axel.beckert.ch/
+ Dmitry Nedospasov, http://www.nedos.net/
 Stéphane Jourdois

 Merged from several scripts by Axel Beckert.
--- a/misc/README
+++ b/misc/README
@@ -8,7 +8,7 @@ misc/
  Contents:

        xen-tools      - Bash completion code for our commands.
-        xen-tools.spec - File to build an RPM of the xen-tools pacakge.
+        xen-tools.spec - File to build an RPM of the xen-tools package.

 Steve
 --
--- a/misc/xen-tools.bash-completion
+++ b/misc/xen-tools.bash-completion
@@ -10,13 +10,13 @@
 #
 #  References on command line completion:
 #
-#    http://www.debian-administration.org/articles/316
-#    http://www.debian-administration.org/articles/317
+#    https://debian-administration.org/articles/316
+#    https://debian-administration.org/articles/317
 #    http://dev.gentoo.org/~plasmaroo/devmanual/tasks-reference/completion/
 #
 # Steve
 # --
-# http://www.steve.org.uk
+# https://steve.fi/
 #
 #

--- a/misc/xen-tools.spec
+++ b/misc/xen-tools.spec
@@ -5,8 +5,8 @@ Summary:        Scripts used to create new Xen domains

 Group:          Applications/Emulators
 License:        GPLv2 or Artistic
-URL:            http://xen-tools.org/software/xen-tools/
-Source0:        http://xen-tools.org/software/xen-tools/xen-tools-%{version}.tar.gz
+URL:            https://xen-tools.org/software/xen-tools/
+Source0:        https://xen-tools.org/software/xen-tools/xen-tools-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

 BuildArch:      noarch
--- a/roles/builder
+++ b/roles/builder
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 #


--- a/roles/gdm
+++ b/roles/gdm
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 #


--- a/roles/udev
+++ b/roles/udev
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 #


--- a/roles/xdm
+++ b/roles/xdm
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 #


--- a/t/hook-tls.t
+++ b/t/hook-tls.t
@@ -75,7 +75,7 @@ sub testTLSDisabling
    `$hook_dir/$dist/10-disable-tls $dir`;

    #
-    # Make sure the the TLS directory is empty
+    # Make sure the TLS directory is empty
    #
    ok( ! -e "$dir/lib/tls/foo", "The fake library from /lib/tls is gone ($dist)" );
    ok( -e "$dir/lib/tls.disabled/foo", "The fake library ended up in /lib/tls.disabled ($dist)" );
--- a/t/modules.sh
+++ b/t/modules.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
 #
 #  Automatically attempt to create a test which ensures all the modules
-# used in the code are availabe.
+# used in the code are available.
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 #
 #

--- a/t/xen-delete-image.t
+++ b/t/xen-delete-image.t
@@ -36,7 +36,7 @@ ok ( -d $domains, "The temp directory now has a domains directory." );
 #  Generate a random hostname.
 #
 my $hostname = join ( '', map {('a'..'z')[rand 26]} 0..17 );
-ok( ! -d $domains . "/" . $hostname, "The virtual hostname doesnt exist." );
+ok( ! -d $domains . "/" . $hostname, "The virtual hostname doesn't exist." );

 #
 #  Make the hostname directory
--- a/t/xen-lists-images.t
+++ b/t/xen-lists-images.t
@@ -102,7 +102,7 @@ EOS
    my $cmd = "${prefix}bin/xen-list-images --test=$dir";
    my $output = `$cmd`;

-    ok( defined( $output ) && length( $output ), "Runing the list command produced some output" );
+    ok( defined( $output ) && length( $output ), "Running the list command produced some output" );

    #
    #  Process the output of the command, and make sure it was correct.
Author	SHA1	Message	Date
Axel Beckert	b7e8fafcb1	Release as xen-tools 4.7 Also upload to Debian as 4.7-1.	2017-01-23 00:41:40 +01:00
Axel Beckert	44fc213fc7	release-testing: Add some helpful output and raise waiting time to 10 seconds	2017-01-17 21:20:01 +01:00
Axel Beckert	862ce3b17c	release-testing: Untangle deletion and creation of Domus This hopefully further mitigates LVM race conditions during heavy testing.	2017-01-17 21:06:39 +01:00
Axel Beckert	0317940815	release-testing: Further mitigate LVM race conditions by using xen-delete-image	2017-01-17 20:46:44 +01:00
Axel Beckert	c3fcf5f4ba	Don't include oldoldstable in release testing It's not always and especially currently not available.	2017-01-17 20:45:44 +01:00
Axel Beckert	ab9b6c7d38	release-testing: Use exec to create the log to not cover the exit code	2017-01-17 20:45:43 +01:00
Axel Beckert	d315f17eff	Work around LVM related race condition when using --force with LVM If an "lvremove" is immediately followed by an "lvcreate" for an LV with the same name, "mkswap" (and maybe other commands) occasionally fail with "Device or resource busy". Work around it by using sync and sleep.	2017-01-17 20:44:34 +01:00
Axel Beckert	9c0086120f	List new distributions.conf keywords explicitly	2017-01-17 20:44:34 +01:00
Axel Beckert	76aabb0eb5	Declare testability in distributions.conf instead of hardcoding it Mark buster and bullseye as not testable, too, for now. Move comment about #659360 (debootstrap cannot build Ubuntu Edgy or earlier) from release-testing to distributions.conf, too.	2017-01-17 20:44:19 +01:00
Axel Beckert	126d0ad5bc	release-testing: Use "set -e" instead of "\|\| break"	2017-01-17 17:44:05 +01:00
Axel Beckert	5b8ef34ee6	Use per-test-unique host names Avoids race conditions with immediately re-used LVs.	2017-01-17 17:40:26 +01:00
Axel Beckert	0f1daa0b27	Support cases like Squeeze being EoL, but its key still being in the default keyring	2017-01-16 20:06:23 +01:00
Axel Beckert	9647ab082c	Fix emacs syntax highlighting At least GNU Emacs 25 doesn't seem to like HEREDOCS with underscores in its delimiters.	2017-01-16 19:32:36 +01:00
Axel Beckert	799052c2c9	[release testing] Heavier workaround for LVM-related race conditions	2017-01-10 23:58:30 +01:00
Axel Beckert	c84431bdb0	Fix missing colon Thanks Lintian!	2017-01-10 22:22:07 +01:00
Axel Beckert	9f6b91fdbf	Preliminary support for Ubuntu 17.04 Zesty Zapus	2017-01-10 22:20:57 +01:00
Axel Beckert	1bd9b3e1a8	Add changelog items for previous commit	2017-01-10 21:48:42 +01:00
Santiago Vila	07d014a0d6	Fix possible missing gateway in generated /etc/network/interfaces Closes: https://bugs.debian.org/764625	2017-01-10 21:46:03 +01:00
Axel Beckert	66a74b6f9f	Add changelog items for previous commit	2017-01-10 21:32:18 +01:00
Daniel Reichelt	ef09662822	Fix inconsistent handling of --nopygrub parameter Closes: https://bugs.debian.org/842609	2017-01-10 21:29:30 +01:00
Axel Beckert	40191bbd07	Default file system is now ext4 (instead of ext3)	2017-01-10 21:24:13 +01:00
Axel Beckert	7a3791d1aa	Risen default values for RAM sizes in /etc/xen-tools/xen-tools.cfg 128 MB are no more sufficient to boot Debian Sid. It needs at least around 136 MB on amd64 as of now. Closes: https://bugs.debian.org/849867	2017-01-10 21:05:10 +01:00
Axel Beckert	4d4daca745	Fix typos found by check-all-the-things/spellintian	2016-08-11 21:47:35 +02:00
Axel Beckert	bdc34f7deb	Travis CI: Also check with Perl 5.24	2016-08-11 21:36:35 +02:00
Axel Beckert	18b76606d2	Fix typos found by check-all-the-things/codespell	2016-08-11 21:35:41 +02:00
Axel Beckert	7e6bbc01a8	Clarify one paragraph in SUPPORT.markdown	2016-08-11 20:55:12 +02:00
Axel Beckert	ca9e091d4b	Switch many URLs to https://; update them if broken or redirected	2016-08-11 20:53:10 +02:00
Axel Beckert	32fcc069b4	Ignore debhelper stamp files	2016-08-11 20:08:29 +02:00
Axel Beckert	5d7954dde2	Support Ubuntu's "devel" alias	2016-08-11 20:04:28 +02:00
Axel Beckert	beda1b78a5	Update distribution list	2016-08-11 20:02:21 +02:00
Axel Beckert	e53e8ed2d8	TODO: Fix xdm and gdm roles wrt. to uptodate package names	2016-06-07 09:09:25 +02:00
Axel Beckert	b0177f013e	Debian packaging: Use NEWS.markdown as upstream changelog No more install it as separate documentation.	2016-04-17 01:00:18 +02:00
Axel Beckert	a2438497c7	Fix typo found by lintian	2016-04-17 00:56:30 +02:00
Axel Beckert	808bbe790f	Declare compliance with Debian Policy 3.9.8 No further changes were required to reach compliance.	2016-04-17 00:53:53 +02:00
Axel Beckert	bfc7c833a7	Add changelog entries for previous fix … and other minor stuff.	2016-04-17 00:51:59 +02:00
Yuri Sakhno	fa276179d8	Fix for the exit code reporting in case of error	2016-04-17 00:47:31 +02:00
Axel Beckert	7e7feb49b5	Add a short sleep to release-testing for umount race condition	2015-12-24 11:55:31 +01:00