Release as 4.9 and upload to Debian Unstable as 4.9-1

Start all Debian releases since Stretch (9) with pygrub by default
Fix typo in current changelog entry
2026-02-20 05:45:15 +00:00 · 2020-12-29 12:23:16 +01:00 · 2020-12-29 12:05:39 +01:00 · 2020-12-28 05:08:18 +01:00 · 2020-12-28 02:22:37 +01:00 · 2020-12-28 02:19:20 +01:00
106 changed files with 1480 additions and 315 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@
 /build-stamp
 /configure-stamp
 /man
+/debian/*-stamp
 /debian/files
 /debian/xen-tools
 /debian/xen-tools.debhelper.log
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,10 @@
 language: perl
 perl:
+  - "5.32"
+  - "5.30"
+  - "5.28"
+  - "5.26"
+  - "5.24"
  - "5.22"
  - "5.20"
  - "5.18"
@@ -7,17 +12,27 @@ perl:
  - "5.14"
  - "5.12"
  - "5.10"
+  - "dev"
+  - "blead"
+
+matrix:
+  fast_finish: true
+  allow_failures:
+    - perl: blead

 before_install:
   - sudo apt-get update
   - sudo apt-get install devscripts dpkg-dev lsb-release
+   - eval $(curl https://travis-perl.github.io/init)
+   - build-perl
+   - perl -V

 install:
-   - yes '' | cpanm --verbose --notest --skip-satisfied Data::Validate::Domain Data::Validate::IP Data::Validate::URI File::Slurp File::Which Log::Message Term::UI Test::NoTabs Test::Pod::Coverage Test::Pod Text::Template Devel::Cover::Report::Coveralls Sort::Versions
+   - yes '' | cpanm --verbose --notest --skip-satisfied Data::Validate::Domain Data::Validate::IP Data::Validate::URI File::Slurp File::Which Log::Message Term::UI Test::NoTabs Test::Pod::Coverage Test::Pod Text::Template Devel::Cover::Report::Coveralls Sort::Versions Test::File::Contents
   - export RELEASE_TESTING=1 AUTOMATED_TESTING=1 AUTHOR_TESTING=1 HARNESS_OPTIONS=j10:c HARNESS_TIMER=1 PATH=bin:${PERLBREW_PATH}:${PATH}

 script:
-   - make test
+   - make test-verbose

 after_success:
   - prove --exec 'env PERL5OPT=-MDevel::Cover=-ignore_re,^(t/|/usr) perl' t/*.t
--- a/2
+++ b/2
@@ -65,7 +65,7 @@ Contributions
   - Added hook for automatic CFEngine installation.

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

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

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



--- a/27
+++ b/27
@@ -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.9
 DEBVERSION  = $(shell echo $(VERSION)|sed 's/\(rc\|pre\|beta\|alpha\)/~\1/')
 BASE        = xen-tools
 VCS         = git
@@ -132,6 +132,7 @@ install-bin:
 	cp bin/xen-delete-image     ${prefix}/usr/bin
 	cp bin/xen-list-images      ${prefix}/usr/bin
 	cp bin/xen-update-image     ${prefix}/usr/bin
+	cp bin/xen-resize-guest     ${prefix}/usr/bin
 	cp bin/xt-guess-suite-and-mirror ${prefix}/usr/bin
 	chmod 755 ${prefix}/usr/bin/xen-create-image
 	chmod 755 ${prefix}/usr/bin/xen-create-nfs
@@ -181,6 +182,10 @@ install-hooks:
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d wheezy.d
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d jessie.d
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d stretch.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d buster.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d bullseye.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d bookworm.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d trixie.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 +219,18 @@ install-hooks:
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d vivid.d
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d wily.d
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d xenial.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d yakkety.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d zesty.d
+	mkdir -p ${prefix}/usr/share/xen-tools/artful.d/
+	cp -R hooks/artful/*-* ${prefix}/usr/share/xen-tools/artful.d/
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s artful.d bionic.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s artful.d cosmic.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s artful.d disco.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s artful.d eoan.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s artful.d focal.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s artful.d groovy.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s artful.d hirsute.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s artful.d devel.d
 	cp hooks/common.sh ${prefix}/usr/share/xen-tools
 	cp -r hooks/common ${prefix}/usr/share/xen-tools

@@ -277,13 +294,15 @@ orig-tar-gz: tarball
 #
 #  Run the test suite.
 #
+test-verbose : VERBOSE = -v
+test-verbose: test
 test: non-author-test author-test

 non-author-test: update-modules
-	prove --shuffle t/
+	prove $(VERBOSE) --shuffle t/

 author-test:
-	prove xt/
+	prove $(VERBOSE) xt/


 #
--- a/NEWS.markdown
+++ b/NEWS.markdown
@@ -1,3 +1,171 @@
+xen-tools 4.9 (released 29 Dec 2020)
+====================================
+
+New Features
+------------
+
+* Add Debian install rules for arm64. (GH #62; PR by Ian McLinden
+  @ianmclinden)
+* Add netplan p2p support for Ubuntu. (GH #58; PR by Volker Janzen
+  @frootmig)
+
+Bug Fixes
+---------
+
+* Fix typo in release name of the future Debian 12 release.
+* Makefile: Actually install xen-resize-guest tool. (Thanks to
+  Debian's Lintian tool reporting that there is a man-page without
+  binary installed!)
+* Distinguish between those Debian releases using `$dist/updates` for
+  security updates and those who use `$dist-security`. Thanks to Paul
+  Wise for the bug report. (Closes Debian bug report #972749.)
+* Fix support for `lvm_thin`. Thanks to Andreas Sundstrom for the bug
+  report and patch! (Closes Debian bug report #942244.)
+* Mount `/proc` and `/dev` before calling update-grub. Thanks to
+  Brandon Bradley for the bug report and patch. (Closes Debian bug
+  report #815021.)
+* Fix storage commandline options not overriding `xen-tools.conf`
+  settings also in `xen-update-image` and `xen-delete-image`. (GH #57;
+  patch by Volker Janzen @frootmig)
+
+Distribution Releases Changes
+-----------------------------
+
+* Support for
+  + Ubuntu 19.10 Eoan Ermine (EoL)
+  + Ubuntu 20.04 Focal Fossa (LTS)
+  + Ubuntu 20.10 Groovy Gorilla
+* Preliminary support for
+  + Debian 13 Trixie
+  + Ubuntu 21.04 Hirsute Hippo
+* Declare the following releases as EoL:
+  + Ubuntu 17.10 Artful Aardvark (Was missing in previous release
+    despite mentioned in this file.)
+  + Ubuntu 18.10 Cosmic Cuttlefish
+  + Ubuntu 19.04 Disco Dingo
+  + Debian 7 Wheezy
+  + Debian 8 Jessie
+* Start all Debian releases since Stretch (9) with pygrub by default.
+
+Other Changes
+-------------
+
+* Support running tests verbosely with Make target "test-verbose".
+* Drop "dont-test" flag from bullseye.
+* partitions/sample-server: Change options=sync to
+  options=defaults. (GL MR !1; patch by Wolfgang Karall)
+
+
+xen-tools 4.8 (released 9 Feb 2019)
+===================================
+
+New Features
+------------
+
+* Support for ZFS volumes (by Marc Bigler, GH #50)
+* Support for LVM thin provisioning (by Nico Boehr, GH #47)
+* Support for really random MAC addresses upon every `xen-create-image`
+  invocation by using the new option `--randommac`. (by Pietro Stäheli,
+  closes Debian bug report #855703)
+* `distributions.conf` now supports arbitrary keyring files in
+   `/usr/share/keyrings/`. (Needed for some EoL Ubuntu releases.)
+* Support for netplan.io network configuration as used in recent
+  Ubuntu releases. (Hook by Arno and Peter, GH #51)
+
+Bug Fixes
+---------
+
+* Minor documentation fixes.
+* Eliminate progress reporting which is useless in logs. (Yuri Sakhno,
+  GH #42)
+* Drop `pygrub` path detection from `xm.tmpl`, Xen prefers a path-less
+  `bootloader='pygrub'`.
+
+Distribution Releases Changes
+-----------------------------
+
+* Support for
+  + Ubuntu 17.10 Artful Aardvark
+  + Ubuntu 18.04 Bionic Beaver (LTS) (GH #51)
+  + Ubuntu 18.10 Cosmic Cuttlefish
+* Preliminary support for Ubuntu 19.04 Disco Dingo
+* Knows about code name for Debian 12 (Bookworm).
+* Considers Ubuntu Yakkety, Zesty and Artful being EoL.
+* Set Ubuntu fallback suite to the latest LTS, i.e. 18.04 Bionic.
+
+Other Changes
+-------------
+
+* Change all occurrences of `httpredir.debian.org` to
+  `deb.debian.org` except those for the `debian-archive`. The latter
+  now point to `archive.debian.org` directly.
+* Many improvements for the `release-testing` script.
+* Only run `xen-toolstack` helper script if both, `xm` and `xl` are
+  present. Avoids warning about deprecated helper script.
+
+
+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 #849867)
+* 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 +239,7 @@ Distribution Releases Changes
 -----------------------------

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

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

-* [Homepage](http://www.xen-tools.org/software/xen-tools)
-* Offical Git Repositories:
-  * [at GitHub](http://github.com/xen-tools/xen-tools) (primary, includes [Issue Tracker](https://github.com/xen-tools/xen-tools/issues))
-  * [at GitLab](http://gitlab.com/xen-tools/xen-tools) (secondary, doesn't support the `git://` protocol.)
-* Historical Git Repository: [at Gitorious](http://gitorious.org/xen-tools) (_outdated_, no more updated, for historical reference only)
-* [Mailing Lists](http://www.xen-tools.org/software/xen-tools/lists.html)
+* [Homepage](https://www.xen-tools.org/software/xen-tools)
+* [Change Log](https://github.com/xen-tools/xen-tools/blob/master/NEWS.markdown)
+* 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 +22,7 @@ Using this software, you can easily create new
 network via [OpenSSH](http://www.openssh.org/).

 xen-tools currently has scripts to install most releases of
-[Debian](http://www.debian.org/) (starting with 3.1 "Sarge") and
+[Debian](https://www.debian.org/) (starting with 3.1 "Sarge") and
 [Ubuntu](http://www.ubuntu.com/) (starting with 6.06 LTS "Dapper") and
 some RPM-based distributions. On the Dom0 side all current Xen
 supporting distributions should work.
@@ -31,32 +32,36 @@ known to work reliably, i.e.:

 ### Debian

-* Sarge 3.1 (i386 and DomU only)
-* Etch 4.0 (Dom0 no more tested)
-* Lenny 5.0 (Dom0 no more tested)
-* Squeeze 6.0 (Dom0 no more tested)
-* Wheezy 7
+* Sarge 3.1 (i386 and DomU only) [¹](#1)
+* Etch 4.0 (Dom0 no more tested) [¹](#1)
+* Lenny 5.0 (Dom0 no more tested) [¹](#1)
+* Squeeze 6.0 (Dom0 no more tested) [¹](#1)
+* Wheezy 7 (Dom0 no more tested) [¹](#1)
 * Jessie 8
-* Stretch 9 (under development)
+* Stretch 9
+* Buster 10
+* Bullseye 11 (under development)
+* Bookworm 12 (knows about this future release name)
+* Trixie 13 (knows about this future release name)
 * Sid (always under development; works at least at the moment of writing :-)

 ### Ubuntu

 (only DomUs tested)

-* Dapper Drake 6.06 (LTS, needs editing of `/usr/share/debootstrap/scripts/dapper` since at least debootstrap version 1.0.37, see [#659360][1])
-* Edgy Eft 6.10 (needs editing of `/usr/share/debootstrap/scripts/edgy` since at least debootstrap version 1.0.37, see [#659360][1])
-* Feisty Fawn 7.04
-* Gutsy Gibbon 7.10
-* Hardy Heron 8.04 (LTS, see [Installing Ubuntu 8.04 as DomU][2])
-* Interpid Ibex 8.10
-* Jaunty Jackaplope 9.04
-* Karmic Koala 9.10
-* Lucid Lynx 10.04 (LTS)
-* Maverick Meerkat 10.10
-* Natty Narwhal 11.04
-* Oneiric Ocelot 11.10
-* Precise Pangolin 12.04 (LTS)
+* Dapper Drake 6.06 (LTS) [¹](#1) [²](#2)
+* Edgy Eft 6.10 [¹](#1) [²](#2)
+* Feisty Fawn 7.04 [¹](#1)
+* Gutsy Gibbon 7.10 [¹](#1)
+* Hardy Heron 8.04 (LTS, see [Installing Ubuntu 8.04 as DomU][2]) [¹](#1)
+* Interpid Ibex 8.10 [¹](#1)
+* Jaunty Jackaplope 9.04 [¹](#1)
+* Karmic Koala 9.10 [¹](#1)
+* Lucid Lynx 10.04 (LTS) [¹](#1)
+* Maverick Meerkat 10.10 [¹](#1)
+* Natty Narwhal 11.04 [¹](#1)
+* Oneiric Ocelot 11.10 [¹](#1)
+* Precise Pangolin 12.04 (LTS) [¹](#1)
 * Quantal Quetzal 12.10
 * Raring Ringtail 13.04
 * Saucy Salamander 13.10
@@ -64,9 +69,37 @@ known to work reliably, i.e.:
 * Utopic Unicorn 14.10
 * Vivid Vervet 15.04
 * Wily Werewolf 15.10
-* Xenial Xerus 16.04 (under development, LTS)
+* Xenial Xerus 16.04 (LTS)
+* Yakkety Yak 16.10
+* Zesty Zapus 17.04
+* Artful Aardvark 17.10
+* Bionic Beaver 18.04 (LTS)
+* Cosmic Cuttlefish 18.10
+* Disco Dingo 19.04
+* Eoan Ermine 19.10
+* Focal Fossa 20.04 (LTS)
+* Groovy Gorilla 20.10
+* Hirsute Hippo 21.04 (under development)

-[1]: http://bugs.debian.org/659360
+### Footnotes
+
+<dl compact="compact">
+
+<dt><a id="1" name="1">¹</a></dt><dd>
+
+Installation with `xen-create-image` and updating with
+`xen-update-image` might fail with newer kernels/distributions as Dom0
+without `vsyscall=emulate` on the kernel commandline.
+
+</dd><dt><a id="2" name="2">²</a></dt><dd>
+
+At least between debootstrap version 1.0.37
+and 1.0.93 (including) these distributions needs editing of
+`/usr/share/debootstrap/scripts/edgy`, see [#659360][1].
+
+</dd></dl>
+
+[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,35 +125,51 @@ Requirements

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

-* [debootstrap](http://packages.debian.org/debootstrap)
+* [debootstrap](https://packages.debian.org/debootstrap)
 * Perl and the following Perl modules
-  * [Config::IniFiles](http://metacpan.org/release/Config-IniFiles)
-	([Debian Package libconfig-inifiles-perl](http://packages.debian.org/libconfig-inifiles-perl))
-  * [Text::Template](http://metacpan.org/release/Text-Template)
-	([Debian Package libtext-template-perl](http://packages.debian.org/libtext-template-perl))
-  * [Data::Validate::Domain](http://metacpan.org/release/Data-Validate-Domain)
-	([Debian Package libdata-validate-domain-perl](http://packages.debian.org/libdata-validate-domain-perl))
-  * [Data::Validate::IP](http://metacpan.org/release/Data-Validate-IP)
-	([Debian Package libdata-validate-ip-perl](http://packages.debian.org/libdata-validate-ip-perl))
-  * [Data::Validate::URI](http://metacpan.org/release/Data-Validate-URI)
-	([Debian Package libdata-validate-uri-perl](http://packages.debian.org/libdata-validate-uri-perl))
-  * [File::Slurp](http://metacpan.org/release/File-Slurp)
-	([Debian Package libfile-slurp-perl](http://packages.debian.org/libfile-slurp-perl))
-  * [File::Which](http://metacpan.org/release/File-Which)
-	([Debian Package libfile-which-perl](http://packages.debian.org/libfile-which-perl))
+  * [Config::IniFiles](https://metacpan.org/release/Config-IniFiles)
+	([Debian Package libconfig-inifiles-perl](https://packages.debian.org/libconfig-inifiles-perl))
+  * [Text::Template](https://metacpan.org/release/Text-Template)
+	([Debian Package libtext-template-perl](https://packages.debian.org/libtext-template-perl))
+  * [Data::Validate::Domain](https://metacpan.org/release/Data-Validate-Domain)
+	([Debian Package libdata-validate-domain-perl](https://packages.debian.org/libdata-validate-domain-perl))
+  * [Data::Validate::IP](https://metacpan.org/release/Data-Validate-IP)
+	([Debian Package libdata-validate-ip-perl](https://packages.debian.org/libdata-validate-ip-perl))
+  * [Data::Validate::URI](https://metacpan.org/release/Data-Validate-URI)
+	([Debian Package libdata-validate-uri-perl](https://packages.debian.org/libdata-validate-uri-perl))
+  * [File::Slurp](https://metacpan.org/release/File-Slurp)
+	([Debian Package libfile-slurp-perl](https://packages.debian.org/libfile-slurp-perl))
+  * [File::Which](https://metacpan.org/release/File-Which)
+	([Debian Package libfile-which-perl](https://packages.debian.org/libfile-which-perl))
  * and some more modules which are part of the Perl core and hence do not need to be installed separately.
-* Make, if you are not installing through a package manager
+* "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.

+### Caveats
+
+For security reasons (avoid risk to circumvent [ASLR][3]), recent kernels
+have disabled the `vsyscall` mapping. Unfortunately older
+distributions don't run and hence can't be bootstrapped without it.
+
+To enable trapping and enabling emulate calls into the fixed
+vsyscall address mapping and hence to run and bootstrap older Linux
+distributions in a chroot (as xen-tools does), you need to add
+`vsyscall=emulate` to the kernel commandline, e.g. by adding it to
+`GRUB_CMDLINE_LINUX_DEFAULT` in `/etc/default/grub`, then running
+`update-grub` afterwards and finally reboot.
+
+[3]: https://en.wikipedia.org/wiki/Address_space_layout_randomization
+     "Address Space Layout Randomization"
+

 Installation
 ------------
@@ -238,11 +287,15 @@ test case would be a useful bonus.

 ### Known/Open Issues

-* [xen-tools Issue Tracker at GitHub](https://github.com/xen-tools/xen-tools/issues/new)
-* [Mailing list archives of the xen-tools mailing lists](http://xen-tools.org/software/xen-tools/lists.html)
+You can check the following ressources for known or open issues:
+
+* [xen-tools Issue Tracker at GitHub](https://github.com/xen-tools/xen-tools/issues)
+  (primary upstream bug tracker)
+* [Mailing list archives of the xen-tools mailing lists](https://xen-tools.org/software/xen-tools/lists.html)
+  (might contain, loose, non-formal bug reports)
 * [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)

-- 
+—
 The Xen-Tools Developer Team
--- a/SUPPORT.markdown
+++ b/SUPPORT.markdown
@@ -3,11 +3,11 @@ Mailing List

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

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

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

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

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

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


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

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

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

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

  Actually this should be pretty simple now that the parameters are
@@ -53,6 +55,16 @@ Bugs to fix and features to add for 5.0
    `xen-create-image` first. Which probably both would be a good
    idea.

+* Maybe check for `vsyscall=emulate` in `GRUB_CMDLINE_LINUX_DEFAULT`
+  in `/etc/default/grub` if trying to install an affected Linux
+  distribution.
+
+* Drop checking the host's sources.list to decide upon including the
+  security repo or not.
+
+* Make a difference wrt. to the security repo for EoL releases.
+
+
 Stuff from Steve's TODO list / Generic TODOs
 --------------------------------------------

--- a/bin/xen-create-image
+++ b/bin/xen-create-image
@@ -245,12 +245,12 @@ and EVMS EXAMPLE.
   --mirror=url Setup the mirror to use when installing via
                debootstrap. (Default value: mirror used in
                /etc/apt/sources.list or for Debian
-                "http://httpredir.debian.org/debian/" and for Ubuntu
+                "http://deb.debian.org/debian/" and for Ubuntu
                "http://archive.ubuntu.com/ubuntu/")

                The above mentioned Debian mirror hostname
                automatically tries to choose a more or less close
-                Debian mirror. See http://httpredir.debian.org/ for
+                Debian mirror. See http://deb.debian.org/ for
                details.

   --apt_proxy=protocol://hostname:port/
@@ -296,6 +296,8 @@ and EVMS EXAMPLE.
                flags, but the specific MAC address will only be used
                for the first interface.)

+   --randommac  Creates a random MAC address.
+
   --netmask=123.456.789.ABC
                Setup the netmask for the new instance.

@@ -321,14 +323,14 @@ and EVMS EXAMPLE.
                Subdirectories will be created for each guest.

                If you do not wish to use loopback images specify
-                --lvm or --evms.  (These three options are mutually
-                exclusive.)
+                --lvm, --evms or --zpool. (These four options are
+                mutually exclusive.)

   --evms=lvm2/container
                Specify the container to save images within,
                i.e. '--evms lvm2/mycontainer'.  If you do not wish to
-                use EVMS specify --dir or --lvm.  (These three options
-                are mutually exclusive.)
+                use EVMS specify --dir, --lvm or --zpool. (These four
+                options are mutually exclusive.)

   --hostname=host.example.org
                Set the hostname of the new guest system.  Ideally
@@ -337,9 +339,20 @@ and EVMS EXAMPLE.
                out of it for various purposes.

   --lvm=vg     Specify the volume group to save images within.
-                If you do not wish to use LVM specify --dir or --evms.
-                (These three options are mutually exclusive.)
+                If you do not wish to use LVM specify --dir, --evms or
+                --zpool. (These three options are mutually exclusive.)

+   --lvm_thin=thin pool
+                Specify the thin pool name on which thin LVM volumes
+                are created.
+
+                This enables thin provisioned LVM volumes. Note that
+                you need a LVM version which supports this.
+
+   --zpool=pool Specify the ZFS pool to save images within. A new ZFS
+                volume will be created for each guest.
+                If you do not wish to use ZFS specify --dir, --evms or
+                --lvm. (These four options are mutually exclusive.)

 =head1 NOTES

@@ -776,9 +789,9 @@ Install an X11 server, using VNC and XDM

 =head1 AUTHORS

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


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


 #
@@ -1004,7 +1017,8 @@ if ( !@PARTITIONS )
    populatePartitionsData()
      if ( ( $CONFIG{ 'dir' } ) ||
           ( $CONFIG{ 'evms' } ) ||
-           ( $CONFIG{ 'lvm' } ) );
+           ( $CONFIG{ 'lvm' } ) ||
+           ( $CONFIG{ 'zpool' } ) );
 }


@@ -1056,12 +1070,20 @@ elsif ( $CONFIG{ 'image-dev' } )
    #
    usePhysicalDevice();
 }
+elsif ( $CONFIG{ 'zpool' } )
+{
+
+    #
+    #  Create our ZFS volumes
+    #
+    createZFSBits();
+}
 else
 {

    # Can't happen we didn't get an installation type.
    logprint( "Error:  No recognised installation type.\n".
-              "Please specify a directory, lvm, or evms volume to use.\n" );
+              "Please specify a directory, lvm, zpool, or evms volume to use.\n" );
    $CONFIG{'FAIL'} = 1;
    exit 127;
 }
@@ -1159,7 +1181,7 @@ exit 0;
  Test that this system is fully setup for the new xen-create-image
 script.

-  This means that the the companion scripts xt-* are present on the
+  This means that the companion scripts xt-* are present on the
 host and executable.

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

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

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

-E_O_ERROR
+EOERROR
        $CONFIG{'FAIL'} = 1;
        exit 127;
    }
@@ -1292,7 +1314,13 @@ sub setupDefaultOptions
                    $CONFIG{ 'mirror_'.$debdist } = $MIRROR{$dist.'_archive'} or
                        die $dist.'_archive not defined in /etc/xen-tools/mirrors.conf';
                    my $removed_keys = "/usr/share/keyrings/$dist-archive-removed-keys.gpg";
-                    $CONFIG{ 'keyring_'.$debdist } = $removed_keys if -s $removed_keys;
+                    if ($debdistinfo =~ /(\S*\.gpg)($|\s)/ and -s "/usr/share/keyrings/${1}") {
+                        $CONFIG{ 'keyring_'.$debdist } = "/usr/share/keyrings/${1}";
+                    } elsif ($debdistinfo !~ /default-keyring/ and -s $removed_keys) {
+                        $CONFIG{ 'keyring_'.$debdist } = $removed_keys;
+                    }
+                } elsif ($debdistinfo =~ /(\S*\.gpg)($|\s)/ and -s "/usr/share/keyrings/${1}") {
+                    $CONFIG{ 'keyring_'.$debdist } = "/usr/share/keyrings/${1}";
                } else {
                    $CONFIG{ 'mirror_'.$debdist } = $MIRROR{$dist} or
                        die $dist.' not defined in /etc/xen-tools/mirrors.conf';
@@ -1341,7 +1369,7 @@ sub setupDefaultOptions
    #
    # NOTE 2:  Each of these scripts will "force" the creation of a new
    #         filesystem, even if it exists.  This script must detect
-    #         prior existance itself.
+    #         prior existence itself.
    #
    $CONFIG{ 'make_fs_ext2' }     = 'mkfs.ext2 -F';
    $CONFIG{ 'make_fs_ext3' }     = 'mkfs.ext3 -F';
@@ -1558,6 +1586,7 @@ sub parseCommandLineArguments
    $install{ 'dir' }       = undef;
    $install{ 'lvm' }       = undef;
    $install{ 'image-dev' } = undef;
+    $install{ 'zpool' }     = undef;

    #
    #  Parse options.
@@ -1587,6 +1616,7 @@ sub parseCommandLineArguments
            "apt_proxy=s", \&checkOption,
            "modules=s",   \&checkOption,
            "lvm=s",       \$install{ 'lvm' },
+            "zpool=s",     \$install{ 'zpool' },
            "image-dev=s", \$install{ 'image-dev' },
            "swap-dev=s",  \$install{ 'swap-dev' },
            "serial_device=s", \&checkOption,
@@ -1606,6 +1636,7 @@ sub parseCommandLineArguments
            "hostname=s",   \&checkOption,
            "ip=s@",        \&checkOption,
            "mac=s",        \&checkOption,
+            "randommac",    \$CONFIG{ 'randommac' },
            "netmask=s",    \&checkOption,
            "broadcast=s",  \&checkOption,
            "nameserver=s", \&checkOption,
@@ -1653,6 +1684,7 @@ sub parseCommandLineArguments
            "output=s",     \&checkOption,
            "extension:s",  \&checkOption,
            "dontformat",   \&checkOption,
+            "lvm_thin=s",   \$CONFIG{ 'lvm_thin' },

            # Help options
            "debug!",     \$CONFIG{ 'debug' },
@@ -1685,7 +1717,7 @@ sub parseCommandLineArguments


    #
-    #  Now make ensure that the command line setting of '--lvm', '--evms'
+    #  Now make ensure that the command line setting of '--lvm', '--evms', '--zpool'
    # and '--dir=x' override anything specified in the configuration file.
    #
    if ( $install{ 'dir' } )
@@ -1694,6 +1726,7 @@ sub parseCommandLineArguments
        $CONFIG{ 'evms' }      = undef;
        $CONFIG{ 'lvm' }       = undef;
        $CONFIG{ 'image-dev' } = undef;
+        $CONFIG{ 'zpool' }     = undef;
    }
    if ( $install{ 'evms' } )
    {
@@ -1701,6 +1734,7 @@ sub parseCommandLineArguments
        $CONFIG{ 'evms' }      = $install{ 'evms' };
        $CONFIG{ 'lvm' }       = undef;
        $CONFIG{ 'image-dev' } = undef;
+        $CONFIG{ 'zpool' }     = undef;
    }
    if ( $install{ 'lvm' } )
    {
@@ -1708,6 +1742,15 @@ sub parseCommandLineArguments
        $CONFIG{ 'evms' }      = undef;
        $CONFIG{ 'lvm' }       = $install{ 'lvm' };
        $CONFIG{ 'image-dev' } = undef;
+        $CONFIG{ 'zpool' }     = undef;
+    }
+    if ( $install{ 'zpool' } )
+    {
+        $CONFIG{ 'dir' }       = undef;
+        $CONFIG{ 'evms' }      = undef;
+        $CONFIG{ 'lvm' }       = undef;
+        $CONFIG{ 'image-dev' } = undef;
+        $CONFIG{ 'zpool' }     = $install{ 'zpool' };
    }
    if ( $install{ 'image-dev' } )
    {
@@ -1715,6 +1758,7 @@ sub parseCommandLineArguments
        $CONFIG{ 'evms' }      = undef;
        $CONFIG{ 'lvm' }       = undef;
        $CONFIG{ 'image-dev' } = $install{ 'image-dev' };
+        $CONFIG{ 'zpool' }     = undef;
        $CONFIG{ 'size' }      = undef;
        $CONFIG{ 'swap' }      = undef;

@@ -1743,13 +1787,13 @@ sub testRootUser
 {
    if ( $EFFECTIVE_USER_ID != 0 )
    {
-        my $err = <<E_O_ROOT;
+        my $err = <<EOROOT;

  In order to use this script you must be running with root privileges.

  (This is necessary to mount the disk images which are created.)

-E_O_ROOT
+EOROOT

        logprint($err);
        $CONFIG{'FAIL'} = 1;
@@ -2080,10 +2124,18 @@ EOF

    #
    #  If we don't have a MAC address specified then generate one.
+    #  If randommac is specified, generate random MAC.
    #
    if ( !$CONFIG{ 'mac' } )
    {
-        $CONFIG{ 'mac' } = generateMACAddress();
+        if ( $CONFIG{ 'randommac' } )
+        {
+            $CONFIG{ 'mac' } = generateRandomMACAddress();
+        }
+        else
+        {
+            $CONFIG{ 'mac' } = generateMACAddress();
+        }
    }

    #
@@ -2132,7 +2184,7 @@ EOF

 =begin doc

-  Generate a 'random' MAC address.
+  Generate a pseudo-random MAC address.

  The MAC address is constructed based upon :

@@ -2190,6 +2242,36 @@ sub generateMACAddress



+=begin doc
+
+  Generate a MAC address based on the Xen prefix and a really random local part.
+
+=end doc
+
+=cut
+
+
+sub generateRandomMACAddress
+{
+
+    #
+    #  Start with the xen prefix
+    #
+    my $mac = '00:16:3E';
+
+    #
+    # Generate random local part and append to $mac
+    #
+    for ( my $count=0; $count < 3; $count++ )
+    {
+        $mac = $mac . ":" . sprintf("%02X", int(rand(255)));
+    }
+
+    return ( $mac );
+}
+
+
+
 =begin doc

  Make sure we have a log directory, and create an empty logfile
@@ -2326,6 +2408,26 @@ sub checkBinariesPresent
            }
        }
    }
+    elsif (defined( $CONFIG{ 'zpool' } ) )
+    {
+
+        # ZFS-specific binaries.
+        my @zfs = qw ( zfs );
+
+        foreach my $file (@zfs)
+        {
+            if ( !defined( which($file) ) )
+            {
+                logprint("The following binary is required to run this tool\n");
+                logprint("\t$file\n");
+                logprint(
+                    "(This is only required for ZFS volumes, which you've selected)\n"
+                );
+                $CONFIG{'FAIL'} = 1;
+                exit 127;
+            }
+        }
+    }
 }


@@ -3064,6 +3166,10 @@ sub createLVMBits
                    logprint(
                        "Removing $lvm_disk - since we're forcing the install\n");
                    runCommand("lvremove --force $lvm_disk", \%CONFIG);
+                    runCommand("sync", \%CONFIG);
+                    logprint(
+                        "Sleeping a few seconds to avoid LVM race conditions...\n");
+                    sleep(3);
                } else {
                    fail("ERROR: Xen guest $CONFIG{'hostname'} appears to be running.\nAborting.\n");
                }
@@ -3118,9 +3224,12 @@ sub createLVMBits
        # The commands to create the volume.
        #
        my $disk_cmd =
-          "lvcreate $CONFIG{'lvm'} ".
-          ($lvm_needs_yes ? '--yes' : '').
-          " -L $partition->{'size'} -n $disk";
+          "lvcreate ".
+          ($lvm_needs_yes ? '--yes ' : '').
+          ($CONFIG{ 'lvm_thin' } ?
+           "-T $CONFIG{'lvm'}/$CONFIG{'lvm_thin'} -V" :
+           "$CONFIG{'lvm'} -L").
+          " $partition->{'size'} -n $disk";

        #
        # Create the volume
@@ -3157,11 +3266,117 @@ sub createLVMBits



+=begin doc
+
+  This function is responsible for creating two new ZFS volumes within
+ a given ZFS pool.
+
+=end doc
+
+=cut
+
+sub createZFSBits
+{
+
+    #
+    #  Check whether the ZFS volume exists already, and if so abort
+    #  unless '--force' is specified.
+    #
+    foreach my $partition (@PARTITIONS)
+    {
+        my $disk     = $CONFIG{ 'hostname' } . '-' . $partition->{ 'name' };
+        my $zfs_disk = "/dev/$CONFIG{'zpool'}/$disk";
+        my $zfs_vol  = "$CONFIG{'zpool'}/$disk";
+
+        if ( -e $zfs_disk )
+        {
+
+            # Delete if forcing
+            if ( $CONFIG{ 'force' } )
+            {
+                unless ( xenRunning($CONFIG{ 'hostname' }, \%CONFIG)) {
+                    logprint(
+                        "Removing $zfs_disk - since we're forcing the install\n");
+                    runCommand("zfs destroy $zfs_vol", \%CONFIG);
+                    runCommand("sync", \%CONFIG);
+                    logprint(
+                        "Sleeping a few seconds to avoid ZFS race conditions...\n");
+                    sleep(3);
+                } else {
+                    fail("ERROR: Xen guest $CONFIG{'hostname'} appears to be running.\nAborting.\n");
+                }
+            }
+            else
+            {
+                logprint("The ZFS volume already exists.  Aborting.\n");
+                logprint("Specify '--force' to delete and recreate\n");
+                $CONFIG{'FAIL'} = 2;
+                exit 127;
+            }
+        }
+    }
+
+    foreach my $partition (@PARTITIONS)
+    {
+        my $disk     = $CONFIG{ 'hostname' } . '-' . $partition->{ 'name' };
+        my $zfs_disk = "/dev/$CONFIG{'zpool'}/$disk";
+        my $zfs_vol  = "$CONFIG{'zpool'}/$disk";
+
+        #
+        # Save the image path to the partitions array
+        #
+        $partition->{ 'imagetype' } = 'phy:';
+        $partition->{ 'image' }     = $zfs_disk;
+
+        #
+        # The commands to create the volume.
+        #
+        my $disk_cmd =
+          "zfs create ".
+            ($CONFIG{'image'} eq 'sparse' ? '-s' : '').
+            " -V $partition->{'size'} $zfs_vol";
+
+        #
+        # Create the volume
+        #
+        runCommand($disk_cmd, \%CONFIG);
+        sleep(2);
+
+        #
+        # Make sure that worked.
+        #
+        if ( !-e "$zfs_disk" )
+        {
+            logprint(
+                "The ZFS volume creation failed to create $zfs_disk.\n"
+            );
+            logprint("aborting\n");
+            $CONFIG{'FAIL'} = 1;
+            exit 127;
+        }
+
+        #
+        #  Finally create the filesystem / swap
+        #
+        if ( $partition->{ 'type' } eq 'swap' )
+        {
+            createSwap($zfs_disk);
+        }
+        else
+        {
+            createFilesystem( $zfs_disk, $partition->{ 'type' } );
+        }
+    }
+
+}
+
+
+
 =begin doc

  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

@@ -3416,6 +3631,10 @@ sub mountImage
            {
                $mount_cmd = "mount $mount_type $image $mountpoint";
            }
+            elsif ( $CONFIG{ 'zpool' } )
+            {
+                $mount_cmd = "mount $mount_type $image $mountpoint";
+            }
            else
            {
                $mount_cmd = "mount $mount_type -o loop $image $mountpoint";
@@ -3618,7 +3837,7 @@ sub runCustomisationHooks
    delete $ENV{ 'ip' };

    #
-    # Setup a seperate ip$count value for each IP address.
+    # Setup a separate ip$count value for each IP address.
    #
    my $ips   = $CONFIG{ 'ip' };
    my $count = 1;
@@ -4276,12 +4495,15 @@ END
                $option = "--evms=$CONFIG{'evms'}"
            } elsif ($CONFIG{ 'dir' }) {
                $option = "--dir=$CONFIG{'dir'}"
+            } elsif ($CONFIG{ 'zpool' }) {
+                $option = "--zpool=$CONFIG{'zpool'}"
            }

+
            if ($option) {
                runCommand("xen-delete-image $option --hostname=$CONFIG{'hostname'}", \%CONFIG);
            } else {
-                die "Assertion that either --dir, --lvm, or --dir are given".
+                die "Assertion that either --dir, --lvm, --dir or --zpool are given".
                    " failed.\nThis is probably a bug, please report it.";
            }
        }
--- a/bin/xen-create-nfs
+++ b/bin/xen-create-nfs
@@ -74,12 +74,12 @@ Show the version number and exit.
  For more details on what you'll need to support NFS-root Xen guests
 the following article, written by the author, might be useful:

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


 =head1 AUTHORS

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


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


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


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

--- a/bin/xen-delete-image
+++ b/bin/xen-delete-image
@@ -24,6 +24,7 @@ xen-delete-image - Delete previously created Xen instances.
   --dir      Specify the output directory where images were previously saved.
   --evms     Specify the EVMS container to use.
   --lvm      Specify the LVM volume to use.
+   --zpool    Specify the ZFS pool to use.

  Specifying hosts:
   --hostname Specify the image name to delete.
@@ -51,6 +52,9 @@ Specify the hostname to delete.
 =item B<--lvm>
 Specify the LVM volume group where images were previously saved.

+=item B<--zpool>
+Specify the ZFS pool where images were previously saved.
+
 =item B<--manual>
 Read the manual for this script.

@@ -126,8 +130,8 @@ Show the version number and exit.

 =head1 AUTHORS

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


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


 #
@@ -204,12 +208,12 @@ checkArguments();
 #
 if ( ( !$CONFIG{ 'test' } ) && ( $EFFECTIVE_USER_ID != 0 ) )
 {
-    print <<E_O_ROOT;
+    print <<EOROOT;

  This script is not running with root privileges, so the configuration
 file(s) beneath /etc/xen will not be removed.

-E_O_ROOT
+EOROOT

    exit 127;
 }
@@ -265,12 +269,25 @@ sub parseCommandLineArguments
    my $VERSION = 0;
    $CONFIG{ 'dry-run' } = 0;

+    #
+    #  We record the installation method here because we want
+    # to ensure that we allow the method supplied upon the command line
+    # to overwrite the one we might have ready read from the configuration
+    # file.
+    #
+    my %install;
+    $install{ 'evms' }      = undef;
+    $install{ 'dir' }       = undef;
+    $install{ 'lvm' }       = undef;
+    $install{ 'zpool' }     = undef;
+
    #  Parse options.
    #
-    GetOptions( "dir=s",       \$CONFIG{ 'dir' },
+    GetOptions( "dir=s",       \$install{ 'dir' },
                "dry-run",     \$CONFIG{ 'dry-run' },
-                "lvm=s",       \$CONFIG{ 'lvm' },
-                "evms=s",      \$CONFIG{ 'evms' },
+                "lvm=s",       \$install{ 'lvm' },
+                "evms=s",      \$install{ 'evms' },
+                "zpool=s",     \$install{ 'zpool' },
                "extension:s", \$CONFIG{ 'extension' },
                "hostname=s@", \$CONFIG{ 'hostname' },
                "test",        \$CONFIG{ 'test' },
@@ -281,6 +298,39 @@ sub parseCommandLineArguments
                "version",     \$VERSION
              );

+    #
+    #  Now make ensure that the command line setting of '--lvm', '--evms', '--zpool'
+    # and '--dir=x' override anything specified in the configuration file.
+    #
+    if ( $install{ 'dir' } )
+    {
+        $CONFIG{ 'dir' }       = $install{ 'dir' };
+        $CONFIG{ 'evms' }      = undef;
+        $CONFIG{ 'lvm' }       = undef;
+        $CONFIG{ 'zpool' }     = undef;
+    }
+    if ( $install{ 'evms' } )
+    {
+        $CONFIG{ 'dir' }       = undef;
+        $CONFIG{ 'evms' }      = $install{ 'evms' };
+        $CONFIG{ 'lvm' }       = undef;
+        $CONFIG{ 'zpool' }     = undef;
+    }
+    if ( $install{ 'lvm' } )
+    {
+        $CONFIG{ 'dir' }       = undef;
+        $CONFIG{ 'evms' }      = undef;
+        $CONFIG{ 'lvm' }       = $install{ 'lvm' };
+        $CONFIG{ 'zpool' }     = undef;
+    }
+    if ( $install{ 'zpool' } )
+    {
+        $CONFIG{ 'dir' }       = undef;
+        $CONFIG{ 'evms' }      = undef;
+        $CONFIG{ 'lvm' }       = undef;
+        $CONFIG{ 'zpool' }     = $install{ 'zpool' };
+    }
+
    pod2usage(1) if $HELP;
    pod2usage( -verbose => 2 ) if $MANUAL;

@@ -309,7 +359,7 @@ sub checkArguments
    #
    #  When testing we only care about loopback images, not disk images.
    #
-    if ( $CONFIG{ 'test' } and ( $CONFIG{ 'lvm' } or $CONFIG{ 'evms' } ))
+    if ( $CONFIG{ 'test' } and ( $CONFIG{ 'lvm' } or $CONFIG{ 'evms' } or $CONFIG{ 'zpool' } ))
    {
        print "Error: --test only works with --dir.\n";
        exit 1;
@@ -319,7 +369,7 @@ sub checkArguments
    #  Make sure we got one and only one installation method.
    #
    my $count = 0;
-    foreach my $type (qw/dir lvm evms/)
+    foreach my $type (qw/dir lvm evms zpool/)
    {
        $count += 1 if defined( $CONFIG{ $type } );
    }
@@ -334,6 +384,7 @@ sub checkArguments
        print " --dir\n";
        print " --evms\n";
        print " --lvm\n";
+        print " --zpool\n";
        exit 2;
    }
 }
@@ -478,6 +529,37 @@ sub deleteXenImage
            }
        }

+    }
+    elsif ( defined( $CONFIG{ 'zpool' } ) )
+    {
+
+        #
+        #  ZFS volumes
+        #
+        #
+        #  TODO: Check we're not mounted.
+        #
+
+        if ( -e "/dev/$CONFIG{'zpool'}/$hostname-swap" )
+        {
+            if ($CONFIG{ 'dry-run' }) {
+                print "Would remove ZFS swap volume /dev/$CONFIG{'zpool'}/$hostname-swap\n";
+            } else {
+                print "Removing swap volume\n";
+                runCommand("zfs destroy -R $CONFIG{'zpool'}/$hostname-swap", \%PER_HOST_CONFIG);
+            }
+        }
+
+        if ( -e "/dev/$CONFIG{'zpool'}/$hostname-disk" )
+        {
+            if ($CONFIG{ 'dry-run' }) {
+                print "Would remove ZFS disk volume /dev/$CONFIG{'zpool'}/$hostname-disk\n";
+            } else {
+                print "Removing ZFS disk volume\n";
+                runCommand("zfs destroy -R $CONFIG{'zpool'}/$hostname-disk", \%PER_HOST_CONFIG);
+            }
+        }
+
    }
    else
    {
--- a/bin/xen-list-images
+++ b/bin/xen-list-images
@@ -64,7 +64,7 @@ Show the version number and exit.

 =head1 AUTHORS

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


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



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

 =begin doc

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

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

 =head1 AUTHORS

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


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


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

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

 =head1 AUTHORS

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


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


 #
@@ -149,13 +149,13 @@ checkArguments();
 #
 if ( $EFFECTIVE_USER_ID != 0 )
 {
-    print <<E_O_ROOT;
+    print <<EOROOT;

  This script is not running with root privileges.

  root privileges are required to successfully mount the disk image(s).

-E_O_ROOT
+EOROOT

    exit;
 }
@@ -344,15 +344,52 @@ sub parseCommandLineArguments
    my $MANUAL  = 0;
    my $VERSION = 0;

+    #
+    # We record the installation method here because we want
+    # to ensure that we allow the method supplied upon the command line
+    # to overwrite the one we might have ready read from the configuration
+    # file.
+    #
+    my %install;
+    $install{ 'evms' }      = undef;
+    $install{ 'dir' }       = undef;
+    $install{ 'lvm' }       = undef;
+
    #  Parse options.
    #
-    GetOptions( "dir=s",  \$CONFIG{ 'dir' },
-                "lvm=s",   \$CONFIG{ 'lvm' },
-                "evms=s", \$CONFIG{ 'evms' },
+    GetOptions( "dir=s",  \$install{ 'dir' },
+                "lvm=s",   \$install{ 'lvm' },
+                "evms=s", \$install{ 'evms' },
                "help",    \$HELP,
                "manual", \$MANUAL,
                "version", \$VERSION );

+    #
+    #  Now make ensure that the command line setting of '--lvm', '--evms', '--zpool'
+    # and '--dir=x' override anything specified in the configuration file.
+    #
+    if ( $install{ 'dir' } )
+    {
+        $CONFIG{ 'dir' }       = $install{ 'dir' };
+        $CONFIG{ 'evms' }      = undef;
+        $CONFIG{ 'lvm' }       = undef;
+        $CONFIG{ 'zpool' }     = undef;
+    }
+    if ( $install{ 'evms' } )
+    {
+        $CONFIG{ 'dir' }       = undef;
+        $CONFIG{ 'evms' }      = $install{ 'evms' };
+        $CONFIG{ 'lvm' }       = undef;
+        $CONFIG{ 'zpool' }     = undef;
+    }
+    if ( $install{ 'lvm' } )
+    {
+        $CONFIG{ 'dir' }       = undef;
+        $CONFIG{ 'evms' }      = undef;
+        $CONFIG{ 'lvm' }       = $install{ 'lvm' };
+        $CONFIG{ 'zpool' }     = undef;
+    }
+
    pod2usage(1) if $HELP;
    pod2usage( -verbose => 2 ) if $MANUAL;

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

 =head1 AUTHORS

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


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



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

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

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

 =head1 AUTHORS

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


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



@@ -221,7 +221,7 @@ sub checkArguments

    if ( !-d $dir )
    {
-        print <<E_OR;
+        print <<EOR;

  We\'re trying to configure an installation of $CONFIG{'dist'} in
 $CONFIG{'location'} - but there is no hook directory for us to use.
@@ -231,7 +231,7 @@ sub checkArguments
  We\'d expect the hook directory to be : $dir

  Aborting.
-E_OR
+EOR
        exit 1;
    }

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

 =head1 AUTHORS

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


@@ -52,9 +52,9 @@ full text of the license.
 # Fallback to Debian or Ubuntu in case we can't find anything
 my $fallback = 'Debian';

-# Which mirrors to use if everything else fails (httpredir.debian.org
+# Which mirrors to use if everything else fails (deb.debian.org
 # redirects to a working mirror nearby)
-my %fallback_mirror = ( Debian => 'http://httpredir.debian.org/debian/',
+my %fallback_mirror = ( Debian => 'http://deb.debian.org/debian/',
                        Ubuntu => 'http://archive.ubuntu.com/ubuntu/' );

 # Which suite to use if everything else fails. For Debian "stable"
@@ -62,7 +62,7 @@ my %fallback_mirror = ( Debian => 'http://httpredir.debian.org/debian/',
 # have aliases like stable or testing, so we take the nearest LTS
 # release which is 10.04 at the time of writing.
 my %fallback_suite = ( Debian => 'stable',
-                       Ubuntu => 'lucid' );
+                       Ubuntu => 'bionic' );

 # Where to look for the sources.list to parse
 my @sources_list_files = ( '/etc/apt/sources.list',
@@ -79,7 +79,7 @@ use strict;
 #
 # Release number.
 #
-my $RELEASE = '4.6.2';
+my $RELEASE = '4.9';

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

 =head1 AUTHORS

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


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


 #
@@ -414,7 +414,7 @@ sub checkArguments

    if ( !-d $dir )
    {
-        print <<E_OR;
+        print <<EOR;

  We are trying to configure an installation of $CONFIG{'dist'} in
 $CONFIG{'location'} - but there is no hook directory for us to use.
@@ -424,7 +424,7 @@ sub checkArguments
  We would expect the hook directory to be $dir.

  Aborting.
-E_OR
+EOR
        exit 1;
    }

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

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

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

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

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

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

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

    #
-    #  Propogate any arch setting we might have.
+    #  Propagate any arch setting we might have.
    #
    if ( $CONFIG{ 'arch' } )
    {
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,18 @@
+xen-tools (4.8-1) unstable; urgency=medium
+
+  For security reasons (avoid risk to circumvent ASLR), recent
+  kernels have disabled the vsyscall mapping. Unfortunately older
+  distributions don't run and hence can't be bootstrapped without it.
+
+  To enable trapping and enabling emulate calls into the fixed
+  vsyscall address mapping and hence to run and bootstrap older Linux
+  distributions in a chroot (as xen-tools does), you need to add
+  "vsyscall=emulate" to the kernel commandline, e.g. by adding it to
+  GRUB_CMDLINE_LINUX_DEFAULT in /etc/default/grub, then running
+  "update-grub" afterwards and finally reboot.
+
+ -- Axel Beckert <abe@debian.org>  Thu, 07 Feb 2019 17:40:03 +0100
+
 xen-tools (4.4~beta1-1) unstable; urgency=low

  * Exported environment variables no more contain dashes ("-"). Dashes in
@@ -26,7 +41,7 @@ xen-tools (4.2~beta1-1) unstable; urgency=low

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

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

 -- Axel Beckert <abe@debian.org>  Sun, 30 May 2010 22:36:16 +0200
-
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,145 @@
+xen-tools (4.9-1) unstable; urgency=medium
+
+  * New upstream bugfix and minor feature release.
+    + Mark Debian 7 Wheezy and 8 Jessie as EoL.
+    + Update list of Ubuntu and Debian releases.
+    + distributions.conf: Fix typo in release name of future Debian 12
+      release (bookwork → bookworm).
+    + Actually install xen-resize-guest tool. (Thanks lintian for the
+      spare-manual-page warning!)
+    + Distinguish between those Debian releases using $dist/updates for
+      security updates and those who use $dist-security. Thanks Paul Wise!
+      (Closes: #972749)
+      - Add test for this; needs libtest-file-contents-perl as build-dep.
+    + Fix support for lvm_thin. Thanks to Andreas Sundstrom for the bug
+      report and patch! (Closes: #942244)
+    + Mount /proc and /dev before calling update-grub. Thanks to Brandon
+      Bradley for the bug report and patch. (Closes: #815021)
+    + Add Debian install rules for arm64. (GH #62; patch by Ian McLinden)
+    + Add netplan p2p support for Ubuntu. (GH #58; patch by Volker Janzen)
+    + Fix storage commandline options not overriding xen-tools.conf
+      settings also in xen-update-image and xen-delete-image. (GH #57;
+      patch by Volker Janzen)
+    + partitions/sample-server: Change options=sync to
+      options=defaults. (GL MR !1; patch by Wolfgang Karall)
+    + Start all Debian releases since Stretch (9) with pygrub by default.
+
+  * Recommend deboootstrap ≥ 1.0.117~ for working bootstrapping of Ubuntu
+    6.06 Dapper and 6.10 Edgy (see #659360) and for support of Ubuntu
+    17.10 Artful, 18.04 LTS Bionic, 18.10 Cosmic, 19.04 Disco, 19.10 Eoan,
+    and 20.04 Focal.
+  * Fix non-RFC-conforming four-letter day of week abbreviations in
+    ancient debian/changelog entries.
+  * Bump debian/watch version from 3 to 4. Thanks Lintian!
+  * Bump debhelper compatibility level to 13.
+    + Build-depend on "debhelper-compat (= 13)" to replace debian/compat.
+  * Declare compliance with Debian Policy 4.5.1. (No changes required.)
+  * Adapt distributions.conf defaults to the fact that Debian Unstable
+    still ships Ubuntu keyrings as of 2018, see #978438.
+
+ -- Axel Beckert <abe@debian.org>  Tue, 29 Dec 2020 12:19:51 +0100
+
+xen-tools (4.8-1) unstable; urgency=medium
+
+  * New upstream release.
+
+    [ Marc Bigler ]
+    + Add support for ZFS volumes. (GH #50)
+
+    [ Yuri Sakhno ]
+    + Eliminate progress reporting which is useless in logs. (GH #42)
+
+    [ Axel Beckert ]
+    + Add preliminary support for future Debian 12 Bookworm release.
+    + Add support for Ubuntu releases from 17.10 Artful to 19.04 Disco.
+      - Create hooks/artful with new 40-setup-networking-deb-netplan by
+        Arno Bakker and Peter. (Fixes xen-tools/xen-tools#51)
+      - Rename hooks/karmic/80-install-kernel to
+        hooks/common/80-install-kernel-ubu and add according symlinks.
+    + Change all occurrences of httpredir.debian.org to deb.debian.org
+      except those for the debian-archive. The latter now point to
+      archive.debian.org directly.
+    + Set Ubuntu fallback suite to the latest LTS, i.e. 18.04 Bionic.
+    + Drop pygrub path detection from xm.tmpl, Xen prefers a path-less
+      bootloader='pygrub'.
+    + Many improvements for the release-testing script.
+    + Only run xen-toolstack helper script if both, xm and xl are
+      present. Avoids warning about deprecated helper script.
+    + distributions.conf now supports arbitrary keyring files in
+      /usr/share/keyrings/. (Needed for some EoL Ubuntu releases.)
+
+    [ Nico Boehr ]
+    + Add support for LVM thin provisioning.
+
+    [ Pietro Stäheli ]
+    + Add support for option --randommac for really random MAC addresses
+      upon every xen-create-image invocation. (Closes: #855703)
+
+  [ Axel Beckert ]
+  * Fix wrong bug number for #849867 in previous changelog entry.
+  * Declare compliance with Debian Policy 4.1.3.
+    + Change Priority from extra to optional.
+  * Use "$(MAKE)" instead of "make" in debian/rules.
+  * debian/control: Drop "Testsuite: autopkgtest" header, no more needed.
+  * Switch "activate" trigger to "activate-noawait".
+  * Recommend e2fsprogs. (Closes: #887236)
+  * Prefer btrfs-progs over now transitional package btrfs-tools. (Closes:
+    #878910)
+  * Bump debhelper compatibility level to 10.
+    + Update versioned debhelper build-dependency accordingly.
+    + Only using dh compat level 10 allows one to still build the package
+      on Debian 9 Stretch without backports, on Ubuntu 18.04 LTS and on
+      Ubuntu 16.04 LTS with backports.
+  * Declare compliance with Debian Policy 4.3.0. (No changes needed.)
+  * Set "Rules-Requires-Root: no".
+  * Check $DEB_BUILD_OPTIONS and $DEB_BUILD_PROFILES in
+    override_dh_auto_test. Fixes according lintian warning.
+  * Use ubuntu-keyring instead of now transitional ubuntu-archive-keyring,
+    but keep the latter as alternative to allow one to install the
+    xen-tools package also on older Debian or Ubuntu releases.
+  * Suggest grub-xen-host despite the proper support for it is not
+    finished.
+  * Add a note about "vsyscall=emulate" and older Linux distributions to
+    debian/NEWS. Thanks to James Clarke and Jason Crain for the hint!
+  * Add a DEP-12 debian/upstream/metadata file.
+
+  [ Jelmer Vernooĳ ]
+  * Trim trailing whitespace from debian/changelog. (GH #54)
+
+ -- Axel Beckert <abe@debian.org>  Sat, 09 Feb 2019 01:56:51 +0100
+
+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: #849867)
+    + 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 +405,7 @@ xen-tools (4.4~beta1-1) unstable; urgency=low
      libdata-validate-{domain,ip}-perl.
    - Fixes broken quoting in list of required binaries
    - Declares POD encoding. Fixes FTBFS with Perl 5.18. (Closes: #720519)
-  * Add debian/gbp.conf to be able to to build xen-tools with
+  * Add debian/gbp.conf to be able to build xen-tools with
    git-buildpackage.
  * Clean up debian/rules:
    - Don't mention (generated) upstream changelog explicitly,
@@ -551,7 +693,7 @@ xen-tools (3.9-3) unstable; urgency=medium
 xen-tools (3.9-2) unstable; urgency=high

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

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

@@ -685,7 +827,7 @@ xen-tools (3.1-1) unstable; urgency=low
  [ Steve Kemp ]
  * New upstream release v3.1.
    - Installation of packages in hooks works. (Closes: #402889, #404518)
-    - Xen configuration files are not accidently trashed.  (Closes: #404443)
+    - Xen configuration files are not accidentally trashed.  (Closes: #404443)
    - Hooks are now optional.  (Closes: #404444)
    - Better error handling of image creation. (Closes: #404455, #404516)
    - Avoid copying needless kernel modules to guests.  (Closes: #404508)
@@ -888,7 +1030,7 @@ xen-tools (2.1-2) unstable; urgency=high
    - Fixed several typos in the configuration file, and scripts.
      (Closes: #375382)

- -- Steve Kemp <skx@debian.org>  Thur, 29 Jun 2006 10:31:23 +0000
+ -- Steve Kemp <skx@debian.org>  Thu, 29 Jun 2006 10:31:23 +0000

 xen-tools (2.1-1) unstable; urgency=high

@@ -902,7 +1044,7 @@ xen-tools (2.1-1) unstable; urgency=high
  * Urgency set to high primarily because of the failure to create
    swap devices.

- -- Steve Kemp <skx@debian.org>  Thur, 23 Jun 2006 10:08:32 +0000
+ -- Steve Kemp <skx@debian.org>  Thu, 23 Jun 2006 10:08:32 +0000

 xen-tools (2.0-1) unstable; urgency=low

@@ -1033,4 +1175,3 @@ xen-tools (0.4-1) unstable; urgency=low
  * Initial release (Closes: #344081)

 -- Radu Spineanu <radu@debian.org>  Tue, 20 Dec 2005 02:21:05 +0200
-
--- a/debian/compat
+++ b/debian/compat
@@ -1 +0,0 @@
-9
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
 Source: xen-tools
 Section: utils
-Priority: extra
+Priority: optional
 Maintainer: Axel Beckert <abe@debian.org>
-Build-Depends: debhelper (>= 9~),
+Build-Depends: debhelper-compat (= 13),
               devscripts,
               git,
               libdata-validate-domain-perl,
@@ -13,15 +13,16 @@ Build-Depends: debhelper (>= 9~),
               liblog-message-perl | perl (<< 5.17.0),
               libterm-ui-perl | perl (<< 5.17.0),
               libsort-versions-perl,
+               libtest-file-contents-perl,
               libtest-notabs-perl,
               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: 4.5.1
+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
-Testsuite: autopkgtest
+Vcs-Git: https://github.com/xen-tools/xen-tools.git
+Rules-Requires-Root: no

 Package: xen-tools
 Architecture: all
@@ -40,14 +41,17 @@ Depends: debootstrap | cdebootstrap,
         ${misc:Depends},
         ${perl:Depends}
 Recommends: debian-archive-keyring,
+            debootstrap (>= 1.0.117~),
+            e2fsprogs,
            libexpect-perl,
            lvm2,
            rinse (>= 1.9.1-1),
-            ubuntu-archive-keyring,
+            ubuntu-keyring | ubuntu-archive-keyring,
            xen-hypervisor,
            xen-utils
-Suggests: btrfs-tools,
+Suggests: btrfs-progs | btrfs-tools,
          cfengine2,
+          grub-xen-host,
          reiserfsprogs,
          xfsprogs
 Description: Tools to manage Xen virtual servers
@@ -64,7 +68,11 @@ Description: Tools to manage Xen virtual servers
   * Debian 6.0 Squeeze
   * Debian 7 Wheezy
   * Debian 8 Jessie
-   * Debian 9 Stretch (under development)
+   * Debian 9 Stretch
+   * Debian 10 Buster
+   * Debian 11 Bullseye (under development)
+   * Debian 12 Bookworm (knows about this future release name)
+   * Debian 13 Trixie (knows about this future release name)
   * Debian Sid (Unstable)
   * Ubuntu 6.06 Dapper Drake (LTS)
   * Ubuntu 6.10 Edgy Eft
@@ -86,6 +94,16 @@ Description: Tools to manage Xen virtual servers
   * Ubuntu 14.10 Utopic Unicorn
   * Ubuntu 15.04 Vivid Vervet
   * Ubuntu 15.10 Wily Werewolf
-   * Ubuntu 16.04 Xenial Xerus (preliminary support, under development)
+   * Ubuntu 16.04 Xenial Xerus (LTS)
+   * Ubuntu 16.10 Yakkety Yak
+   * Ubuntu 17.04 Zesty Zapus
+   * Ubuntu 17.10 Artful Aardvark
+   * Ubuntu 18.04 Bionic Beaver (LTS)
+   * Ubuntu 18.10 Cosmic Cuttlefish
+   * Ubuntu 19.04 Disco Dingo
+   * Ubuntu 19.10 Eoan Ermine
+   * Ubuntu 20.04 Focal Fossa (LTS)
+   * Ubuntu 20.10 Groovy Gorilla
+   * Ubuntu 21.04 Hirsute Hippo (preliminary support, under development)
   * CentOS 5
   * CentOS 6
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 This package was debianized by Radu Spineanu <radu@debian.org> on
 Tue, 20 Dec 2005 02:21:05 +0200.

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

 Copyright 2005-2009: Steve Kemp <steve@steve.org.uk>
 Copyright 2010-2013: The Xen-Tools Development Team, currently consisting of:
--- a/debian/docs
+++ b/debian/docs
@@ -2,4 +2,3 @@ AUTHORS
 README.markdown
 SUPPORT.markdown
 TODO.markdown
-NEWS.markdown
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,11 @@
 	dh $@

 override_dh_auto_test:
-	make non-author-test
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS) $(DEB_BUILD_PROFILES)))
+	$(MAKE) non-author-test
+endif
+
+override_dh_installchangelogs:
+	dh_installchangelogs NEWS.markdown

 override_dh_auto_build:
--- a/debian/triggers
+++ b/debian/triggers
@@ -1 +1 @@
-activate update-initramfs
+activate-noawait update-initramfs
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@@ -0,0 +1,12 @@
+%YAML 1.1
+---
+# https://wiki.debian.org/UpstreamMetadata
+Bug-Database: https://github.com/xen-tools/xen-tools/issues
+Bug-Submit: https://github.com/xen-tools/xen-tools/issues/new
+Changelog: https://github.com/xen-tools/xen-tools/blob/master/NEWS.markdown
+Contact: mailto:xen-tools-discuss@xen-tools.org
+Security-Contact: mailto:abe@debian.org
+Name: Xen-Tools
+Homepage: https://xen-tools.org/
+Repository: https://github.com/xen-tools/xen-tools.git
+Repository-Browse: https://github.com/xen-tools/xen-tools
--- a/debian/watch
+++ b/debian/watch
@@ -4,7 +4,7 @@
 #
 #  uscan version number - not the version of the software.
 #
-version=3
+version=4


 #
@@ -12,5 +12,5 @@ version=3
 # to match release tarballs.
 #
 opts=pgpsigurlmangle=s/$/.asc/ \
-http://xen-tools.org/software/xen-tools/releases.html \
+https://xen-tools.org/software/xen-tools/releases.html \
   xen-tools-([\d\.]+)\.tar\.gz
--- a/etc/distributions.conf
+++ b/etc/distributions.conf
@@ -1,27 +1,35 @@
-# 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
+# Known generic keywords: *.gpg (uses the according /usr/share/keyrings/….gpg file)
 #
 sarge        = debian eol
 etch         = debian eol
 lenny        = debian eol
-squeeze      = debian
-wheezy       = debian
-jessie       = debian
-stretch      = debian
-sid          = debian
+squeeze      = debian eol default-keyring
+wheezy       = debian eol
+jessie       = debian eol
+stretch      = debian pygrub
+buster       = debian pygrub
+bullseye     = debian pygrub
+bookworm     = debian pygrub dont-test
+trixie       = debian pygrub dont-test
+sid          = debian pygrub

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

+# Between at least debootstrap 1.0.37 and 1.0.93 (including), dapper
+# and edgy may need manual adjustments in debootstrap's configuration,
+# see https://bugs.debian.org/659360
 dapper       = ubuntu eol
 edgy         = ubuntu eol
 feisty       = ubuntu eol
@@ -34,12 +42,24 @@ lucid        = ubuntu eol pygrub
 maverick     = ubuntu eol pygrub
 natty        = ubuntu eol pygrub
 oneiric      = ubuntu eol pygrub
-precise      = ubuntu     pygrub
+precise      = ubuntu     pygrub ubuntu-archive-removed-keys.gpg
 quantal      = ubuntu eol pygrub
 raring       = ubuntu eol pygrub
 saucy        = ubuntu eol pygrub
 trusty       = ubuntu     pygrub
 utopic       = ubuntu eol pygrub
-vivid        = ubuntu     pygrub
-wily         = ubuntu     pygrub
+vivid        = ubuntu eol pygrub
+wily         = ubuntu eol pygrub
 xenial       = ubuntu     pygrub
+yakkety      = ubuntu eol pygrub
+zesty        = ubuntu eol pygrub ubuntu-keyring-2012-archive.gpg
+artful       = ubuntu eol pygrub ubuntu-archive-keyring.gpg
+bionic       = ubuntu     pygrub
+cosmic       = ubuntu eol pygrub ubuntu-archive-keyring.gpg
+disco        = ubuntu eol pygrub ubuntu-archive-keyring.gpg
+eoan         = ubuntu eol pygrub ubuntu-archive-keyring.gpg
+focal        = ubuntu     pygrub
+groovy       = ubuntu     pygrub
+hirsute      = ubuntu     pygrub
+
+devel        = ubuntu     pygrub dont-test
--- a/etc/mirrors.conf
+++ b/etc/mirrors.conf
@@ -1,7 +1,7 @@
 # xen-tools default mirror configuration file

-debian =         http://httpredir.debian.org/debian
-debian_archive = http://httpredir.debian.org/debian-archive/debian
+debian =         http://deb.debian.org/debian
+debian_archive = http://archive.debian.org/debian

 ubuntu =         http://archive.ubuntu.com/ubuntu
 ubuntu_archive = http://old-releases.ubuntu.com/ubuntu
--- a/etc/xen-tools.conf
+++ b/etc/xen-tools.conf
@@ -7,7 +7,7 @@
 #
 #  For more details please see:
 #
-#        http://xen-tools.org/
+#        https://xen-tools.org/
 #
 ##

@@ -54,6 +54,14 @@
 ##
 # lvm = vg0

+#
+##
+#
+# If you have ZFS available and wish to use it then you may specify a
+# ZFS pool name here instead
+#
+##
+# zpool = xenpool0

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

 #
-# Setup bridge name for host vif. Usefull if you use bridged networking
+# Setup bridge name for host vif. Useful if you use bridged networking
 # for guests.
 #
 # bridge = xendmz
--- a/etc/xm.tmpl
+++ b/etc/xm.tmpl
@@ -20,20 +20,7 @@
 {
  if ( $pygrub )
  {
-    my $pygrub_bin = '';
-    foreach my $pygrub_path (reverse glob('/usr/lib/xen-default/bin/pygrub
-                                           /usr/lib/xen-*/bin/pygrub
-                                           /usr/*bin/pygrub
-                                           /usr/local/bin/pygrub')) {
-      if (-x $pygrub_path) {
-        $pygrub_bin = $pygrub_path;
-        last;
-      }
-    }
-
-    die "pygrub not found" unless $pygrub_bin;
-
-    $OUT .= "bootloader = '$pygrub_bin'\n";
+    $OUT .= "bootloader = 'pygrub'\n";
  }
 }
 vcpus       = '{$vcpus}'
--- a/examples/release-testing
+++ b/examples/release-testing
@@ -1,6 +1,50 @@
-#!/bin/sh
+#!/bin/bash

-# 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
+exec > >( tee xen-tools-release-testing-$(date -Iseconds).log )
+
+if [ -z "$DISTRIBUTIONS" ]; then
+    DISTRIBUTIONS=$(awk '!/^#|^$|dont-test/ {print $1}' /etc/xen-tools/distributions.conf)
+fi
+
+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';
+
+SUCCEEDED=''
+FAILED=''
+
+# From now on we just want to log failures, not abort.
+set +e
+
+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 "$@"
+
+    if [ "$?" -eq '0' ]; then
+        SUCCEEDED="$dist $SUCCEEDED"
+    else
+        FAILED="$dist $FAILED"
+    fi
+done
+
+echo ''
+echo '======================================================================'
+if [ -z "$FAILED" ]; then
+    echo '*** All tests succeeded! ***'
+elif [ -z "$SUCCEEDED" ]; then
+    echo '*** All tests failed! ***'
+else
+    echo "*** These distributions succeeded: $SUCCEEDED ***"
+    echo "*** These distributions failed: $FAILED ***"
+fi
--- a/hooks/artful/01-disable-daemons
+++ b/hooks/artful/01-disable-daemons
@@ -0,0 +1 @@
+../common/01-disable-daemons
--- a/hooks/artful/05-shadowconfig-on
+++ b/hooks/artful/05-shadowconfig-on
@@ -0,0 +1 @@
+../common/05-shadowconfig-on
--- a/hooks/artful/15-disable-hwclock
+++ b/hooks/artful/15-disable-hwclock
@@ -0,0 +1 @@
+../common/15-disable-hwclock
--- a/hooks/artful/20-setup-apt
+++ b/hooks/artful/20-setup-apt
@@ -0,0 +1 @@
+../common/20-setup-apt
--- a/hooks/artful/25-generate-locale
+++ b/hooks/artful/25-generate-locale
@@ -0,0 +1 @@
+../common/25-generate-locale
--- a/hooks/artful/30-disable-gettys
+++ b/hooks/artful/30-disable-gettys
@@ -0,0 +1 @@
+../common/30-disable-gettys
--- a/hooks/artful/35-setup-users
+++ b/hooks/artful/35-setup-users
@@ -0,0 +1 @@
+../common/35-setup-users
--- a/hooks/artful/40-setup-networking-deb-netplan
+++ b/hooks/artful/40-setup-networking-deb-netplan
@@ -0,0 +1,147 @@
+#!/bin/sh
+#
+#  This script sets up the /etc/netplan/interface file for the new
+# image.
+#
+# Steve
+# --
+# https://steve.fi/
+
+
+prefix=$1
+
+#
+#  Source our common functions
+#
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
+else
+    . ./hooks/common.sh
+fi
+
+# From: https://serverfault.com/questions/54981/linux-command-line-tool-to-work-with-netmasks-cidr-notation
+mask2cdr ()
+{
+   # Assumes there's no "255." after a non-255 byte in the mask
+   local x=${1##*255.}
+   set -- 0^^^128^192^224^240^248^252^254^ $(( (${#1} - ${#x})*2 )) ${x%%.*}
+   x=${1%%$3*}
+   echo $(( $2 + (${#x}/4) ))
+}
+
+#
+# Log our start
+#
+logMessage Script $0 starting
+
+
+#
+#  Make sure we have an /etc/netplan directory.
+#
+mkdir -p ${prefix}/etc/netplan
+
+
+#
+#  A function to setup DHCP for our new image.
+#
+setupDynamicNetworking ()
+{
+    #
+    # The host is using DHCP.
+    #
+    cat <<E_O_DHCP > ${prefix}/etc/netplan/01-netcfg.yaml
+# Arno: Configure VM interface eth0 via DHCP
+network:
+  version: 2
+  renderer: networkd
+  ethernets:
+    eth0:
+      dhcp4: true
+E_O_DHCP
+}
+
+
+
+#
+#  A function to setup static IP addresses for our new image.
+#
+setupStaticNetworking ()
+{
+    # Arno
+    cidr='24';
+    if [ -n "${netmask}" ]; then
+      cidr="$(mask2cdr ${netmask})"
+    fi
+    # p2p code by Volker Janzen
+    gate="      gateway4: ${gateway}";
+    point='';
+    if [ -n "${p2p}" ]; then
+       # For a p2p setup the gateway4 keyword is replaced by the
+       # following on-link default route, when it matches the
+       # gateway4.
+       if [ "${p2p}" = "${gateway}" ]; then
+          gate="      routes:
+      - to: 0.0.0.0/0
+        via: ${p2p}
+        on-link: true"
+       else
+          gate="${gate}
+      routes:
+      - to: ${p2p}
+        on-link: true"
+       fi
+    fi
+
+    #
+    # We have a static IP address
+    #
+    cat <<E_O_STATIC >${prefix}/etc/netplan/01-netcfg.yaml
+# Arno: Set static IP for VM interface eth0
+network:
+  version: 2
+  renderer: networkd
+  ethernets:
+    eth0:
+      addresses: [${ip1}/${cidr}]
+${gate}
+      nameservers:
+          addresses: [${nameserver}]
+E_O_STATIC
+
+    # Arno: no support for multiple interfaces
+
+    #
+    # Hooks are run chrooted, hence the resolv.conf is moved
+    # temporarily to /etc/resolv.conf.old. Use that file, it
+    # will be restored after hooks are run.
+    #
+    if [ '' != "$nameserver" ]; then
+        rm -f ${prefix}/etc/resolv.conf.old
+        for ns in $nameserver; do
+            echo "nameserver $ns" >>${prefix}/etc/resolv.conf.old
+        done
+    else
+        cp /etc/resolv.conf ${prefix}/etc/resolv.conf.old
+    fi
+}
+
+
+
+
+#
+#  Call the relevant function
+#
+if [ -z "${dhcp}" ]; then
+    logMessage "Setting up static networking"
+    setupStaticNetworking
+
+else
+    logMessage "Setting up DHCP networking"
+    setupDynamicNetworking
+fi
+
+
+#
+#  Log our finish
+#
+logMessage Script $0 finished
--- a/hooks/artful/50-setup-hostname
+++ b/hooks/artful/50-setup-hostname
@@ -0,0 +1 @@
+../common/50-setup-hostname-deb
--- a/hooks/artful/60-copy-host-files
+++ b/hooks/artful/60-copy-host-files
@@ -0,0 +1 @@
+../common/60-copy-host-files
--- a/hooks/artful/65-copy-user-files
+++ b/hooks/artful/65-copy-user-files
@@ -0,0 +1 @@
+../common/65-copy-user-files
--- a/hooks/artful/70-install-ssh
+++ b/hooks/artful/70-install-ssh
@@ -0,0 +1 @@
+../common/70-install-ssh-deb
--- a/hooks/artful/75-fixup-securetty
+++ b/hooks/artful/75-fixup-securetty
@@ -0,0 +1 @@
+../common/75-fixup-securetty
--- a/hooks/artful/80-install-kernel-ubuntu
+++ b/hooks/artful/80-install-kernel-ubuntu
@@ -0,0 +1 @@
+../common/80-install-kernel-ubuntu
--- a/hooks/artful/80-install-modules
+++ b/hooks/artful/80-install-modules
@@ -0,0 +1 @@
+../common/80-install-modules-deb
--- a/hooks/artful/81-install-modules-init-tools
+++ b/hooks/artful/81-install-modules-init-tools
@@ -0,0 +1 @@
+../common/81-install-modules-init-tools
--- a/hooks/artful/82-install-grub-legacy
+++ b/hooks/artful/82-install-grub-legacy
@@ -0,0 +1 @@
+../common/82-install-grub-legacy
--- a/hooks/artful/90-make-fstab
+++ b/hooks/artful/90-make-fstab
@@ -0,0 +1 @@
+../common/90-make-fstab
--- a/hooks/artful/99-clean-image
+++ b/hooks/artful/99-clean-image
@@ -0,0 +1 @@
+../common/99-clean-image-deb
--- a/hooks/artful/99-enable-daemons
+++ b/hooks/artful/99-enable-daemons
@@ -0,0 +1 @@
+../common/99-enable-daemons
--- a/hooks/centos-5/25-setup-kernel
+++ b/hooks/centos-5/25-setup-kernel
@@ -59,9 +59,9 @@ logMessage "Kernel $KERNELVERSION found"
 logMessage "Creating /boot/grub/menu.lst"
 mkdir -p ${prefix}/boot/grub
 cat > ${prefix}/boot/grub/menu.lst << EOF
-# WARNING : Don't forget to update this when you upgrade kernel !
+# WARNING : Don't forget to update this when you upgrade kernel!
 # You can also exclude kernel-xen from updates by putting
-# exclude=kernel-xen in in [main] in yum.conf
+# exclude=kernel-xen in [main] in yum.conf

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

 default=0
 timeout=5
--- a/hooks/common.sh
+++ b/hooks/common.sh
@@ -96,7 +96,7 @@ installDebianPackageAndRecommends ()
    #
    # Install the packages
    #
-    DEBIAN_FRONTEND=noninteractive chroot ${prefix} /usr/bin/apt-get --yes install "$@"
+    DEBIAN_FRONTEND=noninteractive chroot ${prefix} /usr/bin/apt-get --yes install "$@" 2>&1 | sed --expression="s/\rExtracting templates from packages: [0-9]\+%//g;s/(Reading database ... \([0-9]\+%\)\?\r//g"

    #
    #  Remove the policy-rc.d script.
@@ -210,7 +210,7 @@ timeout         2
 # altoptions=(single-user mode) single

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


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


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



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


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


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


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


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

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


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



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



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


 prefix=$1
--- a/hooks/common/60-copy-host-files
+++ b/hooks/common/60-copy-host-files
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
-#  Copy files from a 'skel' directory, if present, into the
-# new images
+#  Copy some specific files from host nachine into the new images
 #


--- a/hooks/common/65-copy-user-files
+++ b/hooks/common/65-copy-user-files
@@ -38,7 +38,7 @@ if [ -d /etc/xen-tools/skel ]; then

 else

-    logMessage skel directory, /etc/xen-tools/skell, not present ignoring.
+    logMessage skel directory, /etc/xen-tools/skel, not present ignoring.

 fi

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

 prefix=$1

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


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


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

 prefix=$1

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

 logMessage Script $0 starting

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

 #
 # The type of kernel that we will be installing
--- a/hooks/common/80-install-modules-deb
+++ b/hooks/common/80-install-modules-deb
@@ -9,7 +9,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/


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

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


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

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

 #
 #  Install the grub 0.9x package ("grub-legacy" on Debian, "grub" on Ubuntu)
@@ -40,7 +40,11 @@ fi
 if [ ! -e ${prefix}/boot/grub/default ]; then
    echo default > ${prefix}/boot/grub/default
 fi
+mount -o bind /proc ${prefix}/proc
+mount -o bind /dev ${prefix}/dev
 chroot ${prefix} /usr/sbin/update-grub
+umount ${prefix}/proc
+umount ${prefix}/dev

 else
    logMessage "pygrub not set, skipping grub-legacy installation"
--- a/hooks/common/90-make-fstab
+++ b/hooks/common/90-make-fstab
@@ -9,7 +9,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/


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


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


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



--- a/hooks/debian/20-setup-apt
+++ b/hooks/debian/20-setup-apt
@@ -66,23 +66,51 @@ if ( test "${dist}" "!=" "sid" && test "${dist}" "!=" "unstable" && \
     test -e /etc/apt/sources.list && \
     grep ^deb.*security -r /etc/apt/sources.list /etc/apt/sources.list.d >/dev/null 2>/dev/null ) ; then

-    cat <<E_O_APT >> ${prefix}/etc/apt/sources.list
-# 
-#  Security updates
-# 
+    if echo "${dist}" | egrep -q '\b(sarge|etch|lenny|squeeze|wheezyjessie|stretch|buster)\b'; then
+
+        cat <<E_O_APT >> ${prefix}/etc/apt/sources.list
+#
+# Security updates
+#
 deb     http://security.debian.org/ ${dist}/updates  main contrib non-free
 deb-src http://security.debian.org/ ${dist}/updates  main contrib non-free
 E_O_APT

+    else
+
+        cat <<E_O_APT >> ${prefix}/etc/apt/sources.list
+#
+# Security updates
+#
+deb     http://security.debian.org/ ${dist}-security  main contrib non-free
+deb-src http://security.debian.org/ ${dist}-security  main contrib non-free
+E_O_APT
+
+    fi
+
 else
-    cat <<E_O_APT >> ${prefix}/etc/apt/sources.list
-# 
-#  Security updates - Uncomment to enable.
-# 
+
+    if echo "${dist}" | egrep -q '\b(sarge|etch|lenny|squeeze|wheezyjessie|stretch|buster)\b'; then
+
+        cat <<E_O_APT >> ${prefix}/etc/apt/sources.list
+#
+# Security updates - Uncomment to enable.
+#
 # deb     http://security.debian.org/ ${dist}/updates  main contrib non-free
 # deb-src http://security.debian.org/ ${dist}/updates  main contrib non-free
 E_O_APT

+    else
+
+        cat <<E_O_APT >> ${prefix}/etc/apt/sources.list
+#
+# Security updates - Uncomment to enable.
+#
+# deb     http://security.debian.org/ ${dist}-security  main contrib non-free
+# deb-src http://security.debian.org/ ${dist}-security  main contrib non-free
+E_O_APT
+
+    fi
 fi
    
 #
--- a/hooks/debian/80-install-kernel
+++ b/hooks/debian/80-install-kernel
@@ -7,7 +7,7 @@
 #
 # Dmitry Nedospasov
 # --
-# http://nedos.net
+# http://www.nedos.net/

 prefix=$1

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

-if [ "${pygrub}" ]; then
+if [ "${pygrub}" = "1" ]; then
 #
 # Log our start
 #
@@ -36,12 +36,16 @@ if [ "${arch}" = "i386" ]; then
    XEN_ARCH="686"
 elif [ "${arch}" = "amd64" ]; then
    XEN_ARCH="amd64"
+elif [ "${arch}" = "arm64" ]; then
+    XEN_ARCH="arm64"
 elif [ -z "${arch}" ]; then
    UNAME_ARCH=`uname -m`
    if [ "${UNAME_ARCH}" = "i686" ]; then
        XEN_ARCH="686"
    elif [ "${UNAME_ARCH}" = "x86_64" ]; then
        XEN_ARCH="amd64"
+    elif [ "${UNAME_ARCH}" = "aarch64" ]; then
+        XEN_ARCH="arm64"
    else
        logMessage Unknown kernel architecture ${UNAME_ARCH}.
        logMessage Please report this as bug to xen-tools-dev@xen-tools.org.
--- a/hooks/debian/95-configure-locales
+++ b/hooks/debian/95-configure-locales
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/

 prefix=$1

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

 prefix=$1

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

 logMessage Script $0 starting

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

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


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


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



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


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

 prefix=$1

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

 logMessage Script $0 starting

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

 #
 # Attempt to install a xen kernel, if that fails, then install a normal one
--- a/hooks/karmic/80-install-kernel-ubuntu
+++ b/hooks/karmic/80-install-kernel-ubuntu
@@ -0,0 +1 @@
+../common/80-install-kernel-ubuntu
--- a/lib/Xen/Tools/Common.pm
+++ b/lib/Xen/Tools/Common.pm
@@ -6,7 +6,7 @@ package Xen::Tools::Common;

 =head1 NAME

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


 =head1 SYNOPSIS
@@ -129,7 +129,7 @@ sub xenRunning ($$)
    my $running = 0;

    unless ($CONFIG->{'xm'}) {
-        warn "Couldn't determine Xen toolstack, skipping check for running DomUs."
+        warn "Couldn't determine Xen toolstack, skipping check for running DomUs.\n"
            unless $ENV{AS_INSTALLED_TESTING};
        return 0;
    }
@@ -161,18 +161,19 @@ sub findXenToolstack
 {
    my $helper = '/usr/lib/xen-common/bin/xen-toolstack';

-    if (-x $helper) {
+    my $xm = which('xm');
+    my $xl = which('xl');
+
+    if ($xm and $xl and -x $helper) {
        my $toolstack = `$helper`;
        chomp($toolstack);
        return $toolstack if $toolstack;
    }

-    my $xm = which('xm');
    if ($xm and system("$xm list >/dev/null 2>/dev/null") == 0) {
        return $xm;
    }

-    my $xl = which('xl');
    if ($xl and system("$xl list >/dev/null 2>/dev/null") == 0) {
        return $xl;
    }
@@ -246,7 +247,8 @@ sub runCommand ($$;$)

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

 =head1 AUTHORS

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

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

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

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

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

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

 BuildArch:      noarch
--- a/partitions/sample-server
+++ b/partitions/sample-server
@@ -2,7 +2,7 @@
 size=1G
 type=ext3
 mountpoint=/
-options=sync,errors=remount-ro
+options=defaults,errors=remount-ro

 [swap]
 size=2G
--- a/roles/builder
+++ b/roles/builder
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 #


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


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


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


--- a/Show More
+++ b/Show More