diff -Nru xen-tools-4.6.2/AUTHORS xen-tools-4.7/AUTHORS
--- xen-tools-4.6.2/AUTHORS	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/AUTHORS	2017-01-22 23:47:28.000000000 +0000
@@ -65,7 +65,7 @@
    - 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.
diff -Nru xen-tools-4.6.2/bin/xen-create-image xen-tools-4.7/bin/xen-create-image
--- xen-tools-4.6.2/bin/xen-create-image	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/bin/xen-create-image	2017-01-22 23:47:28.000000000 +0000
@@ -776,9 +776,9 @@
 
 =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 @@
 #
 # Release number.
 #
-my $RELEASE = '4.6.2';
+my $RELEASE = '4.7';
 
 
 #
@@ -1159,7 +1159,7 @@
   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 @@
     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 @@
                     $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 @@
     #
     # 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 @@
                     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 @@
 
   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 @@
     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;
diff -Nru xen-tools-4.6.2/bin/xen-create-nfs xen-tools-4.7/bin/xen-create-nfs
--- xen-tools-4.6.2/bin/xen-create-nfs	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/bin/xen-create-nfs	2017-01-22 23:47:28.000000000 +0000
@@ -74,12 +74,12 @@
   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 @@
 #
 # Release number.
 #
-my $RELEASE = '4.6.2';
+my $RELEASE = '4.7';
 
 
 # store version number away.
@@ -282,7 +282,7 @@
     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...
 
diff -Nru xen-tools-4.6.2/bin/xen-delete-image xen-tools-4.7/bin/xen-delete-image
--- xen-tools-4.6.2/bin/xen-delete-image	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/bin/xen-delete-image	2017-01-22 23:47:28.000000000 +0000
@@ -126,8 +126,8 @@
 
 =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 @@
 #
 # Release number.
 #
-my $RELEASE = '4.6.2';
+my $RELEASE = '4.7';
 
 
 #
diff -Nru xen-tools-4.6.2/bin/xen-list-images xen-tools-4.7/bin/xen-list-images
--- xen-tools-4.6.2/bin/xen-list-images	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/bin/xen-list-images	2017-01-22 23:47:28.000000000 +0000
@@ -64,7 +64,7 @@
 
 =head1 AUTHORS
 
- Steve Kemp, http://www.steve.org.uk/
+ Steve Kemp, https://steve.fi/
  Stéphane Jourdois
 
 
@@ -106,7 +106,7 @@
 #
 # Release number.
 #
-my $RELEASE = '4.6.2';
+my $RELEASE = '4.7';
 
 
 
@@ -212,7 +212,7 @@
 
 =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
diff -Nru xen-tools-4.6.2/bin/xen-resize-guest xen-tools-4.7/bin/xen-resize-guest
--- xen-tools-4.6.2/bin/xen-resize-guest	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/bin/xen-resize-guest	2017-01-22 23:47:28.000000000 +0000
@@ -75,8 +75,8 @@
 
 =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 @@
 #
 # Release number.
 #
-my $RELEASE = '4.6.2';
+my $RELEASE = '4.7';
 
 
 #
@@ -340,7 +340,7 @@
 
     #
     #  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' } )
diff -Nru xen-tools-4.6.2/bin/xen-update-image xen-tools-4.7/bin/xen-update-image
--- xen-tools-4.6.2/bin/xen-update-image	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/bin/xen-update-image	2017-01-22 23:47:28.000000000 +0000
@@ -75,8 +75,8 @@
 
 =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 @@
 #
 # Release number.
 #
-my $RELEASE = '4.6.2';
+my $RELEASE = '4.7';
 
 
 #
diff -Nru xen-tools-4.6.2/bin/xt-create-xen-config xen-tools-4.7/bin/xt-create-xen-config
--- xen-tools-4.6.2/bin/xt-create-xen-config	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/bin/xt-create-xen-config	2017-01-22 23:47:28.000000000 +0000
@@ -99,8 +99,8 @@
 
 =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 @@
 #
 # Release number.
 #
-my $RELEASE = '4.6.2';
+my $RELEASE = '4.7';
 
 
 
@@ -254,7 +254,7 @@
     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;
     }
diff -Nru xen-tools-4.6.2/bin/xt-customize-image xen-tools-4.7/bin/xt-customize-image
--- xen-tools-4.6.2/bin/xt-customize-image	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/bin/xt-customize-image	2017-01-22 23:47:28.000000000 +0000
@@ -29,7 +29,7 @@
 =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 @@
 
 =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 @@
 #
 # Release number.
 #
-my $RELEASE = '4.6.2';
+my $RELEASE = '4.7';
 
 
 
diff -Nru xen-tools-4.6.2/bin/xt-guess-suite-and-mirror xen-tools-4.7/bin/xt-guess-suite-and-mirror
--- xen-tools-4.6.2/bin/xt-guess-suite-and-mirror	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/bin/xt-guess-suite-and-mirror	2017-01-22 23:47:28.000000000 +0000
@@ -30,7 +30,7 @@
 
 =head1 AUTHORS
 
- Axel Beckert, http://noone.org/abe/
+ Axel Beckert, https://axel.beckert.ch/
  Stéphane Jourdois
 
 
@@ -79,7 +79,7 @@
 #
 # Release number.
 #
-my $RELEASE = '4.6.2';
+my $RELEASE = '4.7';
 
 # Init
 my $mirror = '';
diff -Nru xen-tools-4.6.2/bin/xt-install-image xen-tools-4.7/bin/xt-install-image
--- xen-tools-4.6.2/bin/xt-install-image	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/bin/xt-install-image	2017-01-22 23:47:28.000000000 +0000
@@ -78,9 +78,9 @@
 
 =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 @@
 #
 # Release number.
 #
-my $RELEASE = '4.6.2';
+my $RELEASE = '4.7';
 
 
 #
@@ -621,7 +621,7 @@
     }
 
     #
-    #  Propogate --verbose appropriately.
+    #  Propagate --verbose appropriately.
     #
     my $EXTRA = '';
     if ( $CONFIG{ 'verbose' } )
@@ -630,7 +630,7 @@
     }
 
     #
-    #  Propogate the --arch argument
+    #  Propagate the --arch argument
     #
     if ( $CONFIG{ 'arch' } )
     {
@@ -638,7 +638,7 @@
     }
 
     #
-    #  Propogate the --keyring argument
+    #  Propagate the --keyring argument
     #
     if ( $CONFIG{ 'keyring' } )
     {
@@ -701,7 +701,7 @@
       "rinse --distribution=$CONFIG{'dist'} --directory=$CONFIG{'location'}";
 
     #
-    #  Propogate the --arch argument
+    #  Propagate the --arch argument
     #
     if ( $CONFIG{ 'arch' } )
     {
@@ -727,7 +727,7 @@
     }
 
     #
-    #  Propogate the verbosity setting.
+    #  Propagate the verbosity setting.
     #
     if ( $CONFIG{ 'verbose' } )
     {
@@ -751,7 +751,7 @@
 {
 
     #
-    #  Propogate the verbosity setting.
+    #  Propagate the verbosity setting.
     #
     my $EXTRA = '';
     if ( $CONFIG{ 'verbose' } )
@@ -760,7 +760,7 @@
     }
 
     #
-    #  Propogate any arch setting we might have.
+    #  Propagate any arch setting we might have.
     #
     if ( $CONFIG{ 'arch' } )
     {
diff -Nru xen-tools-4.6.2/ChangeLog xen-tools-4.7/ChangeLog
--- xen-tools-4.6.2/ChangeLog	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/ChangeLog	2017-01-22 23:47:28.000000000 +0000
@@ -1,3 +1,265 @@
+commit b7e8fafcb1e227e4eccd8c22e4fcf36687d6a34b
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Mon Jan 23 00:41:35 2017 +0100
+
+    Release as xen-tools 4.7
+    
+    Also upload to Debian as 4.7-1.
+
+commit 44fc213fc796ba7ea3f3160bec38a34d5290188c
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Tue Jan 17 21:20:01 2017 +0100
+
+    release-testing: Add some helpful output and raise waiting time to 10 seconds
+
+commit 862ce3b17c96f8b76db596b6aa16fdba3d03b5b7
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Tue Jan 17 21:06:39 2017 +0100
+
+    release-testing: Untangle deletion and creation of Domus
+    
+    This hopefully further mitigates LVM race conditions during heavy
+    testing.
+
+commit 03179408158491c3fbb95faa7a17db2149b7479e
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Tue Jan 17 20:41:54 2017 +0100
+
+    release-testing: Further mitigate LVM race conditions by using xen-delete-image
+
+commit c3fcf5f4baaf76e82e3391fe86ed1d548de72174
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Tue Jan 17 20:03:52 2017 +0100
+
+    Don't include oldoldstable in release testing
+    
+    It's not always and especially currently not available.
+
+commit ab9b6c7d3828669c4746062b497545a39c1b31f9
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Tue Jan 17 20:02:35 2017 +0100
+
+    release-testing: Use exec to create the log to not cover the exit code
+
+commit d315f17effc33ff6ab4c2ef5c03ef1d64842fc2d
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Tue Jan 17 18:46:39 2017 +0100
+
+    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.
+
+commit 9c0086120fc02e476ef9e04fb9dc7b4f04fcff32
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Tue Jan 17 17:58:17 2017 +0100
+
+    List new distributions.conf keywords explicitly
+
+commit 76aabb0eb5f6facfbeaabc66fcdcbbcbe0d2d18e
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Tue Jan 17 17:55:38 2017 +0100
+
+    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.
+
+commit 126d0ad5bc4d06a491d43fa60460193c13d4c470
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Tue Jan 17 17:42:37 2017 +0100
+
+    release-testing: Use "set -e" instead of "|| break"
+
+commit 5b8ef34ee68c7b0b713d8b7e6a2fa10204f4f213
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Tue Jan 17 17:40:26 2017 +0100
+
+    Use per-test-unique host names
+    
+    Avoids race conditions with immediately re-used LVs.
+
+commit 0f1daa0b27f4c49005e002dc44bc8046a933230b
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Mon Jan 16 19:38:07 2017 +0100
+
+    Support cases like Squeeze being EoL, but its key still being in the default keyring
+
+commit 9647ab082cdd2215ef6060d70971834a459ba034
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Mon Jan 16 19:32:36 2017 +0100
+
+    Fix emacs syntax highlighting
+    
+    At least GNU Emacs 25 doesn't seem to like HEREDOCS with underscores
+    in its delimiters.
+
+commit 799052c2c972d24e53b7006c8266282d416dca2a
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Tue Jan 10 23:58:30 2017 +0100
+
+    [release testing] Heavier workaround for LVM-related race conditions
+
+commit c84431bdb03cbf632f1cf6e96d77722433fb3184
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Tue Jan 10 22:22:07 2017 +0100
+
+    Fix missing colon
+    
+    Thanks Lintian!
+
+commit 9f6b91fdbfd8c213880dc717c085b498211c6877
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Tue Jan 10 22:20:57 2017 +0100
+
+    Preliminary support for Ubuntu 17.04 Zesty Zapus
+
+commit 1bd9b3e1a81f75cbd948de953cf9938d300c3360
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Tue Jan 10 21:48:42 2017 +0100
+
+    Add changelog items for previous commit
+
+commit 07d014a0d67a2096183c0c9354e9aec135c30df0
+Author: Santiago Vila <sanvila@unex.es>
+Date:   Thu Oct 9 18:54:28 2014 +0200
+
+    Fix possible missing gateway in generated /etc/network/interfaces
+    
+    Closes: https://bugs.debian.org/764625
+
+commit 66a74b6f9f4deef362035fdba374da90ebf53c2f
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Tue Jan 10 21:32:18 2017 +0100
+
+    Add changelog items for previous commit
+
+commit ef096628225bd8b2ef6a8c18fd4743f5fdbfe8f6
+Author: Daniel Reichelt <debian@nachtgeist.net>
+Date:   Sun Oct 30 20:23:40 2016 +0100
+
+    Fix inconsistent handling of --nopygrub parameter
+    
+    Closes: https://bugs.debian.org/842609
+
+commit 40191bbd074897a040edd9cb707f902e642f31dd
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Tue Jan 10 21:24:13 2017 +0100
+
+    Default file system is now ext4 (instead of ext3)
+
+commit 7a3791d1aac6de24f7505aeef4caa64cf1173f5f
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Tue Jan 10 21:05:10 2017 +0100
+
+    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
+
+commit 4d4daca74585661ea43cf8bc1a2b807ffc86cbc1
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Thu Aug 11 21:47:35 2016 +0200
+
+    Fix typos found by check-all-the-things/spellintian
+
+commit bdc34f7deb6e405acf77bdf3bfd9b0694296967b
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Thu Aug 11 21:36:35 2016 +0200
+
+    Travis CI: Also check with Perl 5.24
+
+commit 18b76606d2a2f5aac4487de461cc50d242cae6e3
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Thu Aug 11 21:35:41 2016 +0200
+
+    Fix typos found by check-all-the-things/codespell
+
+commit 7e6bbc01a8a96651d83018e8ccfd2efcbe045432
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Thu Aug 11 20:55:12 2016 +0200
+
+    Clarify one paragraph in SUPPORT.markdown
+
+commit ca9e091d4bea14bdadcbf3010833f4c7f64e5c08
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Thu Aug 11 20:52:05 2016 +0200
+
+    Switch many URLs to https://; update them if broken or redirected
+
+commit 32fcc069b45c772b14a5a46515e5e4cc29efc9c7
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Thu Aug 11 20:08:29 2016 +0200
+
+    Ignore debhelper stamp files
+
+commit 5d7954dde215d8e18f9a07394b3cf6c405dc220a
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Thu Aug 11 20:04:28 2016 +0200
+
+    Support Ubuntu's "devel" alias
+
+commit beda1b78a50e177598013185245340c502cab0b3
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Thu Aug 11 20:02:21 2016 +0200
+
+    Update distribution list
+
+commit e53e8ed2d8f8351ca0b4506df5f0ad3b609be725
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Tue Jun 7 09:09:25 2016 +0200
+
+    TODO: Fix xdm and gdm roles wrt. to uptodate package names
+
+commit b0177f013e8ad79d5b982a9703df08a79950defa
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Sun Apr 17 01:00:18 2016 +0200
+
+    Debian packaging: Use NEWS.markdown as upstream changelog
+    
+    No more install it as separate documentation.
+
+commit a2438497c7d493f7eec0da1bf2b12f19ad1ee1c8
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Sun Apr 17 00:56:30 2016 +0200
+
+    Fix typo found by lintian
+
+commit 808bbe790f737710f9783296b31175edc7509a87
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Sun Apr 17 00:53:53 2016 +0200
+
+    Declare compliance with Debian Policy 3.9.8
+    
+    No further changes were required to reach compliance.
+
+commit bfc7c833a7a25e13603a91fc94cbae797af737f2
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Sun Apr 17 00:51:59 2016 +0200
+
+    Add changelog entries for previous fix
+    
+    … and other minor stuff.
+
+commit fa276179d86b404360c1a7f2f97a162b3580175b
+Author: Yuri Sakhno <ysakhno@componentix.com>
+Date:   Sat Apr 16 21:45:00 2016 +0300
+
+    Fix for the exit code reporting in case of error
+
+commit 7e7feb49b547f2c977844bca93b1d82d750a9176
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Thu Dec 24 11:04:51 2015 +0100
+
+    Add a short sleep to release-testing for umount race condition
+
 commit 0f731a049c38f2273bd065e7c86f6afa58bda7a4
 Author: Axel Beckert <abe@deuxchevaux.org>
 Date:   Wed Dec 23 18:07:46 2015 +0100
@@ -1641,7 +1903,7 @@
     Merge branch 'master' of gitorious.org:xen-tools/xen-tools
     
     Conflicts:
-    	debian/changelog
+            debian/changelog
 
 commit 76d9d5951058f64fa5eff32676308e12fd4fe7a7
 Author: Axel Beckert <abe@deuxchevaux.org>
@@ -2285,9 +2547,9 @@
     Merge branch 'master' into code-deduplication
     
     Conflicts:
-    	bin/xen-create-image
-    	bin/xen-create-nfs
-    	bin/xt-create-xen-config
+            bin/xen-create-image
+            bin/xen-create-nfs
+            bin/xt-create-xen-config
 
 commit 83eede665c39ed25ea315f13823ffa43204578f4
 Author: Axel Beckert <abe@deuxchevaux.org>
@@ -2337,7 +2599,7 @@
     Merge branch 'master' into code-deduplication
     
     Conflicts:
-    	bin/xen-create-image
+            bin/xen-create-image
 
 commit 874d1fcfb0b88dc11eddc558773cec43493d0d3d
 Author: Axel Beckert <abe@deuxchevaux.org>
@@ -2404,7 +2666,7 @@
     Merge branch 'master' of github.com:xtaran/xen-tools
     
     Conflicts:
-    	debian/changelog
+            debian/changelog
 
 commit 3b7750e9a9ea89a7d4cabbe2d1176fb5a0a7d901
 Author: Axel Beckert <abe@deuxchevaux.org>
@@ -3050,7 +3312,7 @@
     Merge branch 'master' into code-deduplication
     
     Conflicts:
-    	bin/xen-create-image
+            bin/xen-create-image
 
 commit 83f736f0dde7af965465a7a0563c34fe9ae416b6
 Author: Axel Beckert <abe@deuxchevaux.org>
@@ -3339,7 +3601,7 @@
     Merge branch '4.2' of gitorious.org:xen-tools/xen-tools into 4.2
     
     Conflicts:
-    	debian/changelog
+            debian/changelog
 
 commit caca5395f9f2a6364fa4fb754592aa807d9530c9
 Merge: 76ad9e7 d8561d4
@@ -3391,7 +3653,7 @@
     
     Conflicts from cherry-pick:
     
-    	debian/changelog
+            debian/changelog
 
 commit 0d813d01c87b2367e585b71d5d2e3548b9efe0f1
 Merge: cabd776 09179f2
@@ -3401,7 +3663,7 @@
     Merge branch '4.2'
     
     Conflicts:
-    	debian/changelog
+            debian/changelog
 
 commit 09179f2dea6731aeed0c982eeb2ca7c30e1ac7e2
 Author: Axel Beckert <abe@deuxchevaux.org>
@@ -3488,7 +3750,7 @@
     Merge branch '4.2'
     
     Conflicts:
-    	debian/changelog
+            debian/changelog
 
 commit 0d1bc0e61cccb9af4d9599f158ec0110b8a8c91c
 Author: Axel Beckert <abe@deuxchevaux.org>
@@ -3535,7 +3797,7 @@
     Merge branch 'master' of gitorious.org:xen-tools/xen-tools
     
     Conflicts:
-    	debian/changelog
+            debian/changelog
 
 commit 1d81bd1d5cacf8772d21a33ca1fc92dd1fd3e5df
 Merge: 2aa139d 9921c9a
@@ -3545,7 +3807,7 @@
     Merge branch '4.2'
     
     Conflicts:
-    	KNOWN_BUGS
+            KNOWN_BUGS
 
 commit 9921c9a3e8ef8e47ebfe62dc99384cffd9d4921c
 Author: Axel Beckert <abe@deuxchevaux.org>
@@ -5367,7 +5629,7 @@
     Merge branch 'master' of gitorious.org:xen-tools/xen-tools
     
     Conflicts:
-    	TODO
+            TODO
 
 commit e121eca49acb4d8fb2d742b075b4ee8574e68af9
 Author: Dmitry Nedospasov <dmitry@nedos.net>
@@ -5504,10 +5766,10 @@
 Date:   Wed May 19 13:46:58 2010 +0200
 
     Added support for (optionally) setting the bridge
-    	--bridge
+            --bridge
     
     Added support for setting the number of vcpus
-    	--vcpus
+            --vcpus
 
 commit e4eae6fcf5aa3ca6c372fa6295e10e22e723e34d
 Author: Axel Beckert <abe@deuxchevaux.org>
@@ -5994,10 +6256,10 @@
 Date:   Sat Apr 24 12:11:55 2010 +0200
 
     Updated README to reflect the following:
-    	* Added the gitorious git repsoitory
-    	* Added a list of supported Distros (test by me)
-    	* Changed information on RPM-Based repositories
-    	* Other minor changes
+            * Added the gitorious git repsoitory
+            * Added a list of supported Distros (test by me)
+            * Changed information on RPM-Based repositories
+            * Other minor changes
 
 commit 23cd316a3f52706f928d19f75917332ce0ddd802
 Merge: cda579c a214296
@@ -6066,9 +6328,9 @@
 Date:   Sat Apr 17 14:41:18 2010 +0200
 
     1. Added pygrub support to the ubuntu scripts
-    	- Hardy still not working
+            - Hardy still not working
     2. Added karmic support
-    	- Working fully
+            - Working fully
     3. Edited Makefile to install karmic hooks
 
 commit e5a3a800496abae762ee872f47f1b3bb1e7b4866
diff -Nru xen-tools-4.6.2/debian/changelog xen-tools-4.7/debian/changelog
--- xen-tools-4.6.2/debian/changelog	2015-12-23 17:22:55.000000000 +0000
+++ xen-tools-4.7/debian/changelog	2017-01-22 23:39:11.000000000 +0000
@@ -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 @@
       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-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 @@
   [ 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)
diff -Nru xen-tools-4.6.2/debian/control xen-tools-4.7/debian/control
--- xen-tools-4.6.2/debian/control	2015-10-23 19:20:03.000000000 +0000
+++ xen-tools-4.7/debian/control	2017-01-22 23:31:42.000000000 +0000
@@ -17,10 +17,10 @@
                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 @@
    * 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 @@
    * 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
diff -Nru xen-tools-4.6.2/debian/copyright xen-tools-4.7/debian/copyright
--- xen-tools-4.6.2/debian/copyright	2015-12-16 16:29:40.000000000 +0000
+++ xen-tools-4.7/debian/copyright	2016-08-12 08:35:08.000000000 +0000
@@ -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:
diff -Nru xen-tools-4.6.2/debian/docs xen-tools-4.7/debian/docs
--- xen-tools-4.6.2/debian/docs	2015-07-21 11:32:50.000000000 +0000
+++ xen-tools-4.7/debian/docs	2016-06-07 07:02:47.000000000 +0000
@@ -2,4 +2,3 @@
 README.markdown
 SUPPORT.markdown
 TODO.markdown
-NEWS.markdown
diff -Nru xen-tools-4.6.2/debian/NEWS xen-tools-4.7/debian/NEWS
--- xen-tools-4.6.2/debian/NEWS	2015-01-28 14:32:00.000000000 +0000
+++ xen-tools-4.7/debian/NEWS	2016-08-12 08:35:08.000000000 +0000
@@ -26,7 +26,7 @@
 
   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 @@
   path ending in /debian/ there.
 
  -- Axel Beckert <abe@debian.org>  Sun, 30 May 2010 22:36:16 +0200
-
diff -Nru xen-tools-4.6.2/debian/rules xen-tools-4.7/debian/rules
--- xen-tools-4.6.2/debian/rules	2015-07-20 11:40:08.000000000 +0000
+++ xen-tools-4.7/debian/rules	2016-06-07 07:02:47.000000000 +0000
@@ -8,4 +8,7 @@
 override_dh_auto_test:
 	make non-author-test
 
+override_dh_installchangelogs:
+	dh_installchangelogs NEWS.markdown
+
 override_dh_auto_build:
diff -Nru xen-tools-4.6.2/debian/watch xen-tools-4.7/debian/watch
--- xen-tools-4.6.2/debian/watch	2015-10-24 00:43:17.000000000 +0000
+++ xen-tools-4.7/debian/watch	2016-08-12 08:35:08.000000000 +0000
@@ -12,5 +12,5 @@
 # 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
diff -Nru xen-tools-4.6.2/etc/distributions.conf xen-tools-4.7/etc/distributions.conf
--- xen-tools-4.6.2/etc/distributions.conf	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/etc/distributions.conf	2017-01-22 23:47:28.000000000 +0000
@@ -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 @@
 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
diff -Nru xen-tools-4.6.2/etc/xen-tools.conf xen-tools-4.7/etc/xen-tools.conf
--- xen-tools-4.6.2/etc/xen-tools.conf	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/etc/xen-tools.conf	2017-01-22 23:47:28.000000000 +0000
@@ -7,7 +7,7 @@
 #
 #  For more details please see:
 #
-#        http://xen-tools.org/
+#        https://xen-tools.org/
 #
 ##
 
@@ -126,11 +126,11 @@
 ##
 #
 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 @@
 #
 
 #
-# 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
diff -Nru xen-tools-4.6.2/examples/release-testing xen-tools-4.7/examples/release-testing
--- xen-tools-4.6.2/examples/release-testing	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/examples/release-testing	2017-01-22 23:47:28.000000000 +0000
@@ -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
diff -Nru xen-tools-4.6.2/hooks/centos-4/10-disable-tls xen-tools-4.7/hooks/centos-4/10-disable-tls
--- xen-tools-4.6.2/hooks/centos-4/10-disable-tls	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/centos-4/10-disable-tls	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 
diff -Nru xen-tools-4.6.2/hooks/centos-4/15-setup-arch xen-tools-4.7/hooks/centos-4/15-setup-arch
--- xen-tools-4.6.2/hooks/centos-4/15-setup-arch	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/centos-4/15-setup-arch	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/centos-4/20-setup-yum xen-tools-4.7/hooks/centos-4/20-setup-yum
--- xen-tools-4.6.2/hooks/centos-4/20-setup-yum	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/centos-4/20-setup-yum	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/centos-4/35-setup-users xen-tools-4.7/hooks/centos-4/35-setup-users
--- xen-tools-4.6.2/hooks/centos-4/35-setup-users	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/centos-4/35-setup-users	2017-01-22 23:47:28.000000000 +0000
@@ -9,7 +9,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 use strict;
diff -Nru xen-tools-4.6.2/hooks/centos-4/40-setup-networking xen-tools-4.7/hooks/centos-4/40-setup-networking
--- xen-tools-4.6.2/hooks/centos-4/40-setup-networking	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/centos-4/40-setup-networking	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/centos-4/50-setup-hostname xen-tools-4.7/hooks/centos-4/50-setup-hostname
--- xen-tools-4.6.2/hooks/centos-4/50-setup-hostname	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/centos-4/50-setup-hostname	2017-01-22 23:47:28.000000000 +0000
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 
diff -Nru xen-tools-4.6.2/hooks/centos-4/55-create-dev xen-tools-4.7/hooks/centos-4/55-create-dev
--- xen-tools-4.6.2/hooks/centos-4/55-create-dev	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/centos-4/55-create-dev	2017-01-22 23:47:28.000000000 +0000
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/centos-4/70-install-ssh xen-tools-4.7/hooks/centos-4/70-install-ssh
--- xen-tools-4.6.2/hooks/centos-4/70-install-ssh	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/centos-4/70-install-ssh	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/centos-4/75-fixup-securetty xen-tools-4.7/hooks/centos-4/75-fixup-securetty
--- xen-tools-4.6.2/hooks/centos-4/75-fixup-securetty	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/centos-4/75-fixup-securetty	2017-01-22 23:47:28.000000000 +0000
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/centos-4/80-install-modules xen-tools-4.7/hooks/centos-4/80-install-modules
--- xen-tools-4.6.2/hooks/centos-4/80-install-modules	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/centos-4/80-install-modules	2017-01-22 23:47:28.000000000 +0000
@@ -9,7 +9,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/centos-4/90-make-fstab xen-tools-4.7/hooks/centos-4/90-make-fstab
--- xen-tools-4.6.2/hooks/centos-4/90-make-fstab	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/centos-4/90-make-fstab	2017-01-22 23:47:28.000000000 +0000
@@ -9,7 +9,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/centos-4/99-clean-image xen-tools-4.7/hooks/centos-4/99-clean-image
--- xen-tools-4.6.2/hooks/centos-4/99-clean-image	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/centos-4/99-clean-image	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/centos-5/10-disable-tls xen-tools-4.7/hooks/centos-5/10-disable-tls
--- xen-tools-4.6.2/hooks/centos-5/10-disable-tls	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/centos-5/10-disable-tls	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 
diff -Nru xen-tools-4.6.2/hooks/centos-5/15-setup-arch xen-tools-4.7/hooks/centos-5/15-setup-arch
--- xen-tools-4.6.2/hooks/centos-5/15-setup-arch	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/centos-5/15-setup-arch	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/centos-5/20-setup-yum xen-tools-4.7/hooks/centos-5/20-setup-yum
--- xen-tools-4.6.2/hooks/centos-5/20-setup-yum	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/centos-5/20-setup-yum	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/centos-5/25-setup-kernel xen-tools-4.7/hooks/centos-5/25-setup-kernel
--- xen-tools-4.6.2/hooks/centos-5/25-setup-kernel	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/centos-5/25-setup-kernel	2017-01-22 23:47:28.000000000 +0000
@@ -59,9 +59,9 @@
 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
diff -Nru xen-tools-4.6.2/hooks/centos-5/35-setup-users xen-tools-4.7/hooks/centos-5/35-setup-users
--- xen-tools-4.6.2/hooks/centos-5/35-setup-users	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/centos-5/35-setup-users	2017-01-22 23:47:28.000000000 +0000
@@ -9,7 +9,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 use strict;
diff -Nru xen-tools-4.6.2/hooks/centos-5/40-setup-networking xen-tools-4.7/hooks/centos-5/40-setup-networking
--- xen-tools-4.6.2/hooks/centos-5/40-setup-networking	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/centos-5/40-setup-networking	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/centos-5/50-setup-hostname xen-tools-4.7/hooks/centos-5/50-setup-hostname
--- xen-tools-4.6.2/hooks/centos-5/50-setup-hostname	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/centos-5/50-setup-hostname	2017-01-22 23:47:28.000000000 +0000
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 
diff -Nru xen-tools-4.6.2/hooks/centos-5/55-create-dev xen-tools-4.7/hooks/centos-5/55-create-dev
--- xen-tools-4.6.2/hooks/centos-5/55-create-dev	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/centos-5/55-create-dev	2017-01-22 23:47:28.000000000 +0000
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/centos-5/70-install-ssh xen-tools-4.7/hooks/centos-5/70-install-ssh
--- xen-tools-4.6.2/hooks/centos-5/70-install-ssh	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/centos-5/70-install-ssh	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/centos-5/75-fixup-securetty xen-tools-4.7/hooks/centos-5/75-fixup-securetty
--- xen-tools-4.6.2/hooks/centos-5/75-fixup-securetty	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/centos-5/75-fixup-securetty	2017-01-22 23:47:28.000000000 +0000
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/centos-5/80-install-modules xen-tools-4.7/hooks/centos-5/80-install-modules
--- xen-tools-4.6.2/hooks/centos-5/80-install-modules	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/centos-5/80-install-modules	2017-01-22 23:47:28.000000000 +0000
@@ -9,7 +9,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/centos-5/90-make-fstab xen-tools-4.7/hooks/centos-5/90-make-fstab
--- xen-tools-4.6.2/hooks/centos-5/90-make-fstab	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/centos-5/90-make-fstab	2017-01-22 23:47:28.000000000 +0000
@@ -9,7 +9,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/centos-5/99-clean-image xen-tools-4.7/hooks/centos-5/99-clean-image
--- xen-tools-4.6.2/hooks/centos-5/99-clean-image	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/centos-5/99-clean-image	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/centos-6/10-disable-tls xen-tools-4.7/hooks/centos-6/10-disable-tls
--- xen-tools-4.6.2/hooks/centos-6/10-disable-tls	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/centos-6/10-disable-tls	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 
diff -Nru xen-tools-4.6.2/hooks/centos-6/20-setup-yum xen-tools-4.7/hooks/centos-6/20-setup-yum
--- xen-tools-4.6.2/hooks/centos-6/20-setup-yum	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/centos-6/20-setup-yum	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/centos-6/25-setup-kernel xen-tools-4.7/hooks/centos-6/25-setup-kernel
--- xen-tools-4.6.2/hooks/centos-6/25-setup-kernel	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/centos-6/25-setup-kernel	2017-01-22 23:47:28.000000000 +0000
@@ -59,9 +59,9 @@
 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
diff -Nru xen-tools-4.6.2/hooks/centos-6/35-setup-users xen-tools-4.7/hooks/centos-6/35-setup-users
--- xen-tools-4.6.2/hooks/centos-6/35-setup-users	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/centos-6/35-setup-users	2017-01-22 23:47:28.000000000 +0000
@@ -9,7 +9,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 use strict;
diff -Nru xen-tools-4.6.2/hooks/centos-6/40-setup-networking xen-tools-4.7/hooks/centos-6/40-setup-networking
--- xen-tools-4.6.2/hooks/centos-6/40-setup-networking	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/centos-6/40-setup-networking	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/centos-6/50-setup-hostname xen-tools-4.7/hooks/centos-6/50-setup-hostname
--- xen-tools-4.6.2/hooks/centos-6/50-setup-hostname	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/centos-6/50-setup-hostname	2017-01-22 23:47:28.000000000 +0000
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 
diff -Nru xen-tools-4.6.2/hooks/centos-6/55-create-dev xen-tools-4.7/hooks/centos-6/55-create-dev
--- xen-tools-4.6.2/hooks/centos-6/55-create-dev	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/centos-6/55-create-dev	2017-01-22 23:47:28.000000000 +0000
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/centos-6/70-install-ssh xen-tools-4.7/hooks/centos-6/70-install-ssh
--- xen-tools-4.6.2/hooks/centos-6/70-install-ssh	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/centos-6/70-install-ssh	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/centos-6/75-fixup-securetty xen-tools-4.7/hooks/centos-6/75-fixup-securetty
--- xen-tools-4.6.2/hooks/centos-6/75-fixup-securetty	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/centos-6/75-fixup-securetty	2017-01-22 23:47:28.000000000 +0000
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/centos-6/80-install-modules xen-tools-4.7/hooks/centos-6/80-install-modules
--- xen-tools-4.6.2/hooks/centos-6/80-install-modules	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/centos-6/80-install-modules	2017-01-22 23:47:28.000000000 +0000
@@ -9,7 +9,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/centos-6/90-make-fstab xen-tools-4.7/hooks/centos-6/90-make-fstab
--- xen-tools-4.6.2/hooks/centos-6/90-make-fstab	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/centos-6/90-make-fstab	2017-01-22 23:47:28.000000000 +0000
@@ -9,7 +9,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/centos-6/99-clean-image xen-tools-4.7/hooks/centos-6/99-clean-image
--- xen-tools-4.6.2/hooks/centos-6/99-clean-image	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/centos-6/99-clean-image	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/common/01-disable-daemons xen-tools-4.7/hooks/common/01-disable-daemons
--- xen-tools-4.6.2/hooks/common/01-disable-daemons	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/common/01-disable-daemons	2017-01-22 23:47:28.000000000 +0000
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/common/05-shadowconfig-on xen-tools-4.7/hooks/common/05-shadowconfig-on
--- xen-tools-4.6.2/hooks/common/05-shadowconfig-on	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/common/05-shadowconfig-on	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/common/10-disable-tls xen-tools-4.7/hooks/common/10-disable-tls
--- xen-tools-4.6.2/hooks/common/10-disable-tls	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/common/10-disable-tls	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 
diff -Nru xen-tools-4.6.2/hooks/common/15-disable-hwclock xen-tools-4.7/hooks/common/15-disable-hwclock
--- xen-tools-4.6.2/hooks/common/15-disable-hwclock	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/common/15-disable-hwclock	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/common/20-setup-yum xen-tools-4.7/hooks/common/20-setup-yum
--- xen-tools-4.6.2/hooks/common/20-setup-yum	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/common/20-setup-yum	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/common/35-setup-users xen-tools-4.7/hooks/common/35-setup-users
--- xen-tools-4.6.2/hooks/common/35-setup-users	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/common/35-setup-users	2017-01-22 23:47:28.000000000 +0000
@@ -9,7 +9,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 use strict;
diff -Nru xen-tools-4.6.2/hooks/common/40-setup-networking-deb xen-tools-4.7/hooks/common/40-setup-networking-deb
--- xen-tools-4.6.2/hooks/common/40-setup-networking-deb	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/common/40-setup-networking-deb	2017-01-22 23:47:28.000000000 +0000
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
@@ -88,8 +88,9 @@
     #
     # gateway address?
     #
+    gway='';
     if [ -n "${gateway}" ]; then
-      gateway=" gateway ${gateway}"
+      gway=" gateway ${gateway}"
     fi
 
     #
@@ -107,7 +108,7 @@
 auto eth0
 iface eth0 inet static
  address ${ip1}
-${gateway}
+${gway}
  netmask ${netmask}
 ${bcast}
 ${point}
diff -Nru xen-tools-4.6.2/hooks/common/40-setup-networking-rpm xen-tools-4.7/hooks/common/40-setup-networking-rpm
--- xen-tools-4.6.2/hooks/common/40-setup-networking-rpm	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/common/40-setup-networking-rpm	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/common/50-setup-hostname-deb xen-tools-4.7/hooks/common/50-setup-hostname-deb
--- xen-tools-4.6.2/hooks/common/50-setup-hostname-deb	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/common/50-setup-hostname-deb	2017-01-22 23:47:28.000000000 +0000
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 
@@ -63,7 +63,7 @@
     #
     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
diff -Nru xen-tools-4.6.2/hooks/common/50-setup-hostname-rpm xen-tools-4.7/hooks/common/50-setup-hostname-rpm
--- xen-tools-4.6.2/hooks/common/50-setup-hostname-rpm	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/common/50-setup-hostname-rpm	2017-01-22 23:47:28.000000000 +0000
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 
diff -Nru xen-tools-4.6.2/hooks/common/55-create-dev xen-tools-4.7/hooks/common/55-create-dev
--- xen-tools-4.6.2/hooks/common/55-create-dev	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/common/55-create-dev	2017-01-22 23:47:28.000000000 +0000
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/common/70-install-ssh-deb xen-tools-4.7/hooks/common/70-install-ssh-deb
--- xen-tools-4.6.2/hooks/common/70-install-ssh-deb	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/common/70-install-ssh-deb	2017-01-22 23:47:28.000000000 +0000
@@ -8,7 +8,7 @@
 #
 # Dmitry Nedospasov
 # --
-# http://nedos.net/
+# http://www.nedos.net/
 
 prefix=$1
 
diff -Nru xen-tools-4.6.2/hooks/common/70-install-ssh-rpm xen-tools-4.7/hooks/common/70-install-ssh-rpm
--- xen-tools-4.6.2/hooks/common/70-install-ssh-rpm	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/common/70-install-ssh-rpm	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/common/75-fixup-securetty xen-tools-4.7/hooks/common/75-fixup-securetty
--- xen-tools-4.6.2/hooks/common/75-fixup-securetty	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/common/75-fixup-securetty	2017-01-22 23:47:28.000000000 +0000
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/common/80-install-modules-deb xen-tools-4.7/hooks/common/80-install-modules-deb
--- xen-tools-4.6.2/hooks/common/80-install-modules-deb	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/common/80-install-modules-deb	2017-01-22 23:47:28.000000000 +0000
@@ -9,7 +9,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
@@ -31,7 +31,7 @@
 #
 logMessage Script $0 starting
 
-if [ ${pygrub} ]; then
+if [ "${pygrub}" = "1" ]; then
     logMessage "pygrub set, skipping module install"
 else
 #
diff -Nru xen-tools-4.6.2/hooks/common/80-install-modules-rpm xen-tools-4.7/hooks/common/80-install-modules-rpm
--- xen-tools-4.6.2/hooks/common/80-install-modules-rpm	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/common/80-install-modules-rpm	2017-01-22 23:47:28.000000000 +0000
@@ -9,7 +9,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/common/82-install-grub-legacy xen-tools-4.7/hooks/common/82-install-grub-legacy
--- xen-tools-4.6.2/hooks/common/82-install-grub-legacy	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/common/82-install-grub-legacy	2017-01-22 23:47:28.000000000 +0000
@@ -26,7 +26,7 @@
 #
 logMessage Script $0 starting
 
-if [ ${pygrub} ]; then
+if [ "${pygrub}" = "1" ]; then
 
 #
 #  Install the grub 0.9x package ("grub-legacy" on Debian, "grub" on Ubuntu)
diff -Nru xen-tools-4.6.2/hooks/common/90-make-fstab xen-tools-4.7/hooks/common/90-make-fstab
--- xen-tools-4.6.2/hooks/common/90-make-fstab	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/common/90-make-fstab	2017-01-22 23:47:28.000000000 +0000
@@ -9,7 +9,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/common/99-clean-image-deb xen-tools-4.7/hooks/common/99-clean-image-deb
--- xen-tools-4.6.2/hooks/common/99-clean-image-deb	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/common/99-clean-image-deb	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/common/99-clean-image-rpm xen-tools-4.7/hooks/common/99-clean-image-rpm
--- xen-tools-4.6.2/hooks/common/99-clean-image-rpm	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/common/99-clean-image-rpm	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/common/99-enable-daemons xen-tools-4.7/hooks/common/99-enable-daemons
--- xen-tools-4.6.2/hooks/common/99-enable-daemons	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/common/99-enable-daemons	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 
diff -Nru xen-tools-4.6.2/hooks/common.sh xen-tools-4.7/hooks/common.sh
--- xen-tools-4.6.2/hooks/common.sh	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/common.sh	2017-01-22 23:47:28.000000000 +0000
@@ -210,7 +210,7 @@
 # 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
diff -Nru xen-tools-4.6.2/hooks/dapper/01-disable-daemons xen-tools-4.7/hooks/dapper/01-disable-daemons
--- xen-tools-4.6.2/hooks/dapper/01-disable-daemons	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/dapper/01-disable-daemons	2017-01-22 23:47:28.000000000 +0000
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/dapper/05-shadowconfig-on xen-tools-4.7/hooks/dapper/05-shadowconfig-on
--- xen-tools-4.6.2/hooks/dapper/05-shadowconfig-on	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/dapper/05-shadowconfig-on	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/dapper/10-disable-tls xen-tools-4.7/hooks/dapper/10-disable-tls
--- xen-tools-4.6.2/hooks/dapper/10-disable-tls	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/dapper/10-disable-tls	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 
diff -Nru xen-tools-4.6.2/hooks/dapper/15-disable-hwclock xen-tools-4.7/hooks/dapper/15-disable-hwclock
--- xen-tools-4.6.2/hooks/dapper/15-disable-hwclock	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/dapper/15-disable-hwclock	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/dapper/35-setup-users xen-tools-4.7/hooks/dapper/35-setup-users
--- xen-tools-4.6.2/hooks/dapper/35-setup-users	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/dapper/35-setup-users	2017-01-22 23:47:28.000000000 +0000
@@ -9,7 +9,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 use strict;
diff -Nru xen-tools-4.6.2/hooks/dapper/40-setup-networking xen-tools-4.7/hooks/dapper/40-setup-networking
--- xen-tools-4.6.2/hooks/dapper/40-setup-networking	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/dapper/40-setup-networking	2017-01-22 23:47:28.000000000 +0000
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
@@ -88,8 +88,9 @@
     #
     # gateway address?
     #
+    gway='';
     if [ -n "${gateway}" ]; then
-      gateway=" gateway ${gateway}"
+      gway=" gateway ${gateway}"
     fi
 
     #
@@ -107,7 +108,7 @@
 auto eth0
 iface eth0 inet static
  address ${ip1}
-${gateway}
+${gway}
  netmask ${netmask}
 ${bcast}
 ${point}
diff -Nru xen-tools-4.6.2/hooks/dapper/50-setup-hostname xen-tools-4.7/hooks/dapper/50-setup-hostname
--- xen-tools-4.6.2/hooks/dapper/50-setup-hostname	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/dapper/50-setup-hostname	2017-01-22 23:47:28.000000000 +0000
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 
@@ -63,7 +63,7 @@
     #
     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
diff -Nru xen-tools-4.6.2/hooks/dapper/55-create-dev xen-tools-4.7/hooks/dapper/55-create-dev
--- xen-tools-4.6.2/hooks/dapper/55-create-dev	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/dapper/55-create-dev	2017-01-22 23:47:28.000000000 +0000
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/dapper/70-install-ssh xen-tools-4.7/hooks/dapper/70-install-ssh
--- xen-tools-4.6.2/hooks/dapper/70-install-ssh	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/dapper/70-install-ssh	2017-01-22 23:47:28.000000000 +0000
@@ -8,7 +8,7 @@
 #
 # Dmitry Nedospasov
 # --
-# http://nedos.net/
+# http://www.nedos.net/
 
 prefix=$1
 
diff -Nru xen-tools-4.6.2/hooks/dapper/75-fixup-securetty xen-tools-4.7/hooks/dapper/75-fixup-securetty
--- xen-tools-4.6.2/hooks/dapper/75-fixup-securetty	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/dapper/75-fixup-securetty	2017-01-22 23:47:28.000000000 +0000
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/dapper/80-install-modules xen-tools-4.7/hooks/dapper/80-install-modules
--- xen-tools-4.6.2/hooks/dapper/80-install-modules	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/dapper/80-install-modules	2017-01-22 23:47:28.000000000 +0000
@@ -9,7 +9,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
@@ -31,7 +31,7 @@
 #
 logMessage Script $0 starting
 
-if [ ${pygrub} ]; then
+if [ "${pygrub}" = "1" ]; then
     logMessage "pygrub set, skipping module install"
 else
 #
diff -Nru xen-tools-4.6.2/hooks/dapper/90-make-fstab xen-tools-4.7/hooks/dapper/90-make-fstab
--- xen-tools-4.6.2/hooks/dapper/90-make-fstab	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/dapper/90-make-fstab	2017-01-22 23:47:28.000000000 +0000
@@ -9,7 +9,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/dapper/99-clean-image xen-tools-4.7/hooks/dapper/99-clean-image
--- xen-tools-4.6.2/hooks/dapper/99-clean-image	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/dapper/99-clean-image	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/dapper/99-enable-daemons xen-tools-4.7/hooks/dapper/99-enable-daemons
--- xen-tools-4.6.2/hooks/dapper/99-enable-daemons	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/dapper/99-enable-daemons	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 
diff -Nru xen-tools-4.6.2/hooks/debian/01-disable-daemons xen-tools-4.7/hooks/debian/01-disable-daemons
--- xen-tools-4.6.2/hooks/debian/01-disable-daemons	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/debian/01-disable-daemons	2017-01-22 23:47:28.000000000 +0000
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/debian/05-shadowconfig-on xen-tools-4.7/hooks/debian/05-shadowconfig-on
--- xen-tools-4.6.2/hooks/debian/05-shadowconfig-on	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/debian/05-shadowconfig-on	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/debian/15-disable-hwclock xen-tools-4.7/hooks/debian/15-disable-hwclock
--- xen-tools-4.6.2/hooks/debian/15-disable-hwclock	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/debian/15-disable-hwclock	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/debian/35-setup-users xen-tools-4.7/hooks/debian/35-setup-users
--- xen-tools-4.6.2/hooks/debian/35-setup-users	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/debian/35-setup-users	2017-01-22 23:47:28.000000000 +0000
@@ -9,7 +9,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 use strict;
diff -Nru xen-tools-4.6.2/hooks/debian/40-setup-networking xen-tools-4.7/hooks/debian/40-setup-networking
--- xen-tools-4.6.2/hooks/debian/40-setup-networking	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/debian/40-setup-networking	2017-01-22 23:47:28.000000000 +0000
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
@@ -88,8 +88,9 @@
     #
     # gateway address?
     #
+    gway='';
     if [ -n "${gateway}" ]; then
-      gateway=" gateway ${gateway}"
+      gway=" gateway ${gateway}"
     fi
 
     #
@@ -107,7 +108,7 @@
 auto eth0
 iface eth0 inet static
  address ${ip1}
-${gateway}
+${gway}
  netmask ${netmask}
 ${bcast}
 ${point}
diff -Nru xen-tools-4.6.2/hooks/debian/50-setup-hostname xen-tools-4.7/hooks/debian/50-setup-hostname
--- xen-tools-4.6.2/hooks/debian/50-setup-hostname	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/debian/50-setup-hostname	2017-01-22 23:47:28.000000000 +0000
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 
@@ -63,7 +63,7 @@
     #
     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
diff -Nru xen-tools-4.6.2/hooks/debian/55-create-dev xen-tools-4.7/hooks/debian/55-create-dev
--- xen-tools-4.6.2/hooks/debian/55-create-dev	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/debian/55-create-dev	2017-01-22 23:47:28.000000000 +0000
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/debian/70-install-ssh xen-tools-4.7/hooks/debian/70-install-ssh
--- xen-tools-4.6.2/hooks/debian/70-install-ssh	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/debian/70-install-ssh	2017-01-22 23:47:28.000000000 +0000
@@ -8,7 +8,7 @@
 #
 # Dmitry Nedospasov
 # --
-# http://nedos.net/
+# http://www.nedos.net/
 
 prefix=$1
 
diff -Nru xen-tools-4.6.2/hooks/debian/75-fixup-securetty xen-tools-4.7/hooks/debian/75-fixup-securetty
--- xen-tools-4.6.2/hooks/debian/75-fixup-securetty	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/debian/75-fixup-securetty	2017-01-22 23:47:28.000000000 +0000
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/debian/80-install-kernel xen-tools-4.7/hooks/debian/80-install-kernel
--- xen-tools-4.6.2/hooks/debian/80-install-kernel	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/debian/80-install-kernel	2017-01-22 23:47:28.000000000 +0000
@@ -7,7 +7,7 @@
 #
 # Dmitry Nedospasov
 # --
-# http://nedos.net
+# http://www.nedos.net/
 
 prefix=$1
 
@@ -21,7 +21,7 @@
     . ./hooks/common.sh
 fi
 
-if [ "${pygrub}" ]; then
+if [ "${pygrub}" = "1" ]; then
 #
 # Log our start
 #
diff -Nru xen-tools-4.6.2/hooks/debian/80-install-modules xen-tools-4.7/hooks/debian/80-install-modules
--- xen-tools-4.6.2/hooks/debian/80-install-modules	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/debian/80-install-modules	2017-01-22 23:47:28.000000000 +0000
@@ -9,7 +9,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
@@ -31,7 +31,7 @@
 #
 logMessage Script $0 starting
 
-if [ ${pygrub} ]; then
+if [ "${pygrub}" = "1" ]; then
     logMessage "pygrub set, skipping module install"
 else
 #
diff -Nru xen-tools-4.6.2/hooks/debian/82-install-grub-legacy xen-tools-4.7/hooks/debian/82-install-grub-legacy
--- xen-tools-4.6.2/hooks/debian/82-install-grub-legacy	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/debian/82-install-grub-legacy	2017-01-22 23:47:28.000000000 +0000
@@ -26,7 +26,7 @@
 #
 logMessage Script $0 starting
 
-if [ ${pygrub} ]; then
+if [ "${pygrub}" = "1" ]; then
 
 #
 #  Install the grub 0.9x package ("grub-legacy" on Debian, "grub" on Ubuntu)
diff -Nru xen-tools-4.6.2/hooks/debian/90-make-fstab xen-tools-4.7/hooks/debian/90-make-fstab
--- xen-tools-4.6.2/hooks/debian/90-make-fstab	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/debian/90-make-fstab	2017-01-22 23:47:28.000000000 +0000
@@ -9,7 +9,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/debian/95-configure-locales xen-tools-4.7/hooks/debian/95-configure-locales
--- xen-tools-4.6.2/hooks/debian/95-configure-locales	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/debian/95-configure-locales	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 prefix=$1
 
diff -Nru xen-tools-4.6.2/hooks/debian/99-clean-image xen-tools-4.7/hooks/debian/99-clean-image
--- xen-tools-4.6.2/hooks/debian/99-clean-image	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/debian/99-clean-image	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/debian/99-enable-daemons xen-tools-4.7/hooks/debian/99-enable-daemons
--- xen-tools-4.6.2/hooks/debian/99-enable-daemons	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/debian/99-enable-daemons	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 
diff -Nru xen-tools-4.6.2/hooks/edgy/01-disable-daemons xen-tools-4.7/hooks/edgy/01-disable-daemons
--- xen-tools-4.6.2/hooks/edgy/01-disable-daemons	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/edgy/01-disable-daemons	2017-01-22 23:47:28.000000000 +0000
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/edgy/05-shadowconfig-on xen-tools-4.7/hooks/edgy/05-shadowconfig-on
--- xen-tools-4.6.2/hooks/edgy/05-shadowconfig-on	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/edgy/05-shadowconfig-on	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/edgy/15-disable-hwclock xen-tools-4.7/hooks/edgy/15-disable-hwclock
--- xen-tools-4.6.2/hooks/edgy/15-disable-hwclock	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/edgy/15-disable-hwclock	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/edgy/35-setup-users xen-tools-4.7/hooks/edgy/35-setup-users
--- xen-tools-4.6.2/hooks/edgy/35-setup-users	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/edgy/35-setup-users	2017-01-22 23:47:28.000000000 +0000
@@ -9,7 +9,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 use strict;
diff -Nru xen-tools-4.6.2/hooks/edgy/40-setup-networking xen-tools-4.7/hooks/edgy/40-setup-networking
--- xen-tools-4.6.2/hooks/edgy/40-setup-networking	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/edgy/40-setup-networking	2017-01-22 23:47:28.000000000 +0000
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
@@ -88,8 +88,9 @@
     #
     # gateway address?
     #
+    gway='';
     if [ -n "${gateway}" ]; then
-      gateway=" gateway ${gateway}"
+      gway=" gateway ${gateway}"
     fi
 
     #
@@ -107,7 +108,7 @@
 auto eth0
 iface eth0 inet static
  address ${ip1}
-${gateway}
+${gway}
  netmask ${netmask}
 ${bcast}
 ${point}
diff -Nru xen-tools-4.6.2/hooks/edgy/50-setup-hostname xen-tools-4.7/hooks/edgy/50-setup-hostname
--- xen-tools-4.6.2/hooks/edgy/50-setup-hostname	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/edgy/50-setup-hostname	2017-01-22 23:47:28.000000000 +0000
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 
@@ -63,7 +63,7 @@
     #
     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
diff -Nru xen-tools-4.6.2/hooks/edgy/70-install-ssh xen-tools-4.7/hooks/edgy/70-install-ssh
--- xen-tools-4.6.2/hooks/edgy/70-install-ssh	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/edgy/70-install-ssh	2017-01-22 23:47:28.000000000 +0000
@@ -8,7 +8,7 @@
 #
 # Dmitry Nedospasov
 # --
-# http://nedos.net/
+# http://www.nedos.net/
 
 prefix=$1
 
diff -Nru xen-tools-4.6.2/hooks/edgy/75-fixup-securetty xen-tools-4.7/hooks/edgy/75-fixup-securetty
--- xen-tools-4.6.2/hooks/edgy/75-fixup-securetty	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/edgy/75-fixup-securetty	2017-01-22 23:47:28.000000000 +0000
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/edgy/80-install-kernel xen-tools-4.7/hooks/edgy/80-install-kernel
--- xen-tools-4.6.2/hooks/edgy/80-install-kernel	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/edgy/80-install-kernel	2017-01-22 23:47:28.000000000 +0000
@@ -7,7 +7,7 @@
 #
 # Dmitry Nedospasov
 # --
-# http://nedos.net
+# http://www.nedos.net/
 
 prefix=$1
 
@@ -27,7 +27,7 @@
 
 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
diff -Nru xen-tools-4.6.2/hooks/edgy/80-install-modules xen-tools-4.7/hooks/edgy/80-install-modules
--- xen-tools-4.6.2/hooks/edgy/80-install-modules	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/edgy/80-install-modules	2017-01-22 23:47:28.000000000 +0000
@@ -9,7 +9,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
@@ -31,7 +31,7 @@
 #
 logMessage Script $0 starting
 
-if [ ${pygrub} ]; then
+if [ "${pygrub}" = "1" ]; then
     logMessage "pygrub set, skipping module install"
 else
 #
diff -Nru xen-tools-4.6.2/hooks/edgy/82-install-grub-legacy xen-tools-4.7/hooks/edgy/82-install-grub-legacy
--- xen-tools-4.6.2/hooks/edgy/82-install-grub-legacy	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/edgy/82-install-grub-legacy	2017-01-22 23:47:28.000000000 +0000
@@ -26,7 +26,7 @@
 #
 logMessage Script $0 starting
 
-if [ ${pygrub} ]; then
+if [ "${pygrub}" = "1" ]; then
 
 #
 #  Install the grub 0.9x package ("grub-legacy" on Debian, "grub" on Ubuntu)
diff -Nru xen-tools-4.6.2/hooks/edgy/90-make-fstab xen-tools-4.7/hooks/edgy/90-make-fstab
--- xen-tools-4.6.2/hooks/edgy/90-make-fstab	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/edgy/90-make-fstab	2017-01-22 23:47:28.000000000 +0000
@@ -9,7 +9,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/edgy/99-clean-image xen-tools-4.7/hooks/edgy/99-clean-image
--- xen-tools-4.6.2/hooks/edgy/99-clean-image	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/edgy/99-clean-image	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/edgy/99-enable-daemons xen-tools-4.7/hooks/edgy/99-enable-daemons
--- xen-tools-4.6.2/hooks/edgy/99-enable-daemons	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/edgy/99-enable-daemons	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 
diff -Nru xen-tools-4.6.2/hooks/fedora-core-6/10-disable-tls xen-tools-4.7/hooks/fedora-core-6/10-disable-tls
--- xen-tools-4.6.2/hooks/fedora-core-6/10-disable-tls	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/fedora-core-6/10-disable-tls	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 
diff -Nru xen-tools-4.6.2/hooks/fedora-core-6/15-setup-arch xen-tools-4.7/hooks/fedora-core-6/15-setup-arch
--- xen-tools-4.6.2/hooks/fedora-core-6/15-setup-arch	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/fedora-core-6/15-setup-arch	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/fedora-core-6/20-setup-yum xen-tools-4.7/hooks/fedora-core-6/20-setup-yum
--- xen-tools-4.6.2/hooks/fedora-core-6/20-setup-yum	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/fedora-core-6/20-setup-yum	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/fedora-core-6/35-setup-users xen-tools-4.7/hooks/fedora-core-6/35-setup-users
--- xen-tools-4.6.2/hooks/fedora-core-6/35-setup-users	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/fedora-core-6/35-setup-users	2017-01-22 23:47:28.000000000 +0000
@@ -9,7 +9,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 use strict;
diff -Nru xen-tools-4.6.2/hooks/fedora-core-6/40-setup-networking xen-tools-4.7/hooks/fedora-core-6/40-setup-networking
--- xen-tools-4.6.2/hooks/fedora-core-6/40-setup-networking	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/fedora-core-6/40-setup-networking	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/fedora-core-6/50-setup-hostname xen-tools-4.7/hooks/fedora-core-6/50-setup-hostname
--- xen-tools-4.6.2/hooks/fedora-core-6/50-setup-hostname	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/fedora-core-6/50-setup-hostname	2017-01-22 23:47:28.000000000 +0000
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 
diff -Nru xen-tools-4.6.2/hooks/fedora-core-6/55-create-dev xen-tools-4.7/hooks/fedora-core-6/55-create-dev
--- xen-tools-4.6.2/hooks/fedora-core-6/55-create-dev	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/fedora-core-6/55-create-dev	2017-01-22 23:47:28.000000000 +0000
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/fedora-core-6/70-install-ssh xen-tools-4.7/hooks/fedora-core-6/70-install-ssh
--- xen-tools-4.6.2/hooks/fedora-core-6/70-install-ssh	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/fedora-core-6/70-install-ssh	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/fedora-core-6/75-fixup-securetty xen-tools-4.7/hooks/fedora-core-6/75-fixup-securetty
--- xen-tools-4.6.2/hooks/fedora-core-6/75-fixup-securetty	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/fedora-core-6/75-fixup-securetty	2017-01-22 23:47:28.000000000 +0000
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/fedora-core-6/80-install-modules xen-tools-4.7/hooks/fedora-core-6/80-install-modules
--- xen-tools-4.6.2/hooks/fedora-core-6/80-install-modules	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/fedora-core-6/80-install-modules	2017-01-22 23:47:28.000000000 +0000
@@ -9,7 +9,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/fedora-core-6/90-make-fstab xen-tools-4.7/hooks/fedora-core-6/90-make-fstab
--- xen-tools-4.6.2/hooks/fedora-core-6/90-make-fstab	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/fedora-core-6/90-make-fstab	2017-01-22 23:47:28.000000000 +0000
@@ -9,7 +9,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/fedora-core-6/99-clean-image xen-tools-4.7/hooks/fedora-core-6/99-clean-image
--- xen-tools-4.6.2/hooks/fedora-core-6/99-clean-image	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/fedora-core-6/99-clean-image	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/gentoo/10-disable-tls xen-tools-4.7/hooks/gentoo/10-disable-tls
--- xen-tools-4.6.2/hooks/gentoo/10-disable-tls	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/gentoo/10-disable-tls	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 
diff -Nru xen-tools-4.6.2/hooks/gentoo/20-enable-su xen-tools-4.7/hooks/gentoo/20-enable-su
--- xen-tools-4.6.2/hooks/gentoo/20-enable-su	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/gentoo/20-enable-su	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/gentoo/35-setup-users xen-tools-4.7/hooks/gentoo/35-setup-users
--- xen-tools-4.6.2/hooks/gentoo/35-setup-users	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/gentoo/35-setup-users	2017-01-22 23:47:28.000000000 +0000
@@ -9,7 +9,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 use strict;
diff -Nru xen-tools-4.6.2/hooks/gentoo/40-setup-networking xen-tools-4.7/hooks/gentoo/40-setup-networking
--- xen-tools-4.6.2/hooks/gentoo/40-setup-networking	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/gentoo/40-setup-networking	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/gentoo/50-setup-hostname xen-tools-4.7/hooks/gentoo/50-setup-hostname
--- xen-tools-4.6.2/hooks/gentoo/50-setup-hostname	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/gentoo/50-setup-hostname	2017-01-22 23:47:28.000000000 +0000
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 
diff -Nru xen-tools-4.6.2/hooks/gentoo/55-create-dev xen-tools-4.7/hooks/gentoo/55-create-dev
--- xen-tools-4.6.2/hooks/gentoo/55-create-dev	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/gentoo/55-create-dev	2017-01-22 23:47:28.000000000 +0000
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/gentoo/70-install-ssh xen-tools-4.7/hooks/gentoo/70-install-ssh
--- xen-tools-4.6.2/hooks/gentoo/70-install-ssh	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/gentoo/70-install-ssh	2017-01-22 23:47:28.000000000 +0000
@@ -7,7 +7,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/gentoo/75-fixup-securetty xen-tools-4.7/hooks/gentoo/75-fixup-securetty
--- xen-tools-4.6.2/hooks/gentoo/75-fixup-securetty	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/gentoo/75-fixup-securetty	2017-01-22 23:47:28.000000000 +0000
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/gentoo/80-install-modules xen-tools-4.7/hooks/gentoo/80-install-modules
--- xen-tools-4.6.2/hooks/gentoo/80-install-modules	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/gentoo/80-install-modules	2017-01-22 23:47:28.000000000 +0000
@@ -9,7 +9,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/gentoo/90-make-fstab xen-tools-4.7/hooks/gentoo/90-make-fstab
--- xen-tools-4.6.2/hooks/gentoo/90-make-fstab	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/gentoo/90-make-fstab	2017-01-22 23:47:28.000000000 +0000
@@ -9,7 +9,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/intrepid/01-disable-daemons xen-tools-4.7/hooks/intrepid/01-disable-daemons
--- xen-tools-4.6.2/hooks/intrepid/01-disable-daemons	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/intrepid/01-disable-daemons	2017-01-22 23:47:28.000000000 +0000
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/intrepid/05-shadowconfig-on xen-tools-4.7/hooks/intrepid/05-shadowconfig-on
--- xen-tools-4.6.2/hooks/intrepid/05-shadowconfig-on	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/intrepid/05-shadowconfig-on	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/intrepid/15-disable-hwclock xen-tools-4.7/hooks/intrepid/15-disable-hwclock
--- xen-tools-4.6.2/hooks/intrepid/15-disable-hwclock	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/intrepid/15-disable-hwclock	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/intrepid/35-setup-users xen-tools-4.7/hooks/intrepid/35-setup-users
--- xen-tools-4.6.2/hooks/intrepid/35-setup-users	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/intrepid/35-setup-users	2017-01-22 23:47:28.000000000 +0000
@@ -9,7 +9,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 use strict;
diff -Nru xen-tools-4.6.2/hooks/intrepid/40-setup-networking xen-tools-4.7/hooks/intrepid/40-setup-networking
--- xen-tools-4.6.2/hooks/intrepid/40-setup-networking	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/intrepid/40-setup-networking	2017-01-22 23:47:28.000000000 +0000
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
@@ -88,8 +88,9 @@
     #
     # gateway address?
     #
+    gway='';
     if [ -n "${gateway}" ]; then
-      gateway=" gateway ${gateway}"
+      gway=" gateway ${gateway}"
     fi
 
     #
@@ -107,7 +108,7 @@
 auto eth0
 iface eth0 inet static
  address ${ip1}
-${gateway}
+${gway}
  netmask ${netmask}
 ${bcast}
 ${point}
diff -Nru xen-tools-4.6.2/hooks/intrepid/50-setup-hostname xen-tools-4.7/hooks/intrepid/50-setup-hostname
--- xen-tools-4.6.2/hooks/intrepid/50-setup-hostname	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/intrepid/50-setup-hostname	2017-01-22 23:47:28.000000000 +0000
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 
@@ -63,7 +63,7 @@
     #
     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
diff -Nru xen-tools-4.6.2/hooks/intrepid/70-install-ssh xen-tools-4.7/hooks/intrepid/70-install-ssh
--- xen-tools-4.6.2/hooks/intrepid/70-install-ssh	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/intrepid/70-install-ssh	2017-01-22 23:47:28.000000000 +0000
@@ -8,7 +8,7 @@
 #
 # Dmitry Nedospasov
 # --
-# http://nedos.net/
+# http://www.nedos.net/
 
 prefix=$1
 
diff -Nru xen-tools-4.6.2/hooks/intrepid/75-fixup-securetty xen-tools-4.7/hooks/intrepid/75-fixup-securetty
--- xen-tools-4.6.2/hooks/intrepid/75-fixup-securetty	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/intrepid/75-fixup-securetty	2017-01-22 23:47:28.000000000 +0000
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/intrepid/80-install-kernel xen-tools-4.7/hooks/intrepid/80-install-kernel
--- xen-tools-4.6.2/hooks/intrepid/80-install-kernel	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/intrepid/80-install-kernel	2017-01-22 23:47:28.000000000 +0000
@@ -7,7 +7,7 @@
 #
 # Dmitry Nedospasov
 # --
-# http://nedos.net
+# http://www.nedos.net/
 
 prefix=$1
 
@@ -27,7 +27,7 @@
 
 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
diff -Nru xen-tools-4.6.2/hooks/intrepid/80-install-modules xen-tools-4.7/hooks/intrepid/80-install-modules
--- xen-tools-4.6.2/hooks/intrepid/80-install-modules	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/intrepid/80-install-modules	2017-01-22 23:47:28.000000000 +0000
@@ -9,7 +9,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
@@ -31,7 +31,7 @@
 #
 logMessage Script $0 starting
 
-if [ ${pygrub} ]; then
+if [ "${pygrub}" = "1" ]; then
     logMessage "pygrub set, skipping module install"
 else
 #
diff -Nru xen-tools-4.6.2/hooks/intrepid/82-install-grub-legacy xen-tools-4.7/hooks/intrepid/82-install-grub-legacy
--- xen-tools-4.6.2/hooks/intrepid/82-install-grub-legacy	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/intrepid/82-install-grub-legacy	2017-01-22 23:47:28.000000000 +0000
@@ -26,7 +26,7 @@
 #
 logMessage Script $0 starting
 
-if [ ${pygrub} ]; then
+if [ "${pygrub}" = "1" ]; then
 
 #
 #  Install the grub 0.9x package ("grub-legacy" on Debian, "grub" on Ubuntu)
diff -Nru xen-tools-4.6.2/hooks/intrepid/90-make-fstab xen-tools-4.7/hooks/intrepid/90-make-fstab
--- xen-tools-4.6.2/hooks/intrepid/90-make-fstab	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/intrepid/90-make-fstab	2017-01-22 23:47:28.000000000 +0000
@@ -9,7 +9,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/intrepid/99-clean-image xen-tools-4.7/hooks/intrepid/99-clean-image
--- xen-tools-4.6.2/hooks/intrepid/99-clean-image	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/intrepid/99-clean-image	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/intrepid/99-enable-daemons xen-tools-4.7/hooks/intrepid/99-enable-daemons
--- xen-tools-4.6.2/hooks/intrepid/99-enable-daemons	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/intrepid/99-enable-daemons	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 
diff -Nru xen-tools-4.6.2/hooks/karmic/01-disable-daemons xen-tools-4.7/hooks/karmic/01-disable-daemons
--- xen-tools-4.6.2/hooks/karmic/01-disable-daemons	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/karmic/01-disable-daemons	2017-01-22 23:47:28.000000000 +0000
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/karmic/05-shadowconfig-on xen-tools-4.7/hooks/karmic/05-shadowconfig-on
--- xen-tools-4.6.2/hooks/karmic/05-shadowconfig-on	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/karmic/05-shadowconfig-on	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/karmic/15-disable-hwclock xen-tools-4.7/hooks/karmic/15-disable-hwclock
--- xen-tools-4.6.2/hooks/karmic/15-disable-hwclock	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/karmic/15-disable-hwclock	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/karmic/35-setup-users xen-tools-4.7/hooks/karmic/35-setup-users
--- xen-tools-4.6.2/hooks/karmic/35-setup-users	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/karmic/35-setup-users	2017-01-22 23:47:28.000000000 +0000
@@ -9,7 +9,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 use strict;
diff -Nru xen-tools-4.6.2/hooks/karmic/40-setup-networking xen-tools-4.7/hooks/karmic/40-setup-networking
--- xen-tools-4.6.2/hooks/karmic/40-setup-networking	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/karmic/40-setup-networking	2017-01-22 23:47:28.000000000 +0000
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
@@ -88,8 +88,9 @@
     #
     # gateway address?
     #
+    gway='';
     if [ -n "${gateway}" ]; then
-      gateway=" gateway ${gateway}"
+      gway=" gateway ${gateway}"
     fi
 
     #
@@ -107,7 +108,7 @@
 auto eth0
 iface eth0 inet static
  address ${ip1}
-${gateway}
+${gway}
  netmask ${netmask}
 ${bcast}
 ${point}
diff -Nru xen-tools-4.6.2/hooks/karmic/50-setup-hostname xen-tools-4.7/hooks/karmic/50-setup-hostname
--- xen-tools-4.6.2/hooks/karmic/50-setup-hostname	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/karmic/50-setup-hostname	2017-01-22 23:47:28.000000000 +0000
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 
@@ -63,7 +63,7 @@
     #
     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
diff -Nru xen-tools-4.6.2/hooks/karmic/70-install-ssh xen-tools-4.7/hooks/karmic/70-install-ssh
--- xen-tools-4.6.2/hooks/karmic/70-install-ssh	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/karmic/70-install-ssh	2017-01-22 23:47:28.000000000 +0000
@@ -8,7 +8,7 @@
 #
 # Dmitry Nedospasov
 # --
-# http://nedos.net/
+# http://www.nedos.net/
 
 prefix=$1
 
diff -Nru xen-tools-4.6.2/hooks/karmic/75-fixup-securetty xen-tools-4.7/hooks/karmic/75-fixup-securetty
--- xen-tools-4.6.2/hooks/karmic/75-fixup-securetty	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/karmic/75-fixup-securetty	2017-01-22 23:47:28.000000000 +0000
@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/karmic/80-install-kernel xen-tools-4.7/hooks/karmic/80-install-kernel
--- xen-tools-4.6.2/hooks/karmic/80-install-kernel	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/karmic/80-install-kernel	2017-01-22 23:47:28.000000000 +0000
@@ -7,7 +7,7 @@
 #
 # Dmitry Nedospasov
 # --
-# http://nedos.net
+# http://www.nedos.net/
 
 prefix=$1
 
@@ -26,7 +26,7 @@
 
 logMessage Script $0 starting
 
-if [ "${pygrub}" ]; then
+if [ "${pygrub}" = "1" ]; then
 
 #
 # The type of kernel that we will be installing
diff -Nru xen-tools-4.6.2/hooks/karmic/80-install-modules xen-tools-4.7/hooks/karmic/80-install-modules
--- xen-tools-4.6.2/hooks/karmic/80-install-modules	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/karmic/80-install-modules	2017-01-22 23:47:28.000000000 +0000
@@ -9,7 +9,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
@@ -31,7 +31,7 @@
 #
 logMessage Script $0 starting
 
-if [ ${pygrub} ]; then
+if [ "${pygrub}" = "1" ]; then
     logMessage "pygrub set, skipping module install"
 else
 #
diff -Nru xen-tools-4.6.2/hooks/karmic/82-install-grub-legacy xen-tools-4.7/hooks/karmic/82-install-grub-legacy
--- xen-tools-4.6.2/hooks/karmic/82-install-grub-legacy	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/karmic/82-install-grub-legacy	2017-01-22 23:47:28.000000000 +0000
@@ -26,7 +26,7 @@
 #
 logMessage Script $0 starting
 
-if [ ${pygrub} ]; then
+if [ "${pygrub}" = "1" ]; then
 
 #
 #  Install the grub 0.9x package ("grub-legacy" on Debian, "grub" on Ubuntu)
diff -Nru xen-tools-4.6.2/hooks/karmic/90-make-fstab xen-tools-4.7/hooks/karmic/90-make-fstab
--- xen-tools-4.6.2/hooks/karmic/90-make-fstab	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/karmic/90-make-fstab	2017-01-22 23:47:28.000000000 +0000
@@ -9,7 +9,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/karmic/99-clean-image xen-tools-4.7/hooks/karmic/99-clean-image
--- xen-tools-4.6.2/hooks/karmic/99-clean-image	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/karmic/99-clean-image	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
diff -Nru xen-tools-4.6.2/hooks/karmic/99-enable-daemons xen-tools-4.7/hooks/karmic/99-enable-daemons
--- xen-tools-4.6.2/hooks/karmic/99-enable-daemons	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/hooks/karmic/99-enable-daemons	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 
diff -Nru xen-tools-4.6.2/lib/Xen/Tools/Common.pm xen-tools-4.7/lib/Xen/Tools/Common.pm
--- xen-tools-4.6.2/lib/Xen/Tools/Common.pm	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/lib/Xen/Tools/Common.pm	2017-01-22 23:47:28.000000000 +0000
@@ -6,7 +6,7 @@
 
 =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 @@
 
     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 @@
 
 =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.
diff -Nru xen-tools-4.6.2/LICENSE xen-tools-4.7/LICENSE
--- xen-tools-4.6.2/LICENSE	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/LICENSE	2017-01-22 23:47:28.000000000 +0000
@@ -19,7 +19,7 @@
 
 Steve
 --
-http://www.steve.org.uk/
+https://steve.fi/
 
 
 
diff -Nru xen-tools-4.6.2/Makefile xen-tools-4.7/Makefile
--- xen-tools-4.6.2/Makefile	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/Makefile	2017-01-22 23:47:28.000000000 +0000
@@ -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 @@
 	-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 @@
 	-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
 
diff -Nru xen-tools-4.6.2/misc/README xen-tools-4.7/misc/README
--- xen-tools-4.6.2/misc/README	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/misc/README	2017-01-22 23:47:28.000000000 +0000
@@ -8,7 +8,7 @@
   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
 --
diff -Nru xen-tools-4.6.2/misc/xen-tools.bash-completion xen-tools-4.7/misc/xen-tools.bash-completion
--- xen-tools-4.6.2/misc/xen-tools.bash-completion	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/misc/xen-tools.bash-completion	2017-01-22 23:47:28.000000000 +0000
@@ -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/
 #
 #
 
diff -Nru xen-tools-4.6.2/misc/xen-tools.spec xen-tools-4.7/misc/xen-tools.spec
--- xen-tools-4.6.2/misc/xen-tools.spec	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/misc/xen-tools.spec	2017-01-22 23:47:28.000000000 +0000
@@ -5,8 +5,8 @@
 
 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
diff -Nru xen-tools-4.6.2/NEWS.markdown xen-tools-4.7/NEWS.markdown
--- xen-tools-4.6.2/NEWS.markdown	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/NEWS.markdown	2017-01-22 23:47:28.000000000 +0000
@@ -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 @@
 -----------------------------
 
 * 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 @@
 * 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.
diff -Nru xen-tools-4.6.2/README.markdown xen-tools-4.7/README.markdown
--- xen-tools-4.6.2/README.markdown	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/README.markdown	2017-01-22 23:47:28.000000000 +0000
@@ -3,12 +3,12 @@
 
 [![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 @@
 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 @@
 * 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 @@
 * 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 @@
 
 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 @@
 ### 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)
diff -Nru xen-tools-4.6.2/roles/builder xen-tools-4.7/roles/builder
--- xen-tools-4.6.2/roles/builder	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/roles/builder	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 #
 
 
diff -Nru xen-tools-4.6.2/roles/gdm xen-tools-4.7/roles/gdm
--- xen-tools-4.6.2/roles/gdm	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/roles/gdm	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 #
 
 
diff -Nru xen-tools-4.6.2/roles/udev xen-tools-4.7/roles/udev
--- xen-tools-4.6.2/roles/udev	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/roles/udev	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 #
 
 
diff -Nru xen-tools-4.6.2/roles/xdm xen-tools-4.7/roles/xdm
--- xen-tools-4.6.2/roles/xdm	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/roles/xdm	2017-01-22 23:47:28.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 #
 
 
diff -Nru xen-tools-4.6.2/SUPPORT.markdown xen-tools-4.7/SUPPORT.markdown
--- xen-tools-4.6.2/SUPPORT.markdown	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/SUPPORT.markdown	2017-01-22 23:47:28.000000000 +0000
@@ -3,11 +3,11 @@
 
 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 @@
 
 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 @@
 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.
 
 -- 
diff -Nru xen-tools-4.6.2/t/hook-tls.t xen-tools-4.7/t/hook-tls.t
--- xen-tools-4.6.2/t/hook-tls.t	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/t/hook-tls.t	2017-01-22 23:47:28.000000000 +0000
@@ -75,7 +75,7 @@
     `$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)" );
diff -Nru xen-tools-4.6.2/t/modules.sh xen-tools-4.7/t/modules.sh
--- xen-tools-4.6.2/t/modules.sh	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/t/modules.sh	2017-01-22 23:47:28.000000000 +0000
@@ -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/
 #
 #
 
diff -Nru xen-tools-4.6.2/t/xen-delete-image.t xen-tools-4.7/t/xen-delete-image.t
--- xen-tools-4.6.2/t/xen-delete-image.t	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/t/xen-delete-image.t	2017-01-22 23:47:28.000000000 +0000
@@ -36,7 +36,7 @@
 #  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
diff -Nru xen-tools-4.6.2/t/xen-lists-images.t xen-tools-4.7/t/xen-lists-images.t
--- xen-tools-4.6.2/t/xen-lists-images.t	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/t/xen-lists-images.t	2017-01-22 23:47:28.000000000 +0000
@@ -102,7 +102,7 @@
     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.
diff -Nru xen-tools-4.6.2/TODO.markdown xen-tools-4.7/TODO.markdown
--- xen-tools-4.6.2/TODO.markdown	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/TODO.markdown	2017-01-22 23:47:28.000000000 +0000
@@ -7,6 +7,8 @@
 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
diff -Nru xen-tools-4.6.2/.travis.yml xen-tools-4.7/.travis.yml
--- xen-tools-4.6.2/.travis.yml	2015-12-23 18:29:24.000000000 +0000
+++ xen-tools-4.7/.travis.yml	2017-01-22 23:47:28.000000000 +0000
@@ -1,5 +1,6 @@
 language: perl
 perl:
+  - "5.24"
   - "5.22"
   - "5.20"
   - "5.18"