Release as xen-tools 4.7

Also upload to Debian as 4.7-1.

.gitignore

@@ -15,10 +15,12 @@
 /build-stamp
 /configure-stamp
 /man
+/debian/*-stamp
 /debian/files
 /debian/xen-tools
 /debian/xen-tools.debhelper.log
 /debian/xen-tools.substvars
+/debian/xen-tools.*.debhelper
 
 # git-generated patches
 /*.patch

.travis.yml

@@ -1,5 +1,7 @@
 language: perl
 perl:
+  - "5.24"
+  - "5.22"
   - "5.20"
   - "5.18"
   - "5.16"

AUTHORS

@@ -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.

LICENSE

@@ -19,7 +19,7 @@ The text of both of these licenses follows below.
 
 Steve
 --
-http://www.steve.org.uk/
+https://steve.fi/
 
 
 

Makefile

@@ -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.1
+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
 

NEWS.markdown

@@ -1,3 +1,84 @@
+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)
+======================================
+
+Bug Fixes
+---------
+
+* Make t/hooks-inittab.t using its own copy of the generic
+  /etc/inittab for testing instead of using the system one's. (GH#36,
+  should fix autopkgtest on systems with modified /etc/inittab)
+* Fix unescaped braces (deprecated since Perl 5.22) in
+  t/plugin-checks.t.
+
+Other changes
+-------------
+
+* Support for using pygrub from /usr/local/bin/pygrub.
+* Typo fixes.
+
+
 xen-tools 4.6.1 (released 24 Oct 2015)
 ======================================
 
@@ -52,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.
@@ -314,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.

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)

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.
 
 -- 

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

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.1';
+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;

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.1';
+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...
 

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.1';
+my $RELEASE = '4.7';
 
 
 #

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.1';
+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

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.1';
+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' } )

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.1';
+my $RELEASE = '4.7';
 
 
 #

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.1';
+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;
     }

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.1';
+my $RELEASE = '4.7';
 
 
 

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.1';
+my $RELEASE = '4.7';
 
 # Init
 my $mirror = '';

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.1';
+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' } )
     {

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
-

debian/changelog

@@ -1,3 +1,55 @@
+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
+
+    [ Pierre Olivier ]
+    + Added /usr/local/bin/pygrub to the end of the pygrub search path.
+
+    [ nirgal ]
+    + Fixed typo in initramfs comment
+
+    [ Axel Beckert ]
+    + Make t/hooks-inittab.t using its own copy of the generic /etc/inittab
+      for testing instead of using the system one's. (GH#36, should fix
+      autopkgtest on systems with modified /etc/inittab)
+    + Fix unescaped braces (deprecated with Perl 5.22) in t/plugin-checks.t.
+
+  * Support checking upstream GPG signature in debian/watch.
+
+ -- Axel Beckert <abe@debian.org>  Wed, 23 Dec 2015 18:05:54 +0100
+
 xen-tools (4.6.1-1) unstable; urgency=medium
 
   * New upstream bugfix release
@@ -243,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,
@@ -531,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
 
@@ -665,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)

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

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:
@@ -25,3 +25,15 @@ Perl is distributed under licenses:
     On Debian GNU/Linux systems, the complete text of the GNU General
     Public License can be found in /usr/share/common-licenses/GPL-1' and
     the Artistic Licence in /usr/share/common-licenses/Artistic'.
+
+t/data/inittab is Copyright 1997-2005 Miquel van Smoorenburg
+<miquels@cistron.nl> and the members pkg-sysvinit project.
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    On Debian GNU/Linux systems, the complete text of the GNU General
+    Public License version 2 can be found in
+    /usr/share/common-licenses/GPL-2'.

debian/docs

@@ -2,4 +2,3 @@ AUTHORS
 README.markdown
 SUPPORT.markdown
 TODO.markdown
-NEWS.markdown

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:

debian/upstream/signing-key.asc

@@ -0,0 +1,147 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+mQINBEpaZ7ABEADMyzD1duYFiMgQpGOBPUkeCoSYOLIVk9ry+fwIkyiyvVZYBWuh
+PtEdb+NLOPj/zfUFcoshfhm9bdCTlId1rger34/gOBN9r9NbawfiaUuOhxVzasrX
+/7sWSHDKQ+7WFS9SBt4EVRJJJDDjqyAlzbHgGtvOYBz6s052zLKnmadAzJGC/mll
+Wx/xxzY1+lRuVNC9NPVmmKrIBgT4aymEvNezVWDnUkKo9flpuMk8wnESO3ccpK2H
+JOp9l8C3PcQZAKzU9jPOmoXO3uqZG8xRoNLNIyrcNsftswylDlmC99mofpSpmLKi
++2+huujkdWubU5qQogC03OeKBqzsFxEYQYAkMcZg1lMebkbPZRGDXN2sWncarJkG
+QLH2tKnjHas6L1SYmZkr44druSrlAI1d4gkNhE5Xr8BDnr4ipneWkYhBq7O2+0Ty
+We071NDwANDhjHyIxG/3J/PSK2Y99PP6cifrIn8Ndu6DNa58uG0jFXjvsWLJQyqN
+TIq/C0wMXne5/5KSo6uIG//hogTl9tP40qQ7xLj1eBb3jFiiDORyhbmB+tLveNge
+9oYgf0qIbrTI3sfUNTgJN3IYgswaqtk83GWp0j9r6zkwuACVX1RS3UaqNMdoivS2
+m1nZZd9O4CPYNmYTLcPNcnYQIjBrs1W6GtmEY0K6e0r0OMffaRhyI7+zfwARAQAB
+tCJBeGVsIEJlY2tlcnQgPGFiZUBkZXV4Y2hldmF1eC5vcmc+iQI2BBMBCAAgBQJK
+WmewAhsDBAsJCAcFFQoJCAsFFgIDAQACHgECF4AACgkQL/nNWWEmFrWEPQ/9GGFX
+pnfigWU5hMLJQ94b5k6yv1+faLhuhYN26MhbijYW9vs5D7B6TlgnvmMh+jCbSBiO
+f2GRnVf4nFCPY3mDfGKvU1IDbxsLJ9jgIbJcCKAmJ4kV+iaHP8FopHFKrxLroz+O
+XDkVCHblA5GMBgnKLqylcc5sUf4XCPu9YX+sSLTNPbwzXfxyuAQpN1cX+MPvJ7iq
+EI+qRgLtjtZVp8pYX5Xb/xSvQKMLtlRDHGL0INhNWoJHYdODH2mNA2h5yOTpTF9y
+R+WiRQa5ftNWqEkJWeMVu8XMcSB3QqVeYC/rkmle9YHW4fVmOY3HRTF3fp/iBK5l
+I4q+iPROn00SxRYEF9RZ22D/OIl6rqVd41T3F9EOr3aYwrkG5JTRdaf+uRER51Wc
+lpKg36WlI6SSsgM8JAEdMf/UlqiAjaRyqloZ65nCg5eDigK6BhdQwpyp6nN2BjsW
+7zNrZ3AnoB36QlHlesb8Khk/G8bv7D7VA3U48H72ZrjQJPyDWROVVbf23fCbZP1p
+n4NAOogNDBJs+n8nJoO9KSIyonUwNKVvQZnEaO4fzeYcuPgO3aQk91sdK7DW8x8Y
+k89MD0QZCXsy1kOUz8LlOI/ATVkDyi43qIj0rACXu2bFhPCoGSlgFLF8CU6sz5Up
+t6XGVYdYUmi0fv/hRllmoXwqqxjfFaAxN05OoPu0LkF4ZWwgQmVja2VydCAoRS1N
+YWlsICsgSmFiYmVyKSA8YWJlQG5vb25lLm9yZz6JAjYEEwEIACAFAkpaax4CGwME
+CwkIBwUVCgkICwUWAgMBAAIeAQIXgAAKCRAv+c1ZYSYWtX8lD/9n+IWUZKsZjKfP
++ylhvzMI3s0l4WSOIyCdiW+0O4XFP7LUczppQo78X5G/AWRP1T0McQrSFMEwT2Gm
+oNdJlChlNqH+9RiV5E8KGZ9aLsuALjuHj3lkoO25Sl18RyOoUhwEFUk9dFHb3l8I
+Mqg+NjnHG2Vm4j1HPuPPp5qrppW8iPt+oq+yLXGZGgKzITSmkNyrgkzIP/dsgsyu
+r2pPnEnQ9o72SYrJnrsPtrRbLnk6+VzON5VcUpxoGu80/r59g4vLxHqrQqFi1rUy
+5B616EN2iduZF6w24V3x9v8aX+x6zgnnMLJEd5V5KwOMwul6VYUCpxDE/Vctt5zt
+ZL5eKv+81NyonNRlsMi1c4UGzN5NkcblAF7SrDhDGOnjFTNZVG3QtYoGTOpryute
++ETlqQ+NNdiAvsEoVb5IQEKI71KAHWvg16dZsHqFauwFmOz67+GYuipXIPZH/b/T
+IQ9h/yeISM8Tm59ymT0ZscuDe4FLdii4rXa43fEPUmCShcmwY0w6NNjLtRlXgJ4y
+LWqLUTf94l9M/FVbd8CQ/6cw5TwzrzyK88/rY5CnoL4zy2yZWfn9Jl/zZBqPOIxn
+ZPNQtr60phOpZY2kHuCr8EriE8KbTFj0R/GjP+CjJw0qNhKYxJjRbxwaqtMUcvkw
+lQIURcJomjGNU2VJlgEykiBdii43M7QqQXhlbCBCZWNrZXJ0IChTeW1saW5rKSA8
+eHRhcmFuQHN5bWxpbmsuY2g+iQI2BBMBCAAgBQJKWmtKAhsDBAsJCAcFFQoJCAsF
+FgIDAQACHgECF4AACgkQL/nNWWEmFrWA0Q/9FIZvkqymKMGX3w3kfaKXfG3D9oe3
+6tBcwhy1PIbTGWpI2XvgoxyimgH5kgjqRq5jSO/uIps6nWUHIK09cB83jkhocliU
+kvYjRJ4AcAKjH44GKFzder01JDAln3kv3Mw0M+NKo/h4JO2zUmizNwRgMkHqhx8q
+oWqBfZVe+1hH6GRF9wVEaiblIgeA1DWI2MFrYlsgHyIyZE+Ir6ZVITcouv0eTEVv
+NecxRDkaA/G44O9U/3sFGG7wgON4Ad1tdJqr9TPsJQMFm2iCrCj5uEau94gVeyz4
+FMiCjtQNYzG1AvPF+C7iVc/Ob0uutvkIFYTu5zMkMi6B4zDX3LO9Vk7KBUnZgHMr
+og+AhXABqlDgwnqqnJOTpJlBKe8ibJQGE4A0IgqM6MtLumDmT7kRwEuHQW4ax7j+
+E5+sYTNqwjpyu20KatRq1OyrsArfVUTLTeAUwB+gy1Dnb62ClCB+1g9L+Cb9ZE/n
+xxfMM7DMy2gFa6wjFdTlYkIxiZC9iLYMUxKlIXmaySIV98mH7fQ9Ojk0Q2RqCnrH
+pbBQi89nwNXrq+T637WWkSbfvtV68S1jydgL+i5A2J7PkztvXKFkTF40kgtyVCsF
+KaoVfjeCDdgVGFKtC7NR25NJu1wikqAYZM/eKvPoFTkjf7A2btFKLckXkM6eASMm
+7nx2k2WQ6iTUM+u0E0F4ZWwgU3RlZmFuIEJlY2tlcnSJAjYEEwEIACAFAkpaa2sC
+GwMECwkIBwUVCgkICwUWAgMBAAIeAQIXgAAKCRAv+c1ZYSYWtawCD/9CdOQvdt9X
+yqKXhOODBVOnHyr1BEteuU41g7YVmH4xrgNOPvjtxzPF4EPMBk/r3IfoaesnSaNS
+g/b+OfS6LHmT+bQMU+a8X2R6kickUbJerlOS4eaIpMGPN7ldHhKo9OcbPysGtLaR
+s+MIh2CORwz64i4ySSEYpKQZISeVrX4cdI8ZxKDbotszD371DXD28S14Eom2uy/d
+4c6J771/xCq3+RH2QfHxFbKK7FBfAUoYlkfIAzSMUP3EuN/vr9hVJ2g5yM+zYN5y
+zdCYbeDoBCIlu2VFavTCfY7zenQVSukNdNOE3iIdUAhuijnf5L6KC15ymnOU4dHi
+qbkGG2ujFvXjzFqmIlflnFZ/G8O+s8C+5D9qQve0XweOSd46Nd2hzG7ZCDLd18Oy
+wdkVk3Nk3QNc2vSfQRyXavYyb6cDD/33Bjkef3y1sAAgH58tUFQXCedc0gRP3UYT
+o9yyvwQoBx+QHw3gYGaGJvx3NMA+gQq3ufbr6JUn/P7j9Z09eXQZ0HUTE22+Xxd5
+rORcGPRyknAXy4kgiQAc8QhwPqVSVlbGnDz+rWryF+HwD1X5neYHwz0qOCukuAMV
+ezq6BNJvuYRrLqCOzu18LD9rqiYeNxyUnH/UFFefQdW2SPJKBNtChVAZd8lJdaHv
+mGyvPi85mey1j1Dzn/mF3Dwjtl0GTO7K2rQpQXhlbCBCZWNrZXJ0IChGU0ZFIEZl
+bGxvdykgPGFiZUBmc2ZlLm9yZz6JAjYEEwEIACAFAksejdsCGwMECwkIBwUVCgkI
+CwUWAgMBAAIeAQIXgAAKCRAv+c1ZYSYWtSuGD/0StaDkNfg2jl5k04MuyMuXnLc3
+EXr/T13Kt5XfwDwE8LoVyTo7N7utylPFvMFsWXo7QzniKOCm2A4IjXfncExiGh4a
+h3ONgp66nJT8a8PMPl4YBFaLymNdGA1FkQOZPGUPu+/BJ5Nko42qcr3bTFnr5yU8
+fW50ZJ9Dt2hZZD+z43dDGqSB5VESPuYMLabI9kFfixWpor8Hp/cdRty+6qT8T3L4
+gCzOBhKWY8M//x5rY5SkF182GcOW2AzO1bSnJpNB+Rxp1vj5d05irLl35YZ/B8J6
+oPK+edQGGSYQk3oeZhPyiK67itYust2c9dIgJo1/yqh8nqDNYCtTGr5FJntIwviU
+Oh8BIwD0WPxJs+4icE71Sq+4zqx8bYLaKspu0jSw4ScAkCR6od3kA1K/LKkRI//m
+q288TfarYfrcVgythAjKH9y8RmbgpQK2/dtoAUq+SNtyFDma29JKkuKH5w6o6zFN
+h8INj8tb1L0HC1MVUCqH5Irb9wY9hQuDP9KAaCAhrl4/ckCNUFeTx4mmkVUlfUIR
+1AZ7eGWCRVbjY3vc8UOV/hmsibaSeoPlKriyv++9erHlzZefDILCiZrY5k+vmL5V
+udjKJeNmVmXbnBp4pA0fvOrOsOxt2tMvNwnzrkYAas/OqibdAA2qUyZYgIdK6bCG
+1615bmvpbj8HluZHC7kEDQRKWmvxEBAAiXrRACaF49/act1wqPlsD3syaedMZyvx
+70C259lyo/LYK64lniXDPQnvcJwnMPQrcGjemUBerT1cDoF+FHLMuyPC6rOmeijN
+H//0F0iI8CHulOy1NhtTQfVbLhScIA0o/jZi54caqex/fshyQaoVssLIEZ0PyREF
+w0Fj5c65r6UNEC8ih1aeM1HBOFMgcUdhkKYc7y8K15du9SIqL4rMqBuedE3dKwli
+Weh62GigeojHfBWe9Oeil+MMRyFkIGNPqE7JqFGXlbbEn0qHf9aFo85/W7RCW0L6
+fRMAgQrTat5pkHw2oeY+0XJza/VoptT26FyTldEt/3huPOF3gKwaxKsplFvYik5E
+88G7Rt5FwMf9DJ7xrAMKYFctqyju6Fps+niP+i6Z8mHUmoVdVhLI5JWdFJBhAOxx
+47Pxjy6q0eimK5nHlNpOU+Wm/Wd9I8TflQtbGWi2rqf8TOWTD07VE0WPl+8iHJDQ
+zltRgPqZwD1goXH8WGsc5J/rhokSspCUXMNlcew094l/ZUK+mvvx1aSN7P/gWN8a
+ehthoplXmj6dKyrYObsArN2mjVjov4pi16+GYt5G1kdkFUd9Y/i3CnMxuEasXBbX
+0DaSXZHt7SFh8Q+hWok6Y5DgEt5IMCOKRYyMxIVdto6RckekkGom8oszr6aw6NbX
+YenIau+CO2sAAwYP+gP4bCrqTgIdwgKssjTfRbmpNfzJfXGR4DH9fpQMO4AnCK5L
+r7ZHcehh0ZfybYvfliHTZldQr+iyZavn6bNJ4b+xrUwtzCX1FffBBjq1VogposKe
+y9ALejb/jqiX8nvg7qkuEu8af7E5ufwzh/1/3BZ4x4RVKWVyTexkJTMiTxCH8WzA
+qYhItIG1XnGnbnejN587XOgbGq5j1CIP1ZZh3/bivuONzkebPMPduTu+kofzx8ZW
+ETAcRTDx4AMY4/88Z8k0bGpc2e/4o8Ie0/EGczKPEPHTp3b/nrS6UH2oopuo9bFa
+YKyo8aJ9Z/bTY19Nk8UGDfDqaixVj77lZp51W1Lzmkk+fhwgCOM6CGyradML0Mql
+ugZ11lmqcWcUniIeQAO1Ex0uxTAMhY3HMCYzB4LYfLjnA4YxZyDLm6tpRP/dkMEB
+njViweBzCJ1/heIhloYt6HeIMl2Y0CbVKRYXgjfVjnuSidz2LEjsZor+r5MFlT8q
+c+Z3BB7f46I0agjbEz1Fy4MLCr/f5X9v7lh+klByYWu2AnfN8ryO5rFSLtOxy6cT
+e5y0++yRkft/f/62NrVj4pK/SMIVNaF+T66lHVIXRuRo98ueUNfdaba8SLenwgF1
+kIITHaFO7NoJ/bugHJFZD+sdEV4fO0Wngk/IrGr1pDxH2xqH8pGa91hx1A26iQIf
+BBgBCAAJBQJKWmvxAhsMAAoJEC/5zVlhJha1LFQP/3AfrEA9AayOOXw1prdX1pr7
+zGcSYecM8aPFpkvK8Q2dmJwqR/xAc1vTzW+dquOVG/cFJBftQCDQFgpDQp+Z8t4E
+r2q4px3q0A3gH8Mz1BLZ/OVeU8xU0IRbk6+d9v0n45/S04T/uK46RpDFD4YEVf54
+8tums1+EDaEbbhzEXGBDAjKCarxwJO+i4BR/Kk+9uTNHwMMhekrnQfcWvEgoczvy
+wjIG9EoWVNS0KKFQiYKczV4sdLNQfhOC3iq6JZfipq4i/BEFTSRBISJyyfQPc53g
+m8+qenRNLaidHgjbPAz4AQpwvqG4FbO5F6NdA/6iIfoD0ONbv2CIh7/3B87vvR6S
+8LUYbBcds6hRRN0SVprzh2ywzUrEWbJWdXQ4bmNOnGvyB+F7XT1r0+7mW2IwcMZl
+e4bCX5ODGl4b/YmM3RWCpz/m5FEkaO5EtEW59vv5t5KSRcYjNaetXkJAKHbSFWAJ
+5E0Z/KdI5+2xekisjJqcFCQQkHEae1fjLV14Iqvh4/TL5uRcouCgCTHlsKa9yPn3
+lMHEYKYXprf3hJLYVKA9+KseL2UNRTWR3tlWfNel1+FQ21ZH27bBsVvX4kH79mOA
+o0XZWyYdIOq6Fe+CvZ2PNvDppmaJ1nyetJy21XIweqpYOi+XSSfnywcxqkLiZEFJ
+SHZav7AdNoVLuHc4/dlyuQINBFShPUQBEADMkReQVHSCPmi5Yv7gyOE+VoNSrVfF
+VpbpnFyK+g7/IyAeOV1f91QFUP0RU22CrHFbQaaI4h52y28K/+/9oNoD8U51eDix
+0l5gRjO5Dpis6YSRTAduH9JU9lSJI8ay/0XFahrAZUQaT4WDYrlmRlBuIZ2OjXau
+CpyM4vvgkVE4Njogegnf8Yzjj+V4mT4EWAKcxPGLQ6cL+ASO0bSJDyyt7w8cjvUV
+uFZOST32iE/aamFZPcZZMZ3ZVrZ2qXyuFapEruRsnhAd9a0CGgJ0u5Tex3JxyiNs
+U0Y8JcpzLGeI8J3MQdqnH9pJwHOovJVD6faD3J9fy22B/5zAMH+5ZZv/HxTT3+B9
+8j67jz6E+Q9bRb5i73Loj9hQAY9GuGb6idoTNDLtdVcuonocPqk+FlZEWLfSn5Pk
+nNJ+AAesl1Zh81PdX11KAWqaEKZmazJB/WgD18L8VBCzUPSMrt19pUJ186beAnDz
+HymnS70ZcPppajz+xg2aUBHIuvmNlTAuvwTq4b4R/+W729+7D2dJhTgr82rGbL55
+VQllAYEX5w0/RheU2EZpjgdfl8VCGyGdKD188cIypHQIYA2ZjsvElI/NHJv0BTBV
+PZIgJ6JPPDr7QfY8vzg/EZ6nleLNrdlIHWefOzLL3YWdbv3X9E7Ckl3tzjvl97Mb
+UoYHOZesi5fXKQARAQABiQREBBgBCAAPBQJUoT1EAhsCBQkLRzUAAikJEC/5zVlh
+Jha1wV0gBBkBCAAGBQJUoT1EAAoJEGvmY8daNcl1a8UQAIAXNuGj/NPay0nvHNMl
+eXZuHRQ3C+4ckA5NC1zvPNFR1KZWFA2uFe20Wy9JiC/OS20/kOIYjH8N4nwJkgN8
+PCxeoPwihErttA0MAk0y06RDVoUChfe0w3ekE5VxkT71+XAo4PQpK7wR47tVZeaT
+mMBoX4SFH4g8O5hbc0PazRmVVIWejXcRUYfdbmnv3iCZ8qoskVoZVSS1b4jpVLWi
+YRrWn4TfZB5apHgzmfWG21/Ce/7yQWP22sSU5/o9+HZzYYmhz7DE4DXIxPLz4+2P
+tngKcLOTacxJaB4xbniYl3VmUj3afDWZ3G2XdyfbBAGbOPypNeVkmP1COoWvLLvi
+kuYclF1kdANN7Gi7XBpwUY225luwzmVI8tcjzK/7ErutDKCzC203F9LCwp3jmBxv
+kmndOUMha4R1EuU+8EzIXMXY8jPFH3tH3lJ9qTA1koiYtRxlB2E/EZmPzYB9Kj+S
+e2G7aJ6qemBRHR8KRCDfRxpjN28NMc57j27VRfxCYKdlSujZTs+nn7/jgL3EZ3AK
+JHSJoIgrzaqqr34Siw/0DcAsoJTwuWbknQPgeSv03q2A81JLKEXukTXKCO9DmbBi
+AFyXqQm6NM5MuPSycq5jpM/MWN0Nc/OM3fpvn0NsdOpBpugTzVGQ1H/nQBgAkbAT
+d/cqxybvui/FKnIsc69TVlfjk+0P/0gIHN3Fa1NwNsj+Ui6q8mzrtT5jCa8+b6eh
+r3JlX84Gj6+u7JXTt+LFQWH270xZjo95QHgf9p0/uWPaiW2g6dVB7TGsdCOOL+au
+8ilebcq1B6L6HtgUo65TwcDjdX1lVi33xHXfMbJP6VVq7Lu5P6kqCL0myF5YR/s9
+uIol6+5SGbfGBG+9IXs3Np9D711VNDDojQRWH1eTdsoau21DNa4666g5W3q+yARc
+RaIeKuTTdj1xSctSeDklHaWKyBZzzRDd5Q459GOKf9n3ODjfkAbmuYpuA1Izg3EK
+6miBewL2vhg+6X1RtJ4oVzcI98W+91I+0jDepZ6TSDNrim8bCIYCAfRpzqWi67AH
+JkYvSQ/FPsNAxh9B44q7pD4EFqnVG/Ncl+hemKy5hx0NRD9hgTyhaUjYCkxlfi9v
+jxH0WmaYEQ1VJO6+Nk4kzwo7HDzV7Egdppfat3lz6uU/phu1ck5ye9NsqM35jJ7U
+g7IFdBvkunLucWGUB/k0iTa8K/3HtK0U4W93oSkDI6VBpEN2gkIDtJpl72N4XsO3
+SKevxGFH8eGE5W5B/C4s2kevE6AzYfBy6Ptr9FYFyxwm6EvwKZTmGY/D+qABpFwK
+m0uqlgXaVCF5zZkbb8OZxp/cjb2C2q+F9n8k2ASOxtrR+5f1CzBH+IoBVDHXacGD
++XwhySae
+=CO5C
+-----END PGP PUBLIC KEY BLOCK-----

debian/watch

@@ -11,5 +11,6 @@ version=3
 #  The link to the download location, followed by the regular expression
 # to match release tarballs.
 #
-http://xen-tools.org/software/xen-tools/releases.html \
+opts=pgpsigurlmangle=s/$/.asc/ \
+https://xen-tools.org/software/xen-tools/releases.html \
    xen-tools-([\d\.]+)\.tar\.gz

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

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

etc/xm.tmpl

@@ -23,7 +23,8 @@
     my $pygrub_bin = '';
     foreach my $pygrub_path (reverse glob('/usr/lib/xen-default/bin/pygrub
                                            /usr/lib/xen-*/bin/pygrub
-                                           /usr/*bin/pygrub')) {
+                                           /usr/*bin/pygrub
+                                           /usr/local/bin/pygrub')) {
       if (-x $pygrub_path) {
         $pygrub_bin = $pygrub_path;
         last;

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

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

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

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

hooks/common/01-disable-daemons

@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1

hooks/common/05-shadowconfig-on

@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1

hooks/common/10-disable-tls

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

hooks/common/15-disable-hwclock

@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1

hooks/common/20-setup-yum

@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1

hooks/common/35-setup-users

@@ -9,7 +9,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 use strict;

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}

hooks/common/40-setup-networking-rpm

@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1

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

hooks/common/50-setup-hostname-rpm

@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 

hooks/common/55-create-dev

@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1

hooks/common/70-install-ssh-deb

@@ -8,7 +8,7 @@
 #
 # Dmitry Nedospasov
 # --
-# http://nedos.net/
+# http://www.nedos.net/
 
 prefix=$1
 

hooks/common/70-install-ssh-rpm

@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1

hooks/common/75-fixup-securetty

@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1

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
 #

hooks/common/80-install-modules-rpm

@@ -9,7 +9,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1

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)

hooks/common/90-make-fstab

@@ -9,7 +9,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1

hooks/common/99-clean-image-deb

@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1

hooks/common/99-clean-image-rpm

@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1

hooks/common/99-enable-daemons

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

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
 #

hooks/debian/95-configure-locales

@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 prefix=$1
 

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

hooks/gentoo/20-enable-su

@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1

hooks/gentoo/40-setup-networking

@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1

hooks/gentoo/50-setup-hostname

@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 

hooks/gentoo/70-install-ssh

@@ -7,7 +7,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1

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

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

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.

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
 --

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/
 #
 #
 

misc/xen-tools.initramfs-tools

@@ -1,7 +1,7 @@
 # This initramfs-tools configuration file is installed by xen-tools.
 #
 # To make the Dom0's initramfs working inside DomUs, too, most modules
-# need to be included, not just those necvessary for the host system
+# need to be included, not just those necessary for the host system
 # and its hardware.
 
 MODULES=most

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

roles/builder

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

roles/gdm

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

roles/udev

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

roles/xdm

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

t/data/inittab

@@ -0,0 +1,68 @@
+# /etc/inittab: init(8) configuration.
+# $Id: inittab,v 1.91 2002/01/25 13:35:21 miquels Exp $
+
+# The default runlevel.
+id:2:initdefault:
+
+# Boot-time system configuration/initialization script.
+# This is run first except when booting in emergency (-b) mode.
+si::sysinit:/etc/init.d/rcS
+
+# What to do in single-user mode.
+~~:S:wait:/sbin/sulogin
+
+# /etc/init.d executes the S and K scripts upon change
+# of runlevel.
+#
+# Runlevel 0 is halt.
+# Runlevel 1 is single-user.
+# Runlevels 2-5 are multi-user.
+# Runlevel 6 is reboot.
+
+l0:0:wait:/etc/init.d/rc 0
+l1:1:wait:/etc/init.d/rc 1
+l2:2:wait:/etc/init.d/rc 2
+l3:3:wait:/etc/init.d/rc 3
+l4:4:wait:/etc/init.d/rc 4
+l5:5:wait:/etc/init.d/rc 5
+l6:6:wait:/etc/init.d/rc 6
+# Normally not reached, but fallthrough in case of emergency.
+z6:6:respawn:/sbin/sulogin
+
+# What to do when CTRL-ALT-DEL is pressed.
+ca:12345:ctrlaltdel:/sbin/shutdown -t1 -a -r now
+
+# Action on special keypress (ALT-UpArrow).
+#kb::kbrequest:/bin/echo "Keyboard Request--edit /etc/inittab to let this work."
+
+# What to do when the power fails/returns.
+pf::powerwait:/etc/init.d/powerfail start
+pn::powerfailnow:/etc/init.d/powerfail now
+po::powerokwait:/etc/init.d/powerfail stop
+
+# /sbin/getty invocations for the runlevels.
+#
+# The "id" field MUST be the same as the last
+# characters of the device (after "tty").
+#
+# Format:
+#  <id>:<runlevels>:<action>:<process>
+#
+# Note that on most Debian systems tty7 is used by the X Window System,
+# so if you want to add more getty's go ahead but skip tty7 if you run X.
+#
+1:2345:respawn:/sbin/getty 38400 tty1
+2:23:respawn:/sbin/getty 38400 tty2
+3:23:respawn:/sbin/getty 38400 tty3
+4:23:respawn:/sbin/getty 38400 tty4
+5:23:respawn:/sbin/getty 38400 tty5
+6:23:respawn:/sbin/getty 38400 tty6
+
+# Example how to put a getty on a serial line (for a terminal)
+#
+#T0:23:respawn:/sbin/getty -L ttyS0 9600 vt100
+#T1:23:respawn:/sbin/getty -L ttyS1 9600 vt100
+
+# Example how to put a getty on a modem line.
+#
+#T3:23:respawn:/sbin/mgetty -x0 -s 57600 ttyS3

t/hook-inittab.t

@@ -11,12 +11,13 @@ use Test::More;
 use File::Temp;
 use File::Copy;
 
+my $example_inittab = 't/data/inittab';
 my $hook_dir = $ENV{AS_INSTALLED_TESTING} ? '/usr/share/xen-tools' : 'hooks';
 
 #
-#  Check if build system has /etc/inittab.
+#  Check if example inittab is present, else bail out
 #
-if (-e "/etc/inittab") {
+if (-e $example_inittab) {
     #
     #  Rather than having a hardwired list of distributions to test
     # against we look for subdirectories beneath hooks/ and test each
@@ -38,7 +39,7 @@ if (-e "/etc/inittab") {
         }
     }
 } else {
-    plan skip_all => '/etc/inittab not present';
+    BAIL_OUT("$example_inittab not found, source distribution seems incomplete");
 }
 
 done_testing();
@@ -52,7 +53,7 @@ sub testHook
     #
     my $dir        = File::Temp::tempdir( CLEANUP => 1 );
     mkdir( $dir . "/etc", 0777 );
-    File::Copy::cp( "/etc/inittab", $dir . "/etc" );
+    File::Copy::cp( $example_inittab, $dir . "/etc" );
 
     #
     # Make sure that worked.

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)" );

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/
 #
 #
 

t/plugin-checks.t

@@ -83,7 +83,7 @@ sub testFile
 
     foreach my $line ( <FILY> )
     {
-        if ( $line =~ /\$CONFIG{[ \t'"]+(.*)[ \t'"]+}/ )
+        if ( $line =~ /\$CONFIG\{[ \t'"]+(.*)[ \t'"]+\}/ )
         {
             close( FILY );
             return $line;

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

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.