reverted to maiden name; re-sorted; using corporate email address (#70)

ext3 → ext4

.gitignore

@@ -6,6 +6,7 @@
 # but we _wan't_ those dot-files
 !.gitignore
 !.mailmap
+!.travis.yml
 
 # ChangeLog is generated during make
 /ChangeLog
@@ -14,10 +15,12 @@
 /build-stamp
 /configure-stamp
 /man
+/debian/*-stamp
 /debian/files
 /debian/xen-tools
 /debian/xen-tools.debhelper.log
 /debian/xen-tools.substvars
+/debian/xen-tools.*.debhelper
 
 # git-generated patches
 /*.patch

.travis.yml

@@ -0,0 +1,41 @@
+language: perl
+perl:
+  - "5.32"
+  - "5.30"
+  - "5.28"
+  - "5.26"
+  - "5.24"
+  - "5.22"
+  - "5.20"
+  - "5.18"
+  - "5.16"
+  - "5.14"
+  - "5.12"
+  - "5.10"
+  - "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 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-verbose
+
+after_success:
+   - prove --exec 'env PERL5OPT=-MDevel::Cover=-ignore_re,^(t/|/usr) perl' t/*.t
+   - cover -ignore_re '^(t/|/usr)' -report coveralls
+
+notifications:
+  irc: "irc.lugs.ch#kivamon"

AUTHORS

@@ -12,9 +12,6 @@ Contributions
 
   Listed alphabetically by surname.
 
-  C.J. Adams-Collier <cjcollier [at] com.gmail>
-   - Added new modular structure to the code.
-
   Nick Anderson  <nick [at] net.anders0n>
    - Better bash completion for xen-create-image.
 
@@ -31,12 +28,21 @@ Contributions
   Brian Bennett <bahamat [at] net.digitalelf>
    - Made multiple times given --ip options work
 
+  C.J. Collier <cjac [at] google.com>
+   - Added new modular structure to the code.
+
   Vagrant Cascadian <vagrant [at] org.debian>
    - Less redundant SSH key generation
 
+  Adrian C. (anrxc) <anrxc [at] org.sysphere>
+  - Hook overrides
+
   Edd Dumbill <edd [at] com.usefulinc>
    - Contributed APT sources.list file for Ubuntu's Dapper release.
 
+  Lionel FÉLICITÉ <lfelicite [at] com clever-age>
+   - Bugfix for Centos 6 installation
+
   Kevin Fullerton <kevin.fullerton [at] uk.co.shotgun-suicide>
    - Fixup for gentoos revised networking scripts.  (dhcp)
 
@@ -59,12 +65,15 @@ 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.
    - Better portability for non-bash shells.
 
+  Daniel Lintott <daniel [at] uk.co.serverb>
+   - Bugfix for Jessie and newer installations
+
   Jorge Armando Medina <jmedina [at] com.e-compugraf>
    - Fix for backward compatibility with xvc0 serial consoles
 
@@ -97,6 +106,9 @@ Contributions
    - CentOS 6 support
    - CentOS 5 fixes
 
+  Patryk Ściborek <patryk [at] com.sciborek>
+   - Ubuntu-related bugfix
+
   Radu Spineanu <radu [at] org.debian>
    - Supplied many small tweaks, bugfixes, and suggestions.
    - Radu is also one of the former Debian package maintainers.
@@ -116,5 +128,12 @@ Contributions
   Ward Vandewege <ward [at] be.pong>
    - Made several updates for Ubuntu support.
 
+  Santiago Vila <sanvila [at] es.unex>
+   - Found and fixed a bunch of typos and formatting issues.
+
+  Joan <aseques [at] com.gmail>
+   - Bugfix for password interaction
+   - maxmem option
+
   xstasi on Launchpad
    - Proper upstart handling in the chroot

BUGS.markdown

@@ -1,23 +0,0 @@
-Reporting Bugs
-==============
-
-To report a bug please use the [xen-tools-discuss* mailing
-list](http://xen-tools.org/software/xen-tools/lists.html).
-
-If you're capable of fixing it yourself a patch is appreciated, and a
-test case would be a useful bonus.
-
-
-Known Bugs
-==========
-
-The Debian bug tracker contains a [list of all currently open
-issues](http://bugs.debian.org/xen-tools) which have been reported by
-the users of the Debian package (the primary user-base).
-
-If you're running the code on a Debian host system then reporting bugs
-against this package is a good thing to do; by doing so you allow
-others to view issues, and I check the bug-page regularly.
-
--- 
-The Xen-Tools Developer Team

KNOWN_BUGS.markdown

@@ -1,34 +0,0 @@
-KNOWN BUGS in xen-tools
-=======================
-
-Bugs to fix before next release
--------------------------------
-
-[None so far]
-
-Bugs to fix rather soon
------------------------
-
-* `xen-delete-image` doesn't remove all logical volumes if `--partitions` is used.
-
-   See the link below for details how to reproduce. Reproducable at
-   least with `--lvm`. Thanks to Antoine Benkemoun for reporting.
-
-   [Bug Report](http://xen-tools.org/pipermail/xen-tools-discuss/2010-May/000757.html)
-
-* partitions were mounted in config file order, not in mountpoint order.
-  That implies that if you specified :
-
-    /boot
-    /
-
-  in that order, `/` was mounted _over_ `/boot`, and you would not
-  _see_ `/boot`.  Xen-Tools would then install `boot` on your `/`
-  partition, and your boot device was just empty and unbootable.
-
-  Workaround for 4.2 is to write your partition file such as mounts overlap
-  correctly when mounted in specified order.
-
-  Current (unreleased) fix is to sort by mountpoint length.
-
-  Fix would be to reproduce what mount does with mount `-a`.

LICENSE

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

Makefile

@@ -6,15 +6,15 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 #
 
 #
 #  Only used to build distribution tarballs.
 #
-TMP        ?= /tmp
-DIST_PREFIX = ${TMP}
-VERSION     = 4.4
+TMPDIR     ?= /tmp
+DIST_PREFIX = ${TMPDIR}
+VERSION     = 4.10.0
 DEBVERSION  = $(shell echo $(VERSION)|sed 's/\(rc\|pre\|beta\|alpha\)/~\1/')
 BASE        = xen-tools
 VCS         = git
@@ -34,7 +34,9 @@ nop:
 	@echo " diff          = See local changes."
 	@echo " install       = Install the software"
 	@echo " manpages      = Make manpages beneath man/"
-	@echo " release       = Make a release tarball"
+	@echo " tarball       = Make a release tarball"
+	@echo " orig-tar-gz   = Make a tarball suitably named for Debian"
+	@echo " release       = Make a release tarball and sign it"
 	@echo " uninstall     = Remove the software"
 	@echo " update        = Update from the source repository."
 	@echo " "
@@ -67,6 +69,7 @@ clean:
 	@if [ -e build-stamp ]; then rm -f build-stamp ; fi
 	@if [ -e configure-stamp ]; then rm -f configure-stamp ; fi
 	@if [ -d debian/xen-tools ]; then rm -rf ./debian/xen-tools; fi
+	@if [ -d cover_db ]; then rm -rf ./cover_db; fi
 	@if [ -e $(BASE)-$(VERSION).tar.gz ]; then rm $(BASE)-$(VERSION).tar.gz ; fi
 	@if [ -e $(BASE)-$(VERSION).tar.gz.asc ]; then rm $(BASE)-$(VERSION).tar.gz.asc ; fi
 	cd t; $(MAKE) clean
@@ -92,7 +95,7 @@ diff:
 fixup-perms:
 	for i in hooks/*/*-*; do chmod 755 $$i; done
 	chmod 755 hooks/common.sh
-	chmod 644 etc/xen-tools.conf
+	chmod 644 etc/*.conf
 	chmod 644 etc/xm.tmpl
 	chmod 644 etc/xm-nfs.tmpl
 	chmod 644 misc/*
@@ -106,12 +109,12 @@ install-etc:
 	-mkdir -p ${prefix}/etc/xen-tools/skel/
 	-mkdir -p ${prefix}/etc/xen-tools/role.d/
 	-mkdir -p ${prefix}/etc/xen-tools/partitions.d/
-	cp etc/xen-tools.conf ${prefix}/etc/xen-tools/
+	cp etc/*.conf         ${prefix}/etc/xen-tools/
 	cp etc/xm.tmpl        ${prefix}/etc/xen-tools/
 	cp etc/xm-nfs.tmpl    ${prefix}/etc/xen-tools/
 	cp partitions/*-*     ${prefix}/etc/xen-tools/partitions.d/
-	-mkdir -p                         ${prefix}/etc/bash_completion.d/
-	cp misc/xen-tools.bash-completion ${prefix}/etc/bash_completion.d/xen-tools
+	-mkdir -p                         ${prefix}/usr/share/bash-completion/completions/
+	cp misc/xen-tools.bash-completion ${prefix}/usr/share/bash-completion/completions/xen-tools
 	-mkdir -p                         ${prefix}/etc/initramfs-tools/conf.d/
 	cp misc/xen-tools.initramfs-tools ${prefix}/etc/initramfs-tools/conf.d/xen-tools
 
@@ -129,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
@@ -177,9 +181,18 @@ install-hooks:
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d squeeze.d
 	-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 forky.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
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d stable.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d oldstable.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d oldoldstable.d
 	mkdir -p ${prefix}/usr/share/xen-tools/gentoo.d/
 	cp -R hooks/gentoo/*-* ${prefix}/usr/share/xen-tools/gentoo.d
 	mkdir -p ${prefix}/usr/share/xen-tools/dapper.d/
@@ -203,6 +216,27 @@ install-hooks:
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d raring.d
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d saucy.d
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d trusty.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d utopic.d
+	-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 impish.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s artful.d jammy.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s artful.d kinetic.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s artful.d lunar.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s artful.d mantic.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
 
@@ -240,39 +274,42 @@ manpages:
 #
 #  Make a new release tarball, and make a GPG signature.
 #
-release: tidy fixup-perms update-version update-modules clean changelog
+release: orig-tar-gz
+	gpg --armour --detach-sign ../$(BASE)-$(VERSION).tar.gz
+	cp -p ../$(BASE)-$(VERSION).tar.gz.asc ../$(BASE)_$(DEBVERSION).orig.tar.gz.asc
+	git tag -s -m "Release as $(VERSION)" "release-$(VERSION)"
+
+tarball: test tidy fixup-perms update-version update-modules clean changelog
 	rm -rf $(DIST_PREFIX)/$(BASE)-$(VERSION)
 	rm -f $(DIST_PREFIX)/$(BASE)-$(VERSION).tar.gz
 	cp -R . $(DIST_PREFIX)/$(BASE)-$(VERSION)
 	rm -rf $(DIST_PREFIX)/$(BASE)-$(VERSION)/debian
+	rm -rf $(DIST_PREFIX)/$(BASE)-$(VERSION)/cover_db
 	rm -rf $(DIST_PREFIX)/$(BASE)-$(VERSION)/.git*
 	cd $(DIST_PREFIX) && tar -cvf $(DIST_PREFIX)/$(BASE)-$(VERSION).tar $(BASE)-$(VERSION)/
-	gzip $(DIST_PREFIX)/$(BASE)-$(VERSION).tar
+	gzip -9nv $(DIST_PREFIX)/$(BASE)-$(VERSION).tar
 	mv $(DIST_PREFIX)/$(BASE)-$(VERSION).tar.gz ..
 	rm -rf $(DIST_PREFIX)/$(BASE)-$(VERSION)
-	gpg --armour --detach-sign ../$(BASE)-$(VERSION).tar.gz
 
 #
 #  Make a new orig.tar.gz for the Debian package
 #
-orig-tar-gz: release
+orig-tar-gz: tarball
 	cp -p ../$(BASE)-$(VERSION).tar.gz ../$(BASE)_$(DEBVERSION).orig.tar.gz
-	cp -p ../$(BASE)-$(VERSION).tar.gz.asc ../$(BASE)_$(DEBVERSION).orig.tar.gz.asc
 
 
 #
 #  Run the test suite.
 #
-test: update-modules
-	prove --shuffle t/
+test-verbose : VERBOSE = -v
+test-verbose: test
+test: non-author-test author-test
 
+non-author-test: update-modules
+	prove $(VERBOSE) --shuffle t/
 
-#
-#  Run the test suite verbosely.
-#
-test-verbose:
-	prove --shuffle --verbose t/
-
+author-test:
+	prove $(VERBOSE) xt/
 
 
 #
@@ -280,9 +317,9 @@ test-verbose:
 #
 tidy:
 	if [ -x /usr/bin/perltidy ]; then \
-	for i in bin/*-*[^~]; do \
+	for i in $(ls -1 bin/*-* | grep -vE '~$'); do \
 		echo "tidying $$i"; \
-		perltidy  $$i \
+		perltidy $$i \
 	; done \
 	; fi
 
@@ -300,6 +337,8 @@ uninstall:
 	rm -f ${prefix}/usr/bin/xen-create-nfs
 	rm -f ${prefix}/usr/bin/xt-guess-suite-and-mirror
 	rm -f ${prefix}/etc/xen-tools/xen-tools.conf
+	rm -f ${prefix}/etc/xen-tools/distributions.conf
+	rm -f ${prefix}/etc/xen-tools/mirrors.conf
 	rm -f ${prefix}/etc/xen-tools/xm.tmpl
 	-rm -rf ${prefix}/etc/xen-tools/skel
 	-rmdir ${prefix}/etc/xen-tools/

NEWS.markdown

@@ -1,3 +1,512 @@
+xen-tools 4.10.0 (TODO: UNRELEASED)
+===================================
+
+New Features
+------------
+
+* Add support for specifying guest type. (GH #64; PR by Arno Bakker
+  @arno481)
+
+Distribution Releases Changes
+-----------------------------
+
+* Preliminary support for
+  + Ubuntu 23.10 Mantic Minotaur
+* Declare the following releases as EoL:
+  + Ubuntu 22.10 Kinetic Kudu
+* Debian Trixie is now Testing → remove dont-test flag
+
+Other Changes
+-------------
+
+* Switch to pure Semantic Versioning including trailing zeros.
+* Sync examples for "fs" and "fs" defaults in xen-create-image with
+  (effective) values in xen-tools.conf: ext3 → ext4
+
+
+xen-tools 4.9.2 (released 06 Feb 2023)
+======================================
+
+Distribution Releases Changes
+-----------------------------
+
+* Support for
+  + Ubuntu 21.10 Impish Indri (EoL)
+  + Ubuntu 22.04 Jammy Jellyfish (LTS)
+  + Ubuntu 22.10 Kinetic Kudu
+* Preliminary support for
+  + Debian 14 Forky
+  + Ubuntu 23.04 Lunar Lobster
+* Declare the following releases as EoL:
+  + Ubuntu 12.04 Precise Pangolin (LTS)
+  + Ubuntu 20.10 Groovy Gorilla
+  + Ubuntu 21.04 Hirsute Hippo
+* xt-guess-suite-and-mirror:
+  + Bump default Ubuntu fallback release to 22.04 Jammy LTS.
+  + Add support for Ubuntu Ports APT repos (i.e. Xen on ARM64).
+
+Documentation
+-------------
+
+* Place hints on "vsyscall=emulate" on more visible places.
+
+Other Changes
+-------------
+
+* Fix bashism in release testing target "tidy".
+
+
+xen-tools 4.9.1 (released 24 Oct 2021)
+======================================
+
+Bug Fixes
+---------
+
+* Fix missing `|` in regex in `hooks/debian/20-setup-apt`. (Closes
+  Debian bug report #997668)
+
+Other Changes
+-------------
+
+* Make test `xt/gitignore.t` work with git releases ≥ 2.32.0.
+* Travis CI: stop testing again Perl `dev`. It seems to no more exist.
+* Also create an `.orig.tar.xz` signature upon `make release`.
+
+
+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)
+======================================
+
+Bug Fixes
+---------
+
+* Make t/hooks-inittab.t using its own copy of the generic
+  /etc/inittab for testing instead of using the system one's. (GH#36,
+  should fix autopkgtest on systems with modified /etc/inittab)
+* Fix unescaped braces (deprecated since Perl 5.22) in
+  t/plugin-checks.t.
+
+Other changes
+-------------
+
+* Support for using pygrub from /usr/local/bin/pygrub.
+* Typo fixes.
+
+
+xen-tools 4.6.1 (released 24 Oct 2015)
+======================================
+
+Distribution Releases Changes
+-----------------------------
+
+* Preliminary support for Ubuntu 16.04 LTS Xenial Xerus.
+
+Bug Fixes
+---------
+
+* Fix Perl warning in t/hook-inittab.t if /etc/inittab isn't present.
+
+Other Changes
+-------------
+
+* Declare GitHub as primary hosting.
+* Integrate BUGS.markdown into README.markdown, move remaining
+  contents of KNOWN_BUGS.markdown to the GitHub issue tracker.
+* Minor README improvements.
+* Neither use $#array in boolean context nor @array = undef anymore.
+
+
+xen-tools 4.6 (released 20 Jul 2015)
+====================================
+
+New Features and Major Changes
+------------------------------
+
+* Drop all occurrences of apt's `--force-yes` parameter. It only
+  forces the installation of untrusted packages and that's
+  unwanted. (Closes Debian bug report #776487)
+* Support passing commandline options with `--debootstrap-cmd`.
+* Use MD5 as default hash method again, to be able to properly set
+  passwords in older releases. Does not affect passwords changed later
+  inside the DomU.
+* Split off hardcoded release code names list and default mirrors in
+  `xen-create-image` into separate configuration file which is parsed
+  before the default settings or command-line options are set.
+* Report all SSH fingerprints of the created DomU, not only RSA ones.
+* Support VLANs with Open vSwitch (GH-2). Thanks to Félix Barbeira for
+  the patch.
+
+
+New Options
+-----------
+
+* `--keyring` (xen-create-image, xt-install-image)
+* `--vlan`  (xen-create-image)
+
+Distribution Releases Changes
+-----------------------------
+
+* Debian 9 Stretch (preliminary support)
+* 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.
+
+Improvements
+------------
+
+* Make test suite support as-installed-testing.
+* Multiple release workflow improvements (target `release` in
+  `Makefile`).
+* Supports `unstable`, `oldstable` and `oldoldstable` as distribution
+  names, too. (`oldoldstable` is not yet supported by debootstrap, see
+  Debian feature request #792734 in debootstrap.)
+
+Bug Fixes
+---------
+
+* Fix usage of nonexistent variable in `removeDebianPackage` (Closes
+  Debian bug report #774936) Thanks Lukas Schwaighofer!
+* Allows `#` within configuration file comments. (Closes Debian bug
+  report #783060; thanks Jean-Michel Nirgal Vourgère for the bug
+  report and patch!)
+* Use `-o APT::Install-Recommends=false` instead of
+  `--no-install-recommends` for backwards compatibility with older APT
+  versions which don't know either (but accept any `Foo=Bar` parameter
+  to `-o`). Allows one to install earlier Debian releases (e.g. Etch)
+  with the default configuration again.
+* Pass `--yes` to `lvcreate` only if LVM version is 2.02.99 or
+  higher. Fixes regression introduced with 4.5 by the fix for Debian
+  bug report #754517.
+
+Other Changes
+-------------
+
+* Change all occurrences of `http.debian.net` to
+  `httpredir.debian.org`.
+* Installs bash completion into `/usr/share/bash-completion/` (fixes
+  lintian warning `package-install-into-obsolete-dir`)
+* Testsuite: Optimize and clean up modules.sh.
+* Split up test suite in functionality/compatibility tests (`t`) and
+  author/release tests (`xt`).
+* New example script helpful for release testing.
+
+
+xen-tools 4.5 (released 25 Oct 2014)
+====================================
+
+New Features and Major Changes
+------------------------------
+
+* Apply patch by Adrian C. (anrxc) to allow to override hooks in
+  `/usr/share/xen-tools/*.d/` with hooks in `/etc/xen-tools/hooks.d/`.
+
+Distribution Releases Changes
+-----------------------------
+
+* Ubuntu 14.10 Utopic Unicorn.
+* Ubuntu 15.04 Vivid Vervet (preliminary support)
+* Mark Ubuntu 13.10 Saucy Salamander as EoL
+
+Improvements
+------------
+
+* Use `686-pae` kernels instead of `686` kernels on Debian Wheezy and
+  later. Thanks to Daniel Lintott! (Closes Debian bug report #742778)
+* Pass `-y` option ("assume yes") to `yum` (Closes Debian bug report
+  #735675) Thanks Lionel FÉLICITÉ!
+
+Bug Fixes
+---------
+
+* Fix always empty gateway on Debian DomUs (Thanks Joan! LP: #1328794)
+* Fix `lvcreate` awaiting user input when creating swap LV (Closes
+  Debian bug report #754517) Thanks Eric Engstrom!
+* Fix missing quoting in shell function `assert` in `hooks/common.sh`.
+* Fix initial configuration summary in cases where `pygrub` is used.
+* Fix corner cases where not the latest kernel would have been
+  checked.
+* `--password` overrides `--genpass`. (Closes Debian bug report
+  #764143) Based on patch by Santiago Vila.
+* Fix unaligned maxmem output of xen-create-image. (Closes Debian bug
+  report #764126; Patch by Santiago Vila)
+* Fix copy & paste errors in comments in typos in `roles/puppet`
+  (Closes Debian bug report #764134; Patch by Santiago Vila)
+* Fix typos in POD of `xen-create-image` (Closes Debian bug report
+  #764153; Patch by Santiago Vila)
+
+Other Changes
+-------------
+
+* Drop all xend related sanity checks, they cause more havoc nowadays
+  than they help. Thanks Ian Campbell! (Closes Debian bug report
+  #732456)
+* pygrub detection: Prefer `/usr/lib/xen-default` over `/usr/lib/xen-x.y`.
+* Add password length sanity check with fallback to default length.
+* Raise default password length from 8 to 23.
+* Flush output after each line in `runCommand()`.
+* `Makefile`: Clean up coverage data in multiple targets.
+
+
+xen-tools 4.4 (released 11 Dec 2013)
+====================================
+
+Listing includes changes of according beta releases.
+
+New Features and Major Changes
+------------------------------
+
+* Preliminary support for `xl` toolstack
+* Ships `/etc/initramfs-tools/conf.d/xen-tools` for generating Dom0
+  initrds also suitable for DomU usage. Trigger `update-initramfs`.
+* Installs a legacy `grub` in all `pygrub` based Debian/Ubuntu DomUs
+  to be able to update the `menu.list` automatically.
+* `hooks/common.sh`: `installDebianPackage` no more installs
+  recommends, use `installDebianPackageAndRecommends` for that from
+  now on.
+* `hooks/common.sh`: Rename `installCentOS4Package` to
+  `installRPMPackage`.  Add `installCentOS4Package` wrapper for
+  backward compatibility.
+* Better documents and checks requirements for the `--apt_proxy`
+  value. (See #623443 for the corresponding apt issue.) Requires now
+  `Data::Validate::URI`.
+* Uses now `Data::Validate::Domain` and `Data::Validate::IP` for IP
+  addresses and hostname checks.
+
+Newly Supported Distribution Releases
+-------------------------------------
+
+* Debian 8 Jessie
+* Ubuntu 13.04 Raring
+* Ubuntu 13.10 Saucy (preliminary support; debootstrap doesn't have
+  support for Saucy at the time of writing)
+
+Improvements
+------------
+
+* Also recognize "M" and "G" instead of "MB" and "GB" as size unit for
+  `--memory`. Also document the recognized units. (Closes Debian bug
+  report #691320)
+* `xen-list-images` now also outputs the file name of the config file.
+* `xen-list-images` and `xen-delete-image` now understand `--extension`.
+* Makefile accepts `DESTDIR=…`
+* Move examples from debian/examples to examples.
+* Adds default mount options for ext4, identical to ext2/ext3.
+* By default install `linux-image-virtual` instead of
+  `linux-image-server` on Ubuntu Intrepid and newer (Hopefully closes:
+  #640099, LP #839492)
+* Makes some options (like `--pygrub`) negatable.
+* Rework "minimal" role to be less based on personal preferences:
+  * No more installs sudo, vim, syslog-ng, etc.
+  * Fixes usage together with pygrub.
+
+Bug Fixes
+---------
+
+* Fix symbolic link hooks/centos-6/15-setup-arch (Closes Debian bug
+  report #690299)
+* Execute END block not on --version/--help/--manual (Closes Debian
+  bug #684346)
+* Move code for `--boot` feature to `END` block. Fixes missing SSH
+  fingerprint display if `--boot` was used. (Closes Debian bug report
+  #679183)
+* Correctly handle aborts in `END` block. (Closes Debian bug report
+  #704882)
+* Fixes `--extension=` with empty parameter.
+* Sarge amd64 case handle properly
+* `xt-install-image`: Don't bail out if only `cdebootstrap` is
+  installed but not `debootstrap` (Thanks Elmar Heeb!)
+* Fix filesystem tools installation in `91-install-fs-tools` (which
+  was broken since 4.3~rc1-1) by merging `91-install-fs-tools back`
+  into `90-make-fstab`. (Closes Debian bug report #715340) Also
+  supports RPM-based distributions now.
+* Fixes creation of `ARRAY(0x#).log` named log files.
+
+Other Changes
+-------------
+
+* Code deduplication to unify the `xen-*-image` scripts
+* Moves `/usr/lib/xen-tools/` to `/usr/share/xen-tools/`
+* Use `http.debian.net` as default Debian mirror if no mirror is given
+  and `xt-guess-suite-and-mirror` is not used.
+* Default DomUs to use the noop scheduler (Closes Debian bug report
+  #693131)
+* Fixes export of environment variables. Previously they could contain
+  dashes and then were only accessible from within Perl, but not from
+  within Bash.
+* Uses `Test::NoTabs` instead of its own test for that.
+* Removes unused Perl modules `Xen::Tools` and `Xen::Tools::Log` from
+  source code. Also removes the according tests from the test
+  suite. No more needs `Moose`.
+
+
 xen-tools 4.3.1 (released 30-Jun-2012)
 ======================================
 
@@ -7,6 +516,28 @@ Bugfix Release only
 xen-tools 4.3 (released 26-Jun-2012)
 ====================================
 
+Listing includes changes of according beta releases.
+
+New Features and Major Changes
+------------------------------
+
+* Massive code deduplication in hooks directory
+
+New Options
+-----------
+
+* `--dontformat` (xen-create-image)
+* `--finalrole`  (xen-create-image)
+* `--apt_proxy`  (xen-create-image)
+
+Newly Supported Distribution Releases
+-------------------------------------
+
+* Ubuntu 11.10 Oneiric
+* Ubuntu 12.04 Precise
+* Ubuntu 12.10 Quantal
+* CentOS 6
+
 Bug Fixes
 ---------
 
@@ -19,30 +550,6 @@ Other Changes
 * Remove most Mercurial traces
 
 
-xen-tools 4.3rc1 (released 08 Jun 2012)
-=======================================
-
-New Features and Major Changes
-------------------------------
-
-* Massive code deduplication in hooks directory
-
-New Options
------------
-
-    --dontformat (xen-create-image)
-    --finalrole  (xen-create-image)
-    --apt_proxy  (xen-create-image)
-
-Newly Supported Distribution Releases
--------------------------------------
-
-* Ubuntu 11.10 Oneiric
-* Ubuntu 12.04 Precise
-* Ubuntu 12.10 Quantal
-* CentOS 6
-
-
 xen-tools 4.2.1 (released 17 Mar 2011)
 ======================================
 
@@ -65,11 +572,11 @@ New Options
 New Features and Major Changes
 ------------------------------
 
-* Uses hvc0 and xvda devices by default
-* Also supports cdebootstrap
+* Uses `hvc0` and `xvda` devices by default
+* 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
+* New helper program `xt-guess-suite-and-mirror`, used to find the
   default mirror and suite.

README.markdown

@@ -1,11 +1,15 @@
 xen-tools
 =========
 
-* [Homepage](http://www.xen-tools.org/software/xen-tools)
-* Git Repository:
-  * [at Gitorious](http://gitorious.org/xen-tools)
-  * [at GitHub](http://github.com/xtaran/xen-tools)
-* [Mailing Lists](http://www.xen-tools.org/software/xen-tools/lists.html)
+[![Travis CI Build Status](https://api.travis-ci.org/xen-tools/xen-tools.svg)](https://travis-ci.org/xen-tools/xen-tools)
+
+* [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
 -----
@@ -14,11 +18,11 @@ xen-tools contains a collection of Perl scripts for working with Xen
 guest images under Linux.
 
 Using this software, you can easily create new
-[Xen](http://www.xen.org) guests configured to be accessible over the
+[Xen](http://www.xen.org/) guests configured to be accessible over the
 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.
@@ -28,37 +32,76 @@ known to work reliably, i.e.:
 
 ### Debian
 
-* Sarge 3.1 (i386 and DomU only)
-* Etch 4.0 (Dom0 no more tested)
-* Lenny 5.0
-* Squeeze 6.0
-* Wheezy 7
-* Jessie 8 (under development)
+* 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
+* Buster 10
+* Bullseye 11
+* Bookworm 12 (under development)
+* Trixie 13 (knows about this future release name)
+* Forky 14 (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 (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 (see [Installing Ubuntu 8.04 as DomU][2])
-* Interpid Ibex 8.10
-* Jaunty Jackaplope 9.04
-* Karmic Koala 9.10
-* Lucid Lynx 10.04
-* Maverick Meerkat 10.10
-* Natty Narwhal 11.04
-* Oneiric Ocelot 11.10
-* Precise Pangolin 12.04
+* 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
-* Trusty Tahr 14.04 (LTS, under development)
+* Trusty Tahr 14.04 (LTS)
+* Utopic Unicorn 14.10
+* Vivid Vervet 15.04
+* Wily Werewolf 15.10
+* 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 running
+on the Dom0 unless they have been booted with `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
@@ -84,40 +127,56 @@ 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
 ------------
 
-As root or with sudo, execute `make instal`.
+As root or with sudo, execute `make install`.
 
 See `debian/README.source` how to build the Debian package from a
 checked out copy of the git repository (i.e. without a source tar
@@ -187,6 +246,58 @@ image.
 * The script should only be used for Xen instances of Debian or a
   Debian-derived distribution.
 
+Version Numbering Scheme
+------------------------
 
--- 
+Since release 4.4, the version numbering scheme of xen-tools tries to
+comply with the [Semantic Versioning](http://semver.org/)
+specification, with the only exception that in releases before 4.10
+trailing zeroes were omitted.
+
+Between the releases 3.9 and 4.4, the version numbering scheme
+followed roughly the same ideas, but less strict.
+
+Test Suite Coverage
+-------------------
+
+[![Coverage Status](https://coveralls.io/repos/xen-tools/xen-tools/badge.svg?branch=master)](https://coveralls.io/r/xen-tools/xen-tools?branch=master)
+
+Despite parts of the test suite are quite old, it only tests a small
+fraction of what xen-tools can do. Some of the scripts currently could
+only be tested on an actual Xen Dom0. Hence the
+[code coverage of xen-tools' test suite is quite bad](https://coveralls.io/r/xen-tools/xen-tools).
+
+Bugs
+----
+
+### Reporting Bugs
+
+If you're using the current packages included as part of the Debian
+GNU/Linux distribution or a derivative, please first report any bugs
+using the distribution's way to report bugs.
+
+In case of Debian this would be using e.g. `reportbug xen-tools`.
+
+If you're using the xen-tools built from source tar ball, please
+[report bugs via GitHub's issue tracker](https://github.com/xen-tools/xen-tools/issues/new),
+or, if you don't want to create a GitHub account or are not sure if
+it's really a bug, feel free to just write an e-mail to the
+[xen-tools dicsussion mailing list](mailto:xen-tools-discuss@xen-tools.org).
+
+If you're capable of fixing it yourself a patch is appreciated, and a
+test case would be a useful bonus.
+
+### Known/Open Issues
+
+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

SUPPORT.markdown

@@ -3,11 +3,11 @@ Mailing List
 
 For assistance on using, or customising, these scripts please consult
 the manpages initially, then the
-[website](http://xen-tools.org/software/xen-tools/).
+[website](https://xen-tools.org/software/xen-tools/).
 
 If these are not sufficient resources please consider posting any
 queries you might have to the [mailing
-list](http://xen-tools.org/software/xen-tools/lists.html)
+list](https://xen-tools.org/software/xen-tools/lists.html)
 
 Included with the release you should find the file `BUGS.markdown`
 which contains some notes on reporting bugs.
@@ -18,13 +18,13 @@ Xen Queries
 
 If your query is mostly related to Xen, rather than these tools, then
 please consider joining the [xen-users mailing
-list](http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-users)
+list](https://lists.xenproject.org/cgi-bin/mailman/listinfo/xen-users)
 
 The members of that list are very good at diagnosing issues with
 networking, block devices, and other Xen oddities.
 
 There's also the IRC channel `##xen` (the double hashmark is not a
- typo) on the [Freenode](http://freenode.net/) IRC network.
+ typo) on the [Freenode](https://freenode.net/) IRC network.
 
 
 Contact The Author
@@ -34,7 +34,7 @@ As a last resort you can to contact the current maintainer, Axel
 Beckert, at <abe@deuxchevaux.org>.
 
 As the previous xen-tools maintainer and original author, Steve
-Kemp, said, I say last resort not because I'm unwilling to help, but
+Kemp, said, I say "last resort" not because I'm unwilling to help, but
 because it may take longer for me to respond to you personally.
 
 -- 

TODO.markdown

@@ -1,23 +1,13 @@
 TODO
 ====
 
-See KNOWN_BUGS.markdown for real bugs.
+Most things which used to be in here were moved to
+[xen-tools' issue tracker at GitHub](https://github.com/xen-tools/xen-tools/issues).
 
 Bugs to fix and features to add for 5.0
 ---------------------------------------
 
-* Switch build-system to autotools or something CPANish.
-
-* `xen-create-image` man page overhaul:
-
-  * ambiguous option list with regards to parameters
-  * Set Fail in more situations where the script has clearly failed
-    i.e.: lvm exists
-
-* Roles overhaul
-
-  * Remove udev role. No more makes sense. udev gets pulled in by
-    kernels where necessary.
+* Fix xdm and gdm roles wrt. to uptodate package names.
 
 * Test and support more file system types.
 
@@ -29,57 +19,6 @@ Bugs to fix and features to add for 5.0
   Currently no locales are set and this causes several domU errors
   which appear in the domU's logs.
 
-* Documentation overhaul
-
-  Better explain what roles /should be/ used for, and that roles
-  are examples, and shouldn't cover every single scenario. They
-  are also easy to write.
-
-* Think again about disk_device checks :
-
-  Newer Xen provides `xvda`, older provided `sda`. The current check for
-  valid values of `disk_device` (used for root device in DomU `/etc/fstab`)
-  does only allow those values.
-
-  This forbids any deployment of LVM/RAID _inside_ DomU, which cannot
-  be created by xen-tools anyway. So the current check is fine with the
-  current possibilities of xen-tools, but could become a limitation.
-  * Is it possible/wanted to "query" xend for default device names?
-  * Is it possible to create `/dev/mapper` devices with xend conf?
-  * Can we just avoid to ask for this value and not specify the device
-    in `/etc/fstab` (and use `/dev/root`, `/dev/by-uuid`, or anything?)
-
-* `xen-create-image --dist=…` / sources.list generation should be more fine-grained
-
-  xen-tools should offer the possibility to enable/disable
-  security/volatile/backports as well as
-  contrib/non-free/universe/restricted/multiverse for each of them not
-  only based on defaults plus the Dom0's sources.list
-
-  One idea is to allow parameters like
-
-    --dist="lenny:main,contrib,non-free;security;volatile:main"
-
-  and maybe (if the default will be to include security) to also
-  allow
-
-    --dist="lenny;no-security"
-
-  The second idea (by Mathieu Parent) is to have an
-  `/etc/xen-tools/sources.list.d/` which then contains files like
-  `lenny.list`, `lenny-server.list`, `karmic.list`, etc. which
-  defaults to `$dist.list`, but can be also select with
-  `--sources-list=lenny-server` (which looks for
-  `./lenny-server.list`, `./lenny-server`,
-  `/etc/xen-tools/sources.list.d/lenny-server.list` and
-  `/etc/xen-tools/sources.list.d/lenny-server` in that order).
-
-  Third variant is to use `/etc/xen-tools/sources.lists/` instead of
-  `/etc/xen-tools/sources.list.d/` because that directory is no
-  runparts-like directory.
-
-* LVM snapshot support as an install source.
-
 * Generic grub support
 
   This will generate a much nicer `menu.lst` as a side effect, as its
@@ -88,50 +27,6 @@ Bugs to fix and features to add for 5.0
   new kernel is installed and will also use the domU distro's `menu.lst`
   conform.
 
-* pv-grub support
-
-  This is a ways away and will probably start with a `xen-pv-grub`
-  package.
-
-* Move the hooks directory to `/etc/xen-tools/` to officially allow
-  added and modified hooks.
-
-* Clean up the hooks directory
-
-  We still have a link farm for hooks and a meta link farm for distro
-  releases created on `make install`. It probably would be better if
-  we would just have one directory per distro (like with debian) but
-  without the need to created symlinks on `make install`.
-
-  Currently CentOS's `25-setup-kernel` creates an fstab and
-  `90-make-fstab` does again. It works, but that cries for debugging
-  hell.
-
-  `centos-5/25-setup-kernel` and `centos-6/25-setup-kernel` still
-  differ and I'm not sure if that's necessary respectively what's the
-  common denominator.
-
-  `80-install-kernel` is not yet merged into one hook script.
-
-  Common oneliners for code deduplication in the hooks/ directory:
-
-    $ find -L . -not -xtype l -not -type d -not -path '*/common/*' | sort -t / -k3
-    $ fdupes -r1 . | sort -t / -k3
-    $ find . -type f | sim_text -ipTt 50 | tac | column -t
-
-* Create users, add ssh pubkeys to `.ssh/authorized_keys`
-
-  Still have to think of a good way of doing this. It would be nice
-  To specify a directory of public keys, parsing the hostnames
-  parsing the usernames from the ssh comment line.
-
-  Potential ideas are to add options to add a given file as
-  `authorized_keys` (e.g. a users public key) or to just add the Dom0's
-  `/root/.ssh/authorized_keys` as the DomU's one.
-
-* Generate ECDSA host keys where possible. (Likely depends on the
-  to-be-installed SSH version.)
-
 * More generic roles
 
   Deploy a web server or setup ssmtp directly via flag when setting up
@@ -145,45 +40,14 @@ Bugs to fix and features to add for 5.0
   "type" of configuration you want, and a set of options specific to
   that flag could be parsed from xen-tools.conf
 
-* Refactor the code for less variants of calling `cp`, `rm`, `mv`, etc.
-
-  E.g. always use either `cp()` from `File::Copy` or `/bin/cp`, but
-  not both. To allow verbose copying, I (Axel) would prefer `/bin/cp`
-  over `cp();`.
-
 * Parse numerical parameters transparently for the user
 
   The user shouldn't have to know whether he should specify size as
   `<size>G` or `<size>Gb` or `<size>`. This should be parsed without
   user interaction and rely on a common format.
 
-* `xen-update-image` should mount `/dev/pts` before running apt-get
-
-* `xen-update-image` should have options for using …
-
-   * aptitude instead of apt-get
-   * dist-upgrade instead of upgrade
-
-* Support `cpu_weight` and other features from
-  http://wiki.xensource.com/xenwiki/CreditScheduler
-
 * Make used Xen toolstack configurable, i.e. via --xen-toolstack=xl
 
-* Unify --debug and --dumpconfig. Likely make --debug exit
-  gracefully. Document --debug if --dumpconfig is removed.
-
-* Use `Perl::Critic`
-
-* Refactor the different Ubuntu hooks directories so that only one
-  ubuntu hooks directory is left.
-
-  Then also refactor TLS disabling so that it works on all
-  distributions the same. Currently Debian is a special case and
-  Ubuntu half a special case.
-
-* Remove from the (unused) Xen::Tools what's already in the used
-  Xen::Tools::Common.
-
 * Add test for `--size` constraints (upper- and lowercase letters,
   with and without `B`, etc.)
 
@@ -191,9 +55,15 @@ Bugs to fix and features to add for 5.0
     `xen-create-image` first. Which probably both would be a good
     idea.
 
-* Replace several occurences of backticks with runCommand. (Mostly
-  mount commands in `xen-update-image`. The calls to uname or
-  lsb_release should be fine.)
+* 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
 --------------------------------------------
@@ -201,52 +71,3 @@ Stuff from Steve's TODO list / Generic TODOs
 * Write more test cases.
 
 * `xen-delete-image` should unallocate any used IP addresses.
-
-* `installGentooPackage` in `hooks/common.sh` is a stub and does
-  nothing yet.
-
-Axel's Break-Backwards-Compatibility Wishlist
----------------------------------------------
-
-* Make empty extension the default
-
-  This would ease tab completion and CLI parameter reusage with "xm
-  create" and friends.
-
-* Check if we can reduce `MAKEDEV` invocations in
-  `hooks/common/55-create-dev`
-
-  `MAKEDEV std` is called in any case. First comment says "Early
-  termination if we have a couple of common devices present should
-  speed up installs which use `--copy`/`--tar`" and then "We still
-  need to make sure the basic devices are present" and calls `MAKEDEV`
-  more often than otherwise.
-
-  Additionally the `55-create-dev` for CentOS/Fedora just created
-  `console`, `zero` and `null`. `zero` and `null` are part of `MAKEDEV
-  std`, perhaps can we reduce it to that. `console` is part of
-  `MAKEDEV generic`.
-
-  Additionally the devices `hda`, `sda` and `tty1` may not necessary
-  in any case, but instead `hvc0` should be created for sure in many
-  cases. Nothing cares about `$serial_device` there either.
-
-  Current `MAKEDEV` implementation support more than one device as
-  parameter. That could reduce the `MAKEDEV` calls from currently six
-  to two.
-
-* Uncouple generating auto start symlinks from `--boot`.
-
-  Maybe add some `--autostart` or such.
-
-* MAC addresses should no more depend on the distribution.
-
-* Let the admin switch between MAC addresses based on XenSource's OUI,
-  its organisation's own OUI or locally administrated MAC addresses.
-  See also http://wiki.xen.org/wiki/Xen_Networking#MAC_addresses
-
-* More radical Code Deduplication
-
-  `bin/x*` currently still contain similar code like e.g. in the
-  function parseCommandLineArguments. This should be cleaned up, too,
-  but may need a bigger redesign.

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.4';
+my $RELEASE = '4.10.0';
 
 
 # store version number away.
@@ -282,7 +282,7 @@ sub testArguments
     die "Missing NFS root."   unless ( $CONFIG{ 'nfs_root' } );
 
 
-    # Shorthack to fix http://bugs.debian.org/648814 -- xen-create-nfs
+    # Shorthack to fix https://bugs.debian.org/648814 -- xen-create-nfs
     # should better use xt-create-xen-config instead. Guess from where
     # this code is borrowed for now...
 

bin/xen-delete-image

@@ -24,13 +24,13 @@ 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.
 
   Testing options:
    --test      Don't complain if we're not invoked by root.
-   --no-xen-ok Don't complain if xen seems not installed or xend is not running
 
 
 =head1 OPTIONS
@@ -52,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.
 
@@ -127,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
 
 
@@ -164,7 +167,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.4';
+my $RELEASE = '4.10.0';
 
 
 #
@@ -205,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;
 }
@@ -233,7 +236,7 @@ foreach my $name (@ARGV, @hosts)
 {
     my %PER_HOST_CONFIG = %CONFIG;
     $PER_HOST_CONFIG{ 'hostname' } = $name;
-    if ( $CONFIG{ 'no_xen_ok' } or !xenRunning($name, \%PER_HOST_CONFIG) )
+    unless ( xenRunning($name, \%PER_HOST_CONFIG) )
     {
         deleteXenImage($name);
     }
@@ -266,22 +269,68 @@ 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' },
                 "verbose",     \$CONFIG{ 'verbose' },
-                "no-xen-ok",   \$CONFIG{ 'no_xen_ok' },
+                "no-xen-ok",   sub { warn "Option --no-xen-ok is deprecated and ignored."; },
                 "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;
+    }
+    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;
 
@@ -310,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;
@@ -320,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 } );
     }
@@ -335,6 +384,7 @@ sub checkArguments
         print " --dir\n";
         print " --evms\n";
         print " --lvm\n";
+        print " --zpool\n";
         exit 2;
     }
 }
@@ -479,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
     {

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.4';
+my $RELEASE = '4.10.0';
 
 
 
@@ -212,7 +212,7 @@ sub findXenInstances
 
 =begin doc
 
-  Show details about the the Xen instance contained in the given
+  Show details about the Xen instance contained in the given
  configuration file.
 
 =end doc

bin/xen-resize-guest

@@ -75,8 +75,8 @@ Show the version number and exit.
 
 =head1 AUTHORS
 
- Steve Kemp, http://www.steve.org.uk/
- Axel Beckert, http://noone.org/abe/
+ Steve Kemp, https://steve.fi/
+ Axel Beckert, https://axel.beckert.ch/
 
 
 =head1 LICENSE
@@ -111,7 +111,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.4';
+my $RELEASE = '4.10.0';
 
 
 #
@@ -340,7 +340,7 @@ sub parseCommandLineArguments
 
     #
     #  Setup mutually exclusive options in such a way that
-    # they will allow the configuration values to be overriden by
+    # they will allow the configuration values to be overridden by
     # the command line.
     #
     if ( $install{ 'lvm' } )

bin/xen-update-image

@@ -75,8 +75,8 @@ Show the version number and exit.
 
 =head1 AUTHORS
 
- Steve Kemp, http://www.steve.org.uk/
- Axel Beckert, http://noone.org/abe/
+ Steve Kemp, https://steve.fi/
+ Axel Beckert, https://axel.beckert.ch/
  Stéphane Jourdois
 
 
@@ -113,7 +113,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.4';
+my $RELEASE = '4.10.0';
 
 
 #
@@ -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;
 }
@@ -302,7 +302,7 @@ sub updateXenImage
         #  Now upgrade
         #
         system(
-            "DEBIAN_FRONTEND=noninteractive  chroot $tmp /usr/bin/apt-get upgrade --yes --force-yes"
+            "DEBIAN_FRONTEND=noninteractive  chroot $tmp /usr/bin/apt-get upgrade --yes"
         );
 
         #
@@ -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;
 

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.4';
+my $RELEASE = '4.10.0';
 
 
 
@@ -254,7 +254,7 @@ sub checkArguments
     if ( !-d $CONFIG{ 'output' } )
     {
         print
-          "The output directory we've been given, $CONFIG{'output'}, doesnt exist\n";
+          "The output directory we've been given, $CONFIG{'output'}, doesn't exist\n";
         print "Aborting\n";
         exit 1;
     }

bin/xt-customize-image

@@ -29,7 +29,7 @@ xt-customize-image - Customize a freshly installed copy of GNU/Linux
 =head1 NOTES
 
   This script is invoked by xen-create-image after it has created a
- fresh installation of Linux withing a temporary location.
+ fresh installation of Linux within a temporary location.
 
   This script will be invoked with a full copy of the arguments from
  xen-create-image in its environment, along with several command line
@@ -54,11 +54,20 @@ xt-customize-image - Customize a freshly installed copy of GNU/Linux
  executed from '/usr/share/xen-tools/foo.d'.  Each executable will
  be loaded and executed in sorted order.
 
+  The systems administrator can optionally provide site-specific
+ revisions of those same hooks by placing them in the directory
+ '/etc/xen-tools/hooks.d/' in which case a script with the same name
+ as the one in the 'foo.d' directory above will take precedence. In
+ this way certain hooks can be prevented from running, expanded with
+ site-specific features which won't get overwritten on upgrades, or
+ patched with critical bug-fixes before the upstream OS distribution
+ provider reacts.
+
 
 =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
 
 
@@ -91,7 +100,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.4';
+my $RELEASE = '4.10.0';
 
 
 
@@ -212,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.
@@ -222,7 +231,7 @@ sub checkArguments
   We\'d expect the hook directory to be : $dir
 
   Aborting.
-E_OR
+EOR
         exit 1;
     }
 
@@ -251,6 +260,7 @@ sub runDistributionHooks
     #  Hook directory.
     #
     my $hooks = "/usr/share/xen-tools/" . $CONFIG{ 'dist' } . ".d/";
+    my $hooks_local = "/etc/xen-tools/hooks.d/";
 
     #
     #  Installation prefix
@@ -295,10 +305,20 @@ sub runDistributionHooks
                 $name = $2;
             }
 
+            #
+            # Run a local version of the hook instead of the system one,
+            # if the local one exists and is executable.
+            #
+            my $file_local = $hooks_local . $name;
+            if ( ( -x $file_local ) && ( -f $file_local ) )
+            {
+              $file = $file_local
+            }
+
             #
             # Complete command we're going to execute.
             #
-            my $cmd = $hooks . $name . " $CONFIG{'location'}";
+            my $cmd = $file . " $CONFIG{'location'}";
 
             #
             #  Run the command.  This has different prolog and epilog

bin/xt-guess-suite-and-mirror

@@ -9,8 +9,9 @@ mirror for DomUs on Debian and Ubuntu Dom0s.
 
 =head1 SYNOPSIS
 
-  --suite       Show suite
-  --mirror      Show mirror
+  --suite                Show suite
+  --mirror               Show mirror
+  --sources-list=<file>  Parse this file as sources.list
 
   Shows both if no parameter is given.
 
@@ -30,7 +31,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 +53,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 (http.debian.net
+# Which mirrors to use if everything else fails (deb.debian.org
 # redirects to a working mirror nearby)
-my %fallback_mirror = ( Debian => 'http://http.debian.net/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 +63,7 @@ my %fallback_mirror = ( Debian => 'http://http.debian.net/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 => 'jammy' );
 
 # Where to look for the sources.list to parse
 my @sources_list_files = ( '/etc/apt/sources.list',
@@ -79,7 +80,7 @@ use strict;
 #
 # Release number.
 #
-my $RELEASE = '4.4';
+my $RELEASE = '4.10.0';
 
 # Init
 my $mirror = '';
@@ -92,11 +93,13 @@ my $want_suite   = 0;
 my $want_version = 0;
 my $want_help    = 0;
 my $want_manual  = 0;
+my $sources_list = undef;
 
 my $result = GetOptions( 'mirror|m' => \$want_mirror,
                          'suite|s'  => \$want_suite,
                          'version'  => \$want_version,
                          'manual'   => \$want_manual,
+                         'sources-list=s' => \$sources_list,
                          'help'     => \$want_help );
 
 if ($want_help) {
@@ -107,6 +110,10 @@ if ($want_manual) {
     pod2usage( -verbose => 2 );
 }
 
+if (defined $sources_list) {
+    @sources_list_files = ($sources_list);
+}
+
 all_sources_list_files: foreach my $sources_list_file (@sources_list_files) {
     if (-r $sources_list_file) {
         # sources.list file exists, so it's something debianoid.
@@ -136,7 +143,7 @@ all_sources_list_files: foreach my $sources_list_file (@sources_list_files) {
             # Skip updates, backports, volatile or security mirror.
             next if $source_components[2] !~ /^[a-z]+$/;
 
-            if ($source_components[1] =~ m(/debian/?$|/ubuntu/?$)) {
+            if ($source_components[1] =~ m(/debian/?$|/ubuntu(-ports)?/?$)) {
                 # Seems a typical mirror. Let's use that one
 
                 $mirror = $source_components[1];

bin/xt-install-image

@@ -28,6 +28,7 @@ xt-install-image - Install a fresh copy of GNU/Linux into a directory
                     configuration file.
    --mirror         The mirror to use when installing with 'debootstrap'.
    --apt_proxy      The proxy to use when installing with 'debootstrap'.
+   --keyring        The keyring to use when installing with 'debootstrap'.
 
   Installation Options:
    --install-method  Specify the installation method to use.
@@ -77,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
 
 
@@ -112,7 +113,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.4';
+my $RELEASE = '4.10.0';
 
 
 #
@@ -337,6 +338,7 @@ sub parseCommandLineArguments
         "cachedir=s", \$CONFIG{ 'cachedir' },
         "config=s", \$CONFIG{ 'config' },
         "mirror=s", \$CONFIG{ 'mirror' },
+        "keyring=s", \$CONFIG{ 'keyring' },
         "apt_proxy=s", \$CONFIG{ 'apt_proxy' },
 
         # Help.
@@ -412,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.
@@ -422,7 +424,7 @@ sub checkArguments
   We would expect the hook directory to be $dir.
 
   Aborting.
-E_OR
+EOR
         exit 1;
     }
 
@@ -619,7 +621,7 @@ sub do_debootstrap
     }
 
     #
-    #  Propogate --verbose appropriately.
+    #  Propagate --verbose appropriately.
     #
     my $EXTRA = '';
     if ( $CONFIG{ 'verbose' } )
@@ -628,13 +630,21 @@ sub do_debootstrap
     }
 
     #
-    #  Propogate the --arch argument
+    #  Propagate the --arch argument
     #
     if ( $CONFIG{ 'arch' } )
     {
         $EXTRA .= " --arch $CONFIG{'arch'}";
     }
 
+    #
+    #  Propagate the --keyring argument
+    #
+    if ( $CONFIG{ 'keyring' } )
+    {
+        $EXTRA .= " --keyring=$CONFIG{'keyring'}";
+    }
+
     #
     #  Setup http_proxy so that debootstrap pulls files through the apt-proxy
     #
@@ -691,7 +701,7 @@ sub do_rinse
       "rinse --distribution=$CONFIG{'dist'} --directory=$CONFIG{'location'}";
 
     #
-    #  Propogate the --arch argument
+    #  Propagate the --arch argument
     #
     if ( $CONFIG{ 'arch' } )
     {
@@ -717,7 +727,7 @@ sub do_rinse
     }
 
     #
-    #  Propogate the verbosity setting.
+    #  Propagate the verbosity setting.
     #
     if ( $CONFIG{ 'verbose' } )
     {
@@ -741,7 +751,7 @@ sub do_rpmstrap
 {
 
     #
-    #  Propogate the verbosity setting.
+    #  Propagate the verbosity setting.
     #
     my $EXTRA = '';
     if ( $CONFIG{ 'verbose' } )
@@ -750,7 +760,7 @@ sub do_rpmstrap
     }
 
     #
-    #  Propogate any arch setting we might have.
+    #  Propagate any arch setting we might have.
     #
     if ( $CONFIG{ 'arch' } )
     {

debian/NEWS

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

debian/README.Debian

@@ -1,8 +1,23 @@
 README
 ======
 
+Bootstrapping Wheezy, Precise or older Releases
+-----------------------------------------------
+
+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.
+
+
 Kernel/initrd guessing
-======================
+----------------------
 
 In xen-tools 3.4-1 a new feature was added which allows using 
 backtick expressions in xen-tools.conf.
@@ -15,7 +30,7 @@ changing/adding the following options in xen-tools.conf:
 
 
 Upgrading Existing kernel/initrd paths
---------------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The kernel, and initrd, settings which are included in the xen-tools
 (either statically or dynamically with `uname -r`) are only applied

debian/README.source

@@ -4,7 +4,7 @@ How to build xen-tools directly from the Git repository?
 Clone the git repository and change to the directory of your local
 working copy.
 
-$ git clone git://gitorious.org/xen-tools/xen-tools.git
+$ git clone git://github.com/xen-tools/xen-tools.git
 $ cd xen-tools
 
 If you just want to build the binary package, run
@@ -18,5 +18,4 @@ Debian or Ubuntu:
 $ make orig-tar-gz
 $ dpkg-buildpackage
 
-
- -- Axel Beckert <abe@debian.org>, Mon, 13 Sep 2010 14:30:05 +0200
+ -- Axel Beckert <abe@debian.org>, Tue, 14 Jul 2015 18:35:38 +0200

debian/changelog

@@ -1,3 +1,331 @@
+xen-tools (4.10.0-1) UNRELEASED; urgency=medium
+
+  * New upstream feature release
+    + Update list of Ubuntu and Debian releases.
+    + Support for specifying guest type. (initial patch by Arno Bakker;
+      GH #64)
+  * Drop alternative Suggests on btrfs-tools. (Closes: #932122; Security
+    support for Xen in Debian 8 has long ended.)
+
+ -- Axel Beckert <abe@debian.org>  Mon, 11 Dec 2023 23:11:47 +0100
+
+xen-tools (4.9.2-1) unstable; urgency=medium
+
+  * New upstream maintenance release
+    + Update list of Ubuntu and Debian releases.
+    + Fix bashism in release testing target "tidy".
+    + xt-guess-suite-and-mirror:
+      - Bump default Ubuntu fallback release to 22.04 Jammy LTS.
+      - Add new option --sources-list to pass a file to parse.
+      - Add support for Ubuntu Ports APT repos. (Closes: #1023667,
+        LP: #1995969)
+  * Update upstream signing key to update its expiry date.
+  * Depend and Build-Depend on non-(build-)essential package
+    mount. (Closes: #1027383)
+  * Also mention "vsyscall=emulate" in package description and
+    README.Debian. (Closes: #1028388)
+  * Declare compliance with Debian Policy 4.6.2. No changes needed.
+
+ -- Axel Beckert <abe@debian.org>  Mon, 06 Feb 2023 02:57:47 +0100
+
+xen-tools (4.9.1-1) unstable; urgency=medium
+
+  * New upstream bugfix release.
+    + Fix missing "|" in regex in Debian's 20-setup-apt. (Closes: #997668)
+    + Make test xt/gitignore.t work with git releases ≥ 2.32.0.
+    + Travis CI: stop testing again Perl "dev". It no more seems to exist.
+    + Also create an .orig.tar.xz signature upon "make release".
+  * Declare compliance with Debian Policy 4.6.0. (No changes needed.)
+
+ -- Axel Beckert <abe@debian.org>  Sun, 24 Oct 2021 05:38:40 +0200
+
+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 Vernooij ]
+  * 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
+
+    [ Pierre Olivier ]
+    + Added /usr/local/bin/pygrub to the end of the pygrub search path.
+
+    [ nirgal ]
+    + Fixed typo in initramfs comment
+
+    [ Axel Beckert ]
+    + Make t/hooks-inittab.t using its own copy of the generic /etc/inittab
+      for testing instead of using the system one's. (GH#36, should fix
+      autopkgtest on systems with modified /etc/inittab)
+    + Fix unescaped braces (deprecated with Perl 5.22) in t/plugin-checks.t.
+
+  * Support checking upstream GPG signature in debian/watch.
+
+ -- Axel Beckert <abe@debian.org>  Wed, 23 Dec 2015 18:05:54 +0100
+
+xen-tools (4.6.1-1) unstable; urgency=medium
+
+  * New upstream bugfix release
+    + Declare GitHub as primary hosting.
+    + Integrate BUGS.markdown into README.markdown, move remaining
+      contents of KNOWN_BUGS.markdown to the GitHub issue tracker.
+    + Fix Perl warning in t/hook-inittab.t if /etc/inittab isn't present.
+      - Fixes failed autopkgtest.
+    + Preliminary support for Ubuntu 16.04 LTS Xenial Xerus.
+    + Neither use $#array in boolean context nor @array = undef anymore.
+  * Update Vcs-* headers to point to GitHub instead of GitLab.
+  * Add debian/maintscript to remove obsolete conffile
+    /etc/bash_completion.d/xen-tools properly.
+  * Fix typo in previous changelog entry.
+
+ -- Axel Beckert <abe@debian.org>  Sat, 24 Oct 2015 01:13:08 +0200
+
+xen-tools (4.6-1) unstable; urgency=low
+
+  * New upstream release
+    + Fix usage of nonexistent variable in removeDebianPackage (Closes:
+      #774936) Thanks Lukas Schwaighofer!
+    + Change all occurrences of http.debian.net to httpredir.debian.org
+    + Ubuntu 10.04 Lucid Lynx and 14.10 Utopic Unicorn now EoL.
+    + Preliminary support for Debian 9 Stretch and Ubuntu 15.10 Wily
+      Werewolf.
+    + Installs bash completion into /usr/share/bash-completion/ (fixes
+      lintian warning package-install-into-obsolete-dir)
+    + Allows # within configuration file comments. (Closes: #783060;
+      thanks Jean-Michel Nirgal Vourgère for the bug report and patch!)
+    + Testsuite: Let modules.sh ignore the .git directory. (t/modules.t
+      failed if a git commit message had a line starting with "use ".)
+    + Testsuite: Optimize and clean up modules.sh.
+    + Drop all occurrences of apt's --force-yes parameter. It only forces
+      the installation of untrusted packages and that's unwanted. (Closes:
+      #776487)
+    + Support passing commandline options with --debootstrap-cmd.
+    + Use -o APT::Install-Recommends=false instead of
+      --no-install-recommends for backwards compatibility with older APT
+      versions which don't know either (but accept any Foo=Bar parameter
+      to "-o"). Allows one to install earlier Debian releases (e.g. Etch)
+      with the default configuration again.
+    + Use md5 as default hash method again, to be able to properly set
+      passwords in older releases. Does not affect passwords changed later
+      inside the DomU.
+    + Split off hardcoded release code names list and default mirrors in
+      xen-create-image into separate configuration file which is parsed
+      before the default settings or command-line options are set.
+    + Pass --yes to lvcreate only if LVM version is 2.02.99 or
+      higher. Fixes regression introduced with 4.5 by the fix for #754517.
+      - Add new (build-)dependency on libsort-versions-perl.
+    + Report all SSH fingerprints of the created DomU, not only RSA ones.
+    + Split up test suite in functionality/compatibility tests (t) and
+      author/release tests (xt).
+    + Make test suite support as-installed-testing
+      - Mark package as autopkgtestable.
+    + Multiple release workflow improvements (target release in Makefile):
+      - Use TMPDIR instead of TMP for temporary directories.
+      - Always run the full test suite before doing a release.
+      - Use maximum compression and don't store time stamps in tar ball.
+      - Make "release" target to include "orig-tar-gz" and tagging.
+    + New option --keyring which is passed through to deboootstrap. Its
+      default values work around bug #792729 in debootstrap.
+    + Supports "unstable", "oldstable" and "oldoldstable" as distribution
+      names, too. ("oldoldstable" is not yet supported by debootstrap, see
+      feature request #792734 in debootstrap.)
+    + New example script helpful for release testing.
+    + Support VLANs with Open vSwitch (GH-2). Thanks to Félix Barbeira
+      for the patch.
+  * Update Vcs-* headers and documentation as Gitorious closed its doors
+    in June 2015 and is now only available with static contents.
+  * Recommend debian-archive-keyring (for installing Debian DomUs on
+    derivatives) and ubuntu-archive-keyring (for installing Ubuntu DomUs
+    on Debian).
+  * Reduce the list of alternative xen-hypervisor-* packages to just
+    "xen-hypervisor" which is a virtual package provided by at least all
+    xen-hypervisor-* packages since Debian 6 Squeeze.
+  * Recommend lvm2, it's at least required if the --lvm option is used.
+  * Add an adequate as-installed test to debian/tests/control.
+
+ -- Axel Beckert <abe@debian.org>  Mon, 20 Jul 2015 16:05:04 +0200
+
+xen-tools (4.5-1) unstable; urgency=low
+
+  * New upstream release
+    + Use "686-pae" kernels instead of "686" kernels on Debian Wheezy and
+      later. Thanks to Daniel Lintott! (Closes: #742778)
+    + Pass "-y" option ("assume yes") to yum (Closes: #735675)
+      Thanks Lionel FÉLICITÉ!
+    + Drop all xend related sanity checks, they cause more havoc nowadays
+      than they help. Thanks Ian Campbell! (Closes: #732456)
+    + Apply patch by Adrian C. (anrxc) to allow to override hooks in
+      /usr/share/xen-tools/*.d/ with hooks in /etc/xen-tools/hooks.d/.
+      Thanks! (Also add /etc/xen-tools/hooks.d/ to debian/dirs.)
+    + Ignore cover_db directory in t/perl-syntax.t.
+    + Update list of supported Ubuntu releases.
+      - Add support for Ubuntu 14.10 Utopic Unicorn.
+      - Add preliminary support for Ubuntu 15.04 Vivid Vervet.
+      - Use old-releases.ubuntu.com for Ubuntu 13.10 Saucy Salamander.
+    + Fix always empty gateway on Debian DomUs (Thanks Joan! LP: #1328794)
+    + pygrub detection: Prefer /usr/lib/xen-default over /usr/lib/xen-x.y.
+    + Fix lvcreate awaiting user input when creating swap lv (Closes: #754517)
+      Thanks Eric Engstrom!
+    + Fix missing quoting in shell function "assert" in hooks/common.sh.
+    + Fix initial configuration summary in cases where pygrub is used.
+    + Fix corner cases where not the latest kernel would have been checked.
+    + --password overrides --genpass. (Closes: #764143) Based on patch by
+      Santiago Vila.
+    + Add password length sanity check with fallback to default length.
+    + Raise default password length from 8 to 23.
+    + Flush output after each line in runCommand().
+    + Makefile: Clean up coverage data in multiple targets.
+    + t/perl-syntax.t: Ignore changelog files, too.
+
+    [ Santiago Vila ]
+    + Fix unaligned maxmem output of xen-create-image. (Closes: #764126)
+    + Fix copy & paste errors in comments in typos in roles/puppet
+      (Closes: #764134)
+    + Fix typos in POD of xen-create-image (Closes: #764153)
+  * Bump Standards-Version to 3.9.6 (no changes needed)
+  * Fix lintian warning depends-on-perl-modules.
+  * Add lintian override for debian-news-entry-uses-asterisk; I disagree.
+
+ -- Axel Beckert <abe@debian.org>  Sat, 25 Oct 2014 23:27:18 +0200
+
 xen-tools (4.4-1) unstable; urgency=low
 
   * New upstream release
@@ -118,7 +446,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,
@@ -406,7 +734,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
 
@@ -540,7 +868,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)
@@ -743,7 +1071,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
 
@@ -757,7 +1085,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
 
@@ -888,4 +1216,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
-

debian/compat

@@ -1 +0,0 @@
-9

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,
@@ -12,14 +12,18 @@ Build-Depends: debhelper (>= 9~),
                libfile-which-perl,
                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.5
-Homepage: http://xen-tools.org/software/xen-tools
-Vcs-Browser: http://gitorious.org/xen-tools/xen-tools
-Vcs-Git: git://gitorious.org/xen-tools/xen-tools.git
+               libtext-template-perl,
+               mount
+Standards-Version: 4.6.2
+Homepage: https://xen-tools.org/software/xen-tools
+Vcs-Browser: https://github.com/xen-tools/xen-tools
+Vcs-Git: https://github.com/xen-tools/xen-tools.git
+Rules-Requires-Root: no
 
 Package: xen-tools
 Architecture: all
@@ -30,18 +34,26 @@ Depends: debootstrap | cdebootstrap,
          libdata-validate-uri-perl,
          libfile-slurp-perl,
          libfile-which-perl,
+         libsort-versions-perl,
          libterm-ui-perl | perl (<< 5.17.0),
          libtext-template-perl,
+         mount,
          openssh-client,
-         perl-modules,
+         perl,
          ${misc:Depends},
          ${perl:Depends}
-Recommends: libexpect-perl,
+Recommends: debian-archive-keyring,
+            debootstrap (>= 1.0.117~),
+            e2fsprogs,
+            libexpect-perl,
+            lvm2,
             rinse (>= 1.9.1-1),
-            xen-hypervisor-amd64 | xen-hypervisor-i386 | xen-hypervisor-i386-pae,
+            ubuntu-keyring | ubuntu-archive-keyring,
+            xen-hypervisor,
             xen-utils
-Suggests: btrfs-tools,
+Suggests: btrfs-progs,
           cfengine2,
+          grub-xen-host,
           reiserfsprogs,
           xfsprogs
 Description: Tools to manage Xen virtual servers
@@ -57,7 +69,13 @@ Description: Tools to manage Xen virtual servers
    * Debian 5.0 Lenny
    * Debian 6.0 Squeeze
    * Debian 7 Wheezy
-   * Debian 8 Jessie (under development)
+   * Debian 8 Jessie
+   * Debian 9 Stretch
+   * Debian 10 Buster
+   * Debian 11 Bullseye
+   * Debian 12 Bookworm (under development)
+   * Debian 13 Trixie (knows about this future release name)
+   * Debian 14 Forky (knows about this future release name)
    * Debian Sid (Unstable)
    * Ubuntu 6.06 Dapper Drake (LTS)
    * Ubuntu 6.10 Edgy Eft
@@ -75,6 +93,30 @@ Description: Tools to manage Xen virtual servers
    * Ubuntu 12.10 Quantal Quetzal
    * Ubuntu 13.04 Raring Ringtail
    * Ubuntu 13.10 Saucy Salamander
-   * Ubuntu 14.04 Trusty Tahr (LTS, under development)
+   * Ubuntu 14.04 Trusty Tahr (LTS)
+   * Ubuntu 14.10 Utopic Unicorn
+   * Ubuntu 15.04 Vivid Vervet
+   * Ubuntu 15.10 Wily Werewolf
+   * 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
+   * Ubuntu 21.10 Impish Indri
+   * Ubuntu 22.04 Jammy Jellyfish (LTS)
+   * Ubuntu 22.10 Kinetic Kudu
+   * Ubuntu 23.04 Lunar Lobster (preliminary support, under development)
    * CentOS 5
    * CentOS 6
+ .
+ Note: Debian 7 Wheezy, Ubuntu 12.04 Precise Pangolin and any older
+ release requires the Linux kernel of the hosting machine to be booted
+ with "vsyscall=emulate" on the kernel commandline (i.e. in the
+ bootloader) to bootstrap these releases with xen-tools. See
+ /usr/share/doc/xen-tools/README.Debian for details.

debian/copyright

@@ -1,7 +1,7 @@
 This package was debianized by Radu Spineanu <radu@debian.org> on
 Tue, 20 Dec 2005 02:21:05 +0200.
 
-It was downloaded from http://xen-tools.org/software/xen-tools/
+It was downloaded from https://xen-tools.org/software/xen-tools/
 
 Copyright 2005-2009: Steve Kemp <steve@steve.org.uk>
 Copyright 2010-2013: The Xen-Tools Development Team, currently consisting of:
@@ -25,3 +25,15 @@ Perl is distributed under licenses:
     On Debian GNU/Linux systems, the complete text of the GNU General
     Public License can be found in /usr/share/common-licenses/GPL-1' and
     the Artistic Licence in /usr/share/common-licenses/Artistic'.
+
+t/data/inittab is Copyright 1997-2005 Miquel van Smoorenburg
+<miquels@cistron.nl> and the members pkg-sysvinit project.
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    On Debian GNU/Linux systems, the complete text of the GNU General
+    Public License version 2 can be found in
+    /usr/share/common-licenses/GPL-2'.

debian/dirs

@@ -1,4 +1,5 @@
 /etc/xen-tools
 /etc/xen-tools/role.d
+/etc/xen-tools/hooks.d
 /etc/xen-tools/skel
-/usr/share/xen-tools
+/usr/share/xen-tools

debian/docs

@@ -1,7 +1,4 @@
 AUTHORS
 README.markdown
 SUPPORT.markdown
-BUGS.markdown
 TODO.markdown
-KNOWN_BUGS.markdown
-NEWS.markdown

debian/lintian-overrides

@@ -0,0 +1,2 @@
+# I disagree
+xen-tools: debian-news-entry-uses-asterisk

debian/maintscript

@@ -0,0 +1 @@
+rm_conffile /etc/bash_completion.d/xen-tools 4.6.1-1~

debian/rules

@@ -5,4 +5,12 @@
 %:
 	dh $@
 
+override_dh_auto_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:

debian/tests/adequate

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+adequate xen-tools >&2

debian/tests/control

@@ -0,0 +1,5 @@
+Tests: functionality
+Depends: @, @builddeps@
+
+Tests: adequate
+Depends: @, adequate

debian/tests/functionality

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+export AS_INSTALLED_TESTING=1
+
+prove -j1 -v \
+ t/hook-daemons.t \
+ t/hook-hostname.t \
+ t/hook-inittab.t \
+ t/hook-tls.t \
+ t/hooks.t \
+ t/plugin-checks.t \
+ t/pod-check.t \
+ t/xen-delete-image.t \
+ t/xen-lists-images.t \
+ t/xt-create-xen-config.t

debian/triggers

@@ -1 +1 @@
-activate update-initramfs
+activate-noawait update-initramfs

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

debian/upstream/signing-key.asc

@@ -0,0 +1,241 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBEpaZ7ABEADMyzD1duYFiMgQpGOBPUkeCoSYOLIVk9ry+fwIkyiyvVZYBWuh
+PtEdb+NLOPj/zfUFcoshfhm9bdCTlId1rger34/gOBN9r9NbawfiaUuOhxVzasrX
+/7sWSHDKQ+7WFS9SBt4EVRJJJDDjqyAlzbHgGtvOYBz6s052zLKnmadAzJGC/mll
+Wx/xxzY1+lRuVNC9NPVmmKrIBgT4aymEvNezVWDnUkKo9flpuMk8wnESO3ccpK2H
+JOp9l8C3PcQZAKzU9jPOmoXO3uqZG8xRoNLNIyrcNsftswylDlmC99mofpSpmLKi
++2+huujkdWubU5qQogC03OeKBqzsFxEYQYAkMcZg1lMebkbPZRGDXN2sWncarJkG
+QLH2tKnjHas6L1SYmZkr44druSrlAI1d4gkNhE5Xr8BDnr4ipneWkYhBq7O2+0Ty
+We071NDwANDhjHyIxG/3J/PSK2Y99PP6cifrIn8Ndu6DNa58uG0jFXjvsWLJQyqN
+TIq/C0wMXne5/5KSo6uIG//hogTl9tP40qQ7xLj1eBb3jFiiDORyhbmB+tLveNge
+9oYgf0qIbrTI3sfUNTgJN3IYgswaqtk83GWp0j9r6zkwuACVX1RS3UaqNMdoivS2
+m1nZZd9O4CPYNmYTLcPNcnYQIjBrs1W6GtmEY0K6e0r0OMffaRhyI7+zfwARAQAB
+tCJBeGVsIEJlY2tlcnQgPGFiZUBkZXV4Y2hldmF1eC5vcmc+iQJWBBMBCABAAhsD
+BAsJCAcFFQoJCAsFFgIDAQACHgECF4ACGQEWIQQlF7ckxfbKmVMpbmEv+c1ZYSYW
+tQUCX9yVQwUJHugvEwAKCRAv+c1ZYSYWtYVfD/9PPQrNvxG7xjXxyjtoNWi2NAJ5
+YaGqUATeoX6C9iie4SXhpfDtKxLY29RY3MM149/n+SIHIGAYUQpSDMBXIHDN/PBb
+5xLqXsbqN7NwTdr4/FCxZ/JueLr3VXlLt/auUbaRHDokUAF01auoHbycrgISMxlu
+edVCUkPCcF35SFu/uJ25YYpPs/MwzcjjLJs9Bg2eR5wwNTS0hvzhjO7FmE83wfvr
+kq5GDaRxJm7crfdzXhcIMHIA8mH3z1EqiAYFxKWCrFys5GMBfyQ5mrdmIlNDtAnF
+ot5uaUpRHpiXld8qt6530oTsUZ7zWkhZj/gdjLPUgYq/n/AW4gCRA3xp710OqboA
+ZDMmmZLMSnARxC62dj5op8pSeKVpIZzguPGeO1u2Rup4NkupVUb8HFyM/dIjCMef
+ZAlx8muQgMnf6ufj9hN0q/o4nSwhn+Be/YBw7cy7cVKaea3cZIMMzGOM41v/MAkH
+NRwYfDRVhbWFic3fnmQfyUGFK/+y3YJNF5F4hqhoeoEuN9Sxt2CZhDRvhqDFr7lF
+PIrDQQuUnLQ7OsGkglVH1p7qX97fXLOIp2Gap5ZPSFahrPrntIjKfK/Mql+aWSIb
+De34HaZVHDpdmESJKaJRtLMy71MBFFr7lWzAWVpSkg46H7/gvICre+TnXz7/VEta
+MLP4n8NOJIIs4JHxZbQuQXhlbCBCZWNrZXJ0IChFLU1haWwgKyBKYWJiZXIpIDxh
+YmVAbm9vbmUub3JnPokCUwQTAQgAPQIbAwQLCQgHBRUKCQgLBRYCAwEAAh4BAheA
+FiEEJRe3JMX2yplTKW5hL/nNWWEmFrUFAl/clUQFCR7oLxMACgkQL/nNWWEmFrUc
+2g/+Kc44OQHC1DUK+zmddxRZnaRPt/pZks4YZVweKagNzoo/mGjevGpEGC0o+40+
+JCG2kFE3teOvVoxMgJnA5g7OxkgCj+F64MhH068vmlkc+YFIHrtU7OGDZ01nPk4C
+g6Vnuwmkgz4rFw/TB3A2yhgtLBMpO0Uky+aw6N6OyfpcpWnCfTNlFrZ7TjXWzwqC
+byzyMh9Am7iZyM7GlUMv4qwft2Bc8cCKBZ0z/1KgAZDevtn+vxIyZjBmm/j30w2O
+L8r34cDFz53HSE+r5H9J/lRJvzMclx7LF1vmCPci7lakf0BlTqYV9lTaQu50o228
+dzzhpO0WmYcfEd+8RytOqXeRQ9L/tCcghLlzquh/GwWGGcW0bsUWTpeLgSE8OwUU
+j7HiAOc7h2eGxt9qGwF5+9hAXtMyc5VtzZVeChemIhqJTdSf5MI2E2T57DwbKMJM
+Zptmj7o5BR0sFhUiXVXBYYGyG3hPUiM737tX6IY6vS/5BY1ocFYDX66ApI7K+Ovf
+VljJGVHSCGwKnOzkgBA3KpRiozU6uZr+/s1GLZKGIRZE2z2X5Is3iFqVoLiXIDAM
+2Mtge0DnTkMa8df6KK6k4fK48xDb0v9zk3Y4EX/vsCm23S1zc7uel436FNSQ1CnZ
+aszqjwjJvzQclZeN0x7wdq2e0OBZ77SRBBv+rflQ8IXSUSS0KkF4ZWwgQmVja2Vy
+dCAoU3ltbGluaykgPHh0YXJhbkBzeW1saW5rLmNoPokCUwQTAQgAPQIbAwQLCQgH
+BRUKCQgLBRYCAwEAAh4BAheAFiEEJRe3JMX2yplTKW5hL/nNWWEmFrUFAl/clUQF
+CR7oLxMACgkQL/nNWWEmFrXG+w//ZuOCRsOvo8ZLU98vBChGt0eRTnWaUPXPqsy/
+51CGjzbet3FQSIunLgJ/latsl76qqTHotPIebruFLhDdiOwMF6JZ4haZQDeIRz9L
+CvMwpQYcqo3/54FUnfe4Kxudv5/N5l04qUmok+hRmnQtjAKhbrk365xlP6PNdRyn
+R39eR14ds267VkbgK/1lb5LcGrmjD0L8SAg4EY7RXg9JiwHUKKrX4CF5OlyPlwWe
+oryqAM8VR8i4i0TyGzpDBQmY1WxJQbEDp/6VwlC5uoHBJI65rPHbhYRAriQoHYyF
+tbAZTnYP5RHrDFgXVQMCghb/vvtnc/Z/nOQcZ5+UjAMzzQXvglMExR/5KDnqfB3Z
+uv2iBNvLhISNP9i68bifWlvJDmqdJQN0ol92k5Pc+iMnbVmqJf2F//O/s3Q7cVyr
+dlf85jxovFNhMOZK4Y98MB+IbsT5QKhHvKLl/DXfgRH7hnxRmgyYP3jxAlpNvX1D
+srIZzDLKCQFG6Mubc7+K7oq9yD2272mV0e6ogY8+N7Js2ms8uDwCuXJhywSoRY5B
+PI/ChIP7uHLt4Ocw8UinS43AxQf+T4aIzlngElHWmXq3jKEVUB1mxw/9gz0U9Gne
+1+jLy/b0CIXg4wGcstwConfp3BYuno2Q5rwf9A0nu0yu0eiZaFlzYoTN312Gwgwj
+7Iql39jRy6bLpAEQAAEBAAAAAAAAAAAAAAAA/9j/4AAQSkZJRgABAQAAAQABAAD/
+/gCTU29mdHdhcmU6OlhWIFZlcnNpb24gMy4xMGEgIFJldjogMTIvMjkvOTQgKFBO
+RyBwYXRjaCAxLjIpCgpDUkVBVE9SOiBYViBWZXJzaW9uIDMuMTBhICBSZXY6IDEy
+LzI5Lzk0IChQTkcgcGF0Y2ggMS4yKSAgUXVhbGl0eSA9IDkwLCBTbW9vdGhpbmcg
+PSAwCv/bAEMAAwICAwICAwMDAwQDAwQFCAUFBAQFCgcHBggMCgwMCwoLCw0OEhAN
+DhEOCwsQFhARExQVFRUMDxcYFhQYEhQVFP/bAEMBAwQEBQQFCQUFCRQNCw0UFBQU
+FBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFP/A
+ABEIAGAAYAMBIgACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJ
+Cgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgj
+QrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFla
+Y2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3
+uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQAD
+AQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncA
+AQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYn
+KCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeI
+iYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri
+4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/AP1TooooAK5Tx38UfDHw2sTc
+6/q0FmcZS33bppPTag5PTr0rwv8Aaj/bBtvhJeP4Y8NmC68TBQbmeYborMEcDH8U
+nQ46DIz6V8LeIviBqvie8utb1e7uL6+nPNzdtudz2AHYD0Fc1Wuqei3Oqjh5Vdeh
+9T/Fn9v7ULC6ePwpp8FnZgELPfJ5kz++0Hav05rgNJ/4KPeOLO6V77TdOvrfHKGE
+ox7ZyrDvXyrPc3GrXhLgsSeSew9KuQ6dH8u4ggfdPrntXJ7d7tnd9UifU2pf8FFv
+GuqJHbWGn6dYS8l7iO3Lkj2DMR+ldf4G/bn8RWxhbW47XV4MYdREIJTz1BXj8MV8
+TLPDpMkjSL8rdQv8Jx1FTN4kS3RZFcSRPxuHY+tDrS3iQ8PBaM/Yf4Y/F7w38WtJ
+a90K73vGcTWkuFmiPuvp7jiu1r8a/h38ZNV+G/i2y17R79rSVPlcg7kYHqGHcGv1
+08A+L7Px94M0fxBYypNb39sk2U6BiPmX8GyPwrtpVOfR7nn1IcjOgooorcyCuK+M
+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
+=XJH8
+-----END PGP PUBLIC KEY BLOCK-----

debian/watch

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

etc/distributions.conf

@@ -0,0 +1,71 @@
+# xen-tools configuration file for distribution meta data
+#
+# Syntax:
+#
+# codename = distribution and further keywords
+#
+# Known distributions: debian, ubuntu
+# Known keywords: eol, pygrub, default-keyring, dont-test
+# Known generic keywords: *.gpg (uses the according /usr/share/keyrings/….gpg file)
+#
+sarge        = debian eol dont-test
+etch         = debian eol
+lenny        = debian eol
+squeeze      = debian eol default-keyring
+wheezy       = debian eol
+jessie       = debian eol
+stretch      = debian pygrub
+buster       = debian pygrub
+bullseye     = debian pygrub
+bookworm     = debian pygrub
+trixie       = debian pygrub
+forky        = debian pygrub dont-test
+sid          = debian pygrub
+
+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
+gutsy        = ubuntu eol
+hardy        = ubuntu eol
+intrepid     = ubuntu eol
+jaunty       = ubuntu eol
+karmic       = ubuntu eol
+lucid        = ubuntu eol pygrub
+maverick     = ubuntu eol pygrub
+natty        = ubuntu eol pygrub
+oneiric      = ubuntu eol pygrub
+precise      = ubuntu eol 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 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 eol pygrub
+hirsute      = ubuntu eol pygrub
+impish       = ubuntu eol pygrub
+jammy        = ubuntu     pygrub
+kinetic      = ubuntu eol pygrub
+lunar        = ubuntu     pygrub
+mantic       = ubuntu     pygrub dont-test
+
+devel        = ubuntu     pygrub dont-test

etc/mirrors.conf

@@ -0,0 +1,13 @@
+# xen-tools default mirror configuration file
+
+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
+
+#
+# If you like, you can also declare per-release mirrors:
+#
+# sarge  = http://debian.ethz.ch/debian-archive/debian
+# trusty = http://ubuntu.ethz,ch/ubuntu

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
@@ -254,46 +262,9 @@ initrd = /boot/initrd.img-`uname -r`
 #
 
 #
-# The default mirror for debootstrap to install Debian-derived distributions
+# Use the mirror configured on the DomU as default mirror
 #
-mirror = `xt-guess-suite-and-mirror --mirror`
-
-#
-# A mirror suitable for use when installing the Dapper release of Ubuntu.
-#
-# mirror = http://gb.archive.ubuntu.com/ubuntu/
-
-#
-#  If you like you could use per-distribution mirrors, which will
-# be more useful if you're working in an environment where you want
-# to regularly use multiple distributions. The following are the
-# default values used (for Debian the GeoIP feature is used, see
-# http://wiki.debian.org/DebianGeoMirror):
-#
-# mirror_sarge = http://archive.debian.org/debian
-# mirror_etch = http://archive.debian.org/debian
-# mirror_lenny = http://archive.debian.org/debian
-# mirror_squeeze = http://http.debian.net/debian
-# mirror_wheezy = http://http.debian.net/debian
-# mirror_jessie = http://http.debian.net/debian
-# mirror_sid = http://http.debian.net/debian
-# mirror_dapper = http://old-releases.ubuntu.com/ubuntu
-# mirror_edgy = http://old-releases.ubuntu.com/ubuntu
-# mirror_feisty = http://old-releases.ubuntu.com/ubuntu
-# mirror_gutsy = http://old-releases.ubuntu.com/ubuntu
-# mirror_hardy = http://old-releases.ubuntu.com/ubuntu
-# mirror_intrepid = http://old-releases.ubuntu.com/ubuntu
-# mirror_jaunty = http://old-releases.ubuntu.com/ubuntu
-# mirror_karmic = http://old-releases.ubuntu.com/ubuntu
-# mirror_lucid = http://archive.ubuntu.com/ubuntu
-# mirror_maverick = http://old-releases.ubuntu.com/ubuntu
-# mirror_natty = http://old-releases.ubuntu.com/ubuntu
-# mirror_oneiric = http://archive.ubuntu.com/ubuntu
-# mirror_precise = http://archive.ubuntu.com/ubuntu
-# mirror_quantal = http://archive.ubuntu.com/ubuntu
-# mirror_raring = http://archive.ubuntu.com/ubuntu
-# mirror_saucy = http://archive.ubuntu.com/ubuntu
-# mirror_trusty = http://archive.ubuntu.com/ubuntu
+# mirror = `xt-guess-suite-and-mirror --mirror`
 
 # If this is defined it will be used by debootstrap, and configured as the
 # proxy for the guest

etc/xm.tmpl

@@ -20,19 +20,7 @@
 {
   if ( $pygrub )
   {
-    my $pygrub_bin = '';
-    foreach my $pygrub_path (reverse glob('/usr/lib/xen-*/bin/pygrub
-                                           /usr/lib/xen-default/bin/pygrub
-                                           /usr/*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}'
@@ -42,6 +30,7 @@ memory      = '{$memory}'
     $OUT .= "maxmem      = '$maxmem'\n";
   }
 }
+type      = '{$type}'
 
 #
 #  Disk device(s).
@@ -151,6 +140,12 @@ name        = '{$hostname}'
       $br = ",bridge=$bridge"
     }
 
+    my $vl = '';
+    if ( $vlan )
+    {
+      $vl = ".$vlan"
+    }
+
     $OUT .= "vif         = [ 'ip=$ips";
     $OUT .= "$m";
     $OUT .= "$vn";

examples/release-testing

@@ -0,0 +1,50 @@
+#!/bin/bash
+
+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

hooks/artful/01-disable-daemons

@@ -0,0 +1 @@
+../common/01-disable-daemons

hooks/artful/05-shadowconfig-on

@@ -0,0 +1 @@
+../common/05-shadowconfig-on

hooks/artful/15-disable-hwclock

@@ -0,0 +1 @@
+../common/15-disable-hwclock

hooks/artful/20-setup-apt

@@ -0,0 +1 @@
+../common/20-setup-apt

hooks/artful/25-generate-locale

@@ -0,0 +1 @@
+../common/25-generate-locale

hooks/artful/30-disable-gettys

@@ -0,0 +1 @@
+../common/30-disable-gettys

hooks/artful/35-setup-users

@@ -0,0 +1 @@
+../common/35-setup-users

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

hooks/artful/50-setup-hostname

@@ -0,0 +1 @@
+../common/50-setup-hostname-deb

hooks/artful/60-copy-host-files

@@ -0,0 +1 @@
+../common/60-copy-host-files

hooks/artful/65-copy-user-files

@@ -0,0 +1 @@
+../common/65-copy-user-files

hooks/artful/70-install-ssh

@@ -0,0 +1 @@
+../common/70-install-ssh-deb

hooks/artful/75-fixup-securetty

@@ -0,0 +1 @@
+../common/75-fixup-securetty

hooks/artful/80-install-kernel-ubuntu

@@ -0,0 +1 @@
+../common/80-install-kernel-ubuntu

hooks/artful/80-install-modules

@@ -0,0 +1 @@
+../common/80-install-modules-deb

hooks/artful/81-install-modules-init-tools

@@ -0,0 +1 @@
+../common/81-install-modules-init-tools

hooks/artful/82-install-grub-legacy

@@ -0,0 +1 @@
+../common/82-install-grub-legacy

hooks/artful/90-make-fstab

@@ -0,0 +1 @@
+../common/90-make-fstab

hooks/artful/99-clean-image

@@ -0,0 +1 @@
+../common/99-clean-image-deb

hooks/artful/99-enable-daemons

@@ -0,0 +1 @@
+../common/99-enable-daemons

hooks/centos-5/25-setup-kernel

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

hooks/centos-6/25-setup-kernel

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

hooks/common.sh

@@ -47,7 +47,7 @@ assert ()
         shift
     fi
 
-    if [ ! $* ] ; then
+    if [ ! "$*" ] ; then
         echo "assert failed: $0:$lineno [$*]"
         exit
     fi
@@ -96,7 +96,7 @@ installDebianPackageAndRecommends ()
     #
     # Install the packages
     #
-    DEBIAN_FRONTEND=noninteractive chroot ${prefix} /usr/bin/apt-get --yes --force-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.
@@ -123,7 +123,7 @@ installDebianPackage ()
     prefix=$1
     shift
 
-    installDebianPackageAndRecommends ${prefix} --no-install-recommends "$@"
+    installDebianPackageAndRecommends ${prefix} -o APT::Install-Recommends=false "$@"
 }
 
 #
@@ -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
@@ -322,7 +322,7 @@ removeDebianPackage ()
     #
     # Log our options
     #
-    logMessage "Purging Debian package ${package} from prefix ${prefix}"
+    logMessage "Purging Debian package $@ from prefix ${prefix}"
 
     #
     #  We require a prefix

hooks/common/01-disable-daemons

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

hooks/common/05-shadowconfig-on

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

hooks/common/10-disable-tls

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

hooks/common/15-disable-hwclock

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

hooks/common/20-setup-yum

@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
@@ -33,7 +33,7 @@ if [ ! -d ${prefix}/proc ]; then
     mkdir -p ${prefix}/proc
 fi
 mount -o bind /proc ${prefix}/proc
-chroot ${prefix} /usr/bin/yum update
+chroot ${prefix} /usr/bin/yum update -y
 umount ${prefix}/proc
 
 

hooks/common/35-setup-users

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

hooks/common/40-setup-networking-deb

@@ -5,7 +5,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
@@ -88,9 +88,9 @@ setupStaticNetworking ()
     #
     # gateway address?
     #
-    gateway='';
+    gway='';
     if [ -n "${gateway}" ]; then
-      gateway=" gateway ${gateway}"
+      gway=" gateway ${gateway}"
     fi
 
     #
@@ -108,7 +108,7 @@ iface lo inet loopback
 auto eth0
 iface eth0 inet static
  address ${ip1}
-${gateway}
+${gway}
  netmask ${netmask}
 ${bcast}
 ${point}

hooks/common/40-setup-networking-rpm

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

hooks/common/50-setup-hostname-deb

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

hooks/common/50-setup-hostname-rpm

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

hooks/common/55-create-dev

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

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

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
 

hooks/common/70-install-ssh-deb

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

hooks/common/70-install-ssh-rpm

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

hooks/common/75-fixup-securetty

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

hooks/common/80-install-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

hooks/common/80-install-modules-deb

@@ -9,7 +9,7 @@
 #
 # Steve
 # --
-# http://www.steve.org.uk/
+# https://steve.fi/
 
 
 prefix=$1
@@ -31,7 +31,7 @@ fi
 #
 logMessage Script $0 starting
 
-if [ ${pygrub} ]; then
+if [ "${pygrub}" = "1" ]; then
     logMessage "pygrub set, skipping module install"
 else
 #

hooks/common/80-install-modules-rpm

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

hooks/common/82-install-grub-legacy

@@ -26,7 +26,7 @@ fi
 #
 logMessage Script $0 starting
 
-if [ ${pygrub} ]; then
+if [ "${pygrub}" = "1" ]; then
 
 #
 #  Install the grub 0.9x package ("grub-legacy" on Debian, "grub" on Ubuntu)
@@ -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"

hooks/common/90-make-fstab

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

hooks/common/99-clean-image-deb

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

hooks/common/99-clean-image-rpm

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

hooks/common/99-enable-daemons

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

hooks/debian/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|wheezy|jessie|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
     
 #

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
 #
@@ -29,19 +29,23 @@ if [ "${pygrub}" ]; then
 logMessage Script $0 starting
 
 #
-# Resolve the correct architecutre
+# Resolve the correct architecture
 #
 
 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.
@@ -61,6 +65,17 @@ fi
 KERNEL_XEN_PKG="linux-image-xen-$XEN_ARCH"
 KERNEL_PKG="linux-image-$XEN_ARCH"
 
+# Add "-pae" suffix for Debian releases after Squeeze. See
+# https://bugs.debian.org/742778 for details.
+if [ "${dist}" != "sarge"   -a \
+     "${dist}" != "etch"    -a \
+     "${dist}" != "lenny"   -a \
+     "${dist}" != "squeeze" -a \
+     "$XEN_ARCH" = "686" ]; then
+    KERNEL_XEN_PKG="$KERNEL_XEN_PKG-pae"
+    KERNEL_PKG="$KERNEL_PKG-pae"
+fi
+
 logMessage Attempting to install the $KERNEL_XEN_PKG kernel image
 if chroot ${prefix} /usr/bin/apt-cache show $KERNEL_XEN_PKG > /dev/null 2>&1; then
     logMessage Package $KERNEL_XEN_PKG is available - installing
@@ -83,7 +98,10 @@ else
     fi
 fi
 
-DOMU_KERNEL=$(basename $(ls -1 ${prefix}/boot/vmlinuz* | tail -n 1))
+# Check for "ls -v" support
+V=''; if ls -1 ${prefix}/boot/vmlinuz* > /dev/null 2>&1; then V=-v; fi
+
+DOMU_KERNEL=$(basename $(ls -1 ${V} ${prefix}/boot/vmlinuz* | tail -n 1))
 KERNEL_REV=$(echo $DOMU_KERNEL | sed "s/vmlinuz-//g")
 DOMU_RAMDISK="initrd.img-$KERNEL_REV"
 DOMU_ISSUE=$(sed -re "s/ *\\\.*//g" -e1q < ${prefix}/etc/issue)

hooks/debian/95-configure-locales

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

hooks/edgy/80-install-kernel

@@ -7,7 +7,7 @@
 #
 # Dmitry Nedospasov
 # --
-# http://nedos.net
+# http://www.nedos.net/
 
 prefix=$1
 
@@ -27,7 +27,7 @@ fi
 
 logMessage Script $0 starting
 
-if [ "${pygrub}" ]; then
+if [ "${pygrub}" = "1" ]; then
 
 #
 # Attempt to install a xen kernel, if that fails, then install a normal one

hooks/gentoo/20-enable-su

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

hooks/gentoo/40-setup-networking

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

hooks/gentoo/50-setup-hostname

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

hooks/gentoo/70-install-ssh

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