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

As of now, Debian's ubuntu-keyring package hasn't been updated for
more than two years. See https://bugs.debian.org/978438

.travis.yml

@@ -1,5 +1,9 @@
 language: perl
 perl:
+  - "5.32"
+  - "5.30"
+  - "5.28"
+  - "5.26"
   - "5.24"
   - "5.22"
   - "5.20"
@@ -8,17 +12,27 @@ perl:
   - "5.14"
   - "5.12"
   - "5.10"
+  - "dev"
+  - "blead"
+
+matrix:
+  fast_finish: true
+  allow_failures:
+    - perl: blead
 
 before_install:
    - sudo apt-get update
    - sudo apt-get install devscripts dpkg-dev lsb-release
+   - eval $(curl https://travis-perl.github.io/init)
+   - build-perl
+   - perl -V
 
 install:
-   - yes '' | cpanm --verbose --notest --skip-satisfied Data::Validate::Domain Data::Validate::IP Data::Validate::URI File::Slurp File::Which Log::Message Term::UI Test::NoTabs Test::Pod::Coverage Test::Pod Text::Template Devel::Cover::Report::Coveralls Sort::Versions
+   - yes '' | cpanm --verbose --notest --skip-satisfied Data::Validate::Domain Data::Validate::IP Data::Validate::URI File::Slurp File::Which Log::Message Term::UI Test::NoTabs Test::Pod::Coverage Test::Pod Text::Template Devel::Cover::Report::Coveralls Sort::Versions Test::File::Contents
    - export RELEASE_TESTING=1 AUTOMATED_TESTING=1 AUTHOR_TESTING=1 HARNESS_OPTIONS=j10:c HARNESS_TIMER=1 PATH=bin:${PERLBREW_PATH}:${PATH}
 
 script:
-   - make test
+   - make test-verbose
 
 after_success:
    - prove --exec 'env PERL5OPT=-MDevel::Cover=-ignore_re,^(t/|/usr) perl' t/*.t

Makefile

@@ -14,7 +14,7 @@
 #
 TMPDIR     ?= /tmp
 DIST_PREFIX = ${TMPDIR}
-VERSION     = 4.8
+VERSION     = 4.9
 DEBVERSION  = $(shell echo $(VERSION)|sed 's/\(rc\|pre\|beta\|alpha\)/~\1/')
 BASE        = xen-tools
 VCS         = git
@@ -132,6 +132,7 @@ install-bin:
 	cp bin/xen-delete-image     ${prefix}/usr/bin
 	cp bin/xen-list-images      ${prefix}/usr/bin
 	cp bin/xen-update-image     ${prefix}/usr/bin
+	cp bin/xen-resize-guest     ${prefix}/usr/bin
 	cp bin/xt-guess-suite-and-mirror ${prefix}/usr/bin
 	chmod 755 ${prefix}/usr/bin/xen-create-image
 	chmod 755 ${prefix}/usr/bin/xen-create-nfs
@@ -184,6 +185,7 @@ install-hooks:
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d buster.d
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d bullseye.d
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d bookworm.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d trixie.d
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d sid.d
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d unstable.d
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d testing.d
@@ -224,6 +226,10 @@ install-hooks:
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s artful.d bionic.d
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s artful.d cosmic.d
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s artful.d disco.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s artful.d eoan.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s artful.d focal.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s artful.d groovy.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s artful.d hirsute.d
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s artful.d devel.d
 	cp hooks/common.sh ${prefix}/usr/share/xen-tools
 	cp -r hooks/common ${prefix}/usr/share/xen-tools
@@ -288,13 +294,15 @@ orig-tar-gz: tarball
 #
 #  Run the test suite.
 #
+test-verbose : VERBOSE = -v
+test-verbose: test
 test: non-author-test author-test
 
 non-author-test: update-modules
-	prove --shuffle t/
+	prove $(VERBOSE) --shuffle t/
 
 author-test:
-	prove xt/
+	prove $(VERBOSE) xt/
 
 
 #

NEWS.markdown

@@ -1,3 +1,61 @@
+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)
 ===================================
 

README.markdown

@@ -39,9 +39,10 @@ known to work reliably, i.e.:
 * Wheezy 7 (Dom0 no more tested) [¹](#1)
 * Jessie 8
 * Stretch 9
-* Buster 10 (under development)
-* Bullseye 11 (knows about this future release name)
+* Buster 10
+* Bullseye 11 (under development)
 * Bookworm 12 (knows about this future release name)
+* Trixie 13 (knows about this future release name)
 * Sid (always under development; works at least at the moment of writing :-)
 
 ### Ubuntu
@@ -74,7 +75,11 @@ known to work reliably, i.e.:
 * Artful Aardvark 17.10
 * Bionic Beaver 18.04 (LTS)
 * Cosmic Cuttlefish 18.10
-* Disco Dingo 19.04 (under development)
+* Disco Dingo 19.04
+* Eoan Ermine 19.10
+* Focal Fossa 20.04 (LTS)
+* Groovy Gorilla 20.10
+* Hirsute Hippo 21.04 (under development)
 
 ### Footnotes
 

TODO.markdown

@@ -59,6 +59,12 @@ Bugs to fix and features to add for 5.0
   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
 --------------------------------------------
 

bin/xen-create-image

@@ -872,7 +872,7 @@ my $MOUNT_POINT = undef;
 #
 # Release number.
 #
-my $RELEASE = '4.8';
+my $RELEASE = '4.9';
 
 
 #
@@ -3224,12 +3224,11 @@ sub createLVMBits
         # The commands to create the volume.
         #
         my $disk_cmd =
-          "lvcreate $CONFIG{'lvm'} ".
-          ($lvm_needs_yes ? '--yes' : '').
-          ' '.
+          "lvcreate ".
+          ($lvm_needs_yes ? '--yes ' : '').
           ($CONFIG{ 'lvm_thin' } ?
            "-T $CONFIG{'lvm'}/$CONFIG{'lvm_thin'} -V" :
-           '-L').
+           "$CONFIG{'lvm'} -L").
           " $partition->{'size'} -n $disk";
 
         #

bin/xen-create-nfs

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

bin/xen-delete-image

@@ -167,7 +167,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.8';
+my $RELEASE = '4.9';
 
 
 #
@@ -269,13 +269,25 @@ sub parseCommandLineArguments
     my $VERSION = 0;
     $CONFIG{ 'dry-run' } = 0;
 
+    #
+    #  We record the installation method here because we want
+    # to ensure that we allow the method supplied upon the command line
+    # to overwrite the one we might have ready read from the configuration
+    # file.
+    #
+    my %install;
+    $install{ 'evms' }      = undef;
+    $install{ 'dir' }       = undef;
+    $install{ 'lvm' }       = undef;
+    $install{ 'zpool' }     = undef;
+
     #  Parse options.
     #
-    GetOptions( "dir=s",       \$CONFIG{ 'dir' },
+    GetOptions( "dir=s",       \$install{ 'dir' },
                 "dry-run",     \$CONFIG{ 'dry-run' },
-                "lvm=s",       \$CONFIG{ 'lvm' },
-                "evms=s",      \$CONFIG{ 'evms' },
-                "zpool=s",     \$CONFIG{ 'zpool' },
+                "lvm=s",       \$install{ 'lvm' },
+                "evms=s",      \$install{ 'evms' },
+                "zpool=s",     \$install{ 'zpool' },
                 "extension:s", \$CONFIG{ 'extension' },
                 "hostname=s@", \$CONFIG{ 'hostname' },
                 "test",        \$CONFIG{ 'test' },
@@ -286,6 +298,39 @@ sub parseCommandLineArguments
                 "version",     \$VERSION
               );
 
+    #
+    #  Now make ensure that the command line setting of '--lvm', '--evms', '--zpool'
+    # and '--dir=x' override anything specified in the configuration file.
+    #
+    if ( $install{ 'dir' } )
+    {
+        $CONFIG{ 'dir' }       = $install{ 'dir' };
+        $CONFIG{ 'evms' }      = undef;
+        $CONFIG{ 'lvm' }       = undef;
+        $CONFIG{ 'zpool' }     = undef;
+    }
+    if ( $install{ 'evms' } )
+    {
+        $CONFIG{ 'dir' }       = undef;
+        $CONFIG{ 'evms' }      = $install{ 'evms' };
+        $CONFIG{ 'lvm' }       = undef;
+        $CONFIG{ 'zpool' }     = undef;
+    }
+    if ( $install{ 'lvm' } )
+    {
+        $CONFIG{ 'dir' }       = undef;
+        $CONFIG{ 'evms' }      = undef;
+        $CONFIG{ 'lvm' }       = $install{ 'lvm' };
+        $CONFIG{ 'zpool' }     = undef;
+    }
+    if ( $install{ 'zpool' } )
+    {
+        $CONFIG{ 'dir' }       = undef;
+        $CONFIG{ 'evms' }      = undef;
+        $CONFIG{ 'lvm' }       = undef;
+        $CONFIG{ 'zpool' }     = $install{ 'zpool' };
+    }
+
     pod2usage(1) if $HELP;
     pod2usage( -verbose => 2 ) if $MANUAL;
 

bin/xen-list-images

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

bin/xen-resize-guest

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

bin/xen-update-image

@@ -113,7 +113,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.8';
+my $RELEASE = '4.9';
 
 
 #
@@ -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

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

bin/xt-customize-image

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

bin/xt-guess-suite-and-mirror

@@ -79,7 +79,7 @@ use strict;
 #
 # Release number.
 #
-my $RELEASE = '4.8';
+my $RELEASE = '4.9';
 
 # Init
 my $mirror = '';

bin/xt-install-image

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

debian/changelog

@@ -1,3 +1,44 @@
+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.
@@ -989,7 +1030,7 @@ xen-tools (2.1-2) unstable; urgency=high
     - Fixed several typos in the configuration file, and scripts.
       (Closes: #375382)
 
- -- Steve Kemp <skx@debian.org>  Thur, 29 Jun 2006 10:31:23 +0000
+ -- Steve Kemp <skx@debian.org>  Thu, 29 Jun 2006 10:31:23 +0000
 
 xen-tools (2.1-1) unstable; urgency=high
 
@@ -1003,7 +1044,7 @@ xen-tools (2.1-1) unstable; urgency=high
   * Urgency set to high primarily because of the failure to create
     swap devices.
 
- -- Steve Kemp <skx@debian.org>  Thur, 23 Jun 2006 10:08:32 +0000
+ -- Steve Kemp <skx@debian.org>  Thu, 23 Jun 2006 10:08:32 +0000
 
 xen-tools (2.0-1) unstable; urgency=low
 

debian/compat

@@ -1 +0,0 @@
-10

debian/control

@@ -2,7 +2,7 @@ Source: xen-tools
 Section: utils
 Priority: optional
 Maintainer: Axel Beckert <abe@debian.org>
-Build-Depends: debhelper (>= 10~),
+Build-Depends: debhelper-compat (= 13),
                devscripts,
                git,
                libdata-validate-domain-perl,
@@ -13,11 +13,12 @@ Build-Depends: debhelper (>= 10~),
                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: 4.3.0
+Standards-Version: 4.5.1
 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
@@ -40,6 +41,7 @@ Depends: debootstrap | cdebootstrap,
          ${misc:Depends},
          ${perl:Depends}
 Recommends: debian-archive-keyring,
+            debootstrap (>= 1.0.117~),
             e2fsprogs,
             libexpect-perl,
             lvm2,
@@ -67,9 +69,10 @@ Description: Tools to manage Xen virtual servers
    * Debian 7 Wheezy
    * Debian 8 Jessie
    * Debian 9 Stretch
-   * Debian 10 Buster (under development)
-   * Debian 11 Bullseye (future release name)
-   * Debian 12 Bookworm (future release name)
+   * Debian 10 Buster
+   * Debian 11 Bullseye (under development)
+   * Debian 12 Bookworm (knows about this future release name)
+   * Debian 13 Trixie (knows about this future release name)
    * Debian Sid (Unstable)
    * Ubuntu 6.06 Dapper Drake (LTS)
    * Ubuntu 6.10 Edgy Eft
@@ -97,6 +100,10 @@ Description: Tools to manage Xen virtual servers
    * Ubuntu 17.10 Artful Aardvark
    * Ubuntu 18.04 Bionic Beaver (LTS)
    * Ubuntu 18.10 Cosmic Cuttlefish
-   * Ubuntu 19.04 Disco Dingo (preliminary support, under development)
+   * Ubuntu 19.04 Disco Dingo
+   * Ubuntu 19.10 Eoan Ermine
+   * Ubuntu 20.04 Focal Fossa (LTS)
+   * Ubuntu 20.10 Groovy Gorilla
+   * Ubuntu 21.04 Hirsute Hippo (preliminary support, under development)
    * CentOS 5
    * CentOS 6

debian/watch

@@ -4,7 +4,7 @@
 #
 #  uscan version number - not the version of the software.
 #
-version=3
+version=4
 
 
 #

etc/distributions.conf

@@ -12,19 +12,20 @@ sarge        = debian eol
 etch         = debian eol
 lenny        = debian eol
 squeeze      = debian eol default-keyring
-wheezy       = debian
-jessie       = debian
-stretch      = debian
-buster       = debian
-bullseye     = debian dont-test
-bookwork     = debian dont-test
-sid          = debian
+wheezy       = debian eol
+jessie       = debian eol
+stretch      = debian pygrub
+buster       = debian pygrub
+bullseye     = debian pygrub
+bookworm     = debian pygrub dont-test
+trixie       = debian pygrub dont-test
+sid          = debian pygrub
 
-testing      = debian
+testing      = debian pygrub
 oldoldstable = debian dont-test
-oldstable    = debian
-stable       = debian
-unstable     = debian
+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,
@@ -52,9 +53,13 @@ wily         = ubuntu eol pygrub
 xenial       = ubuntu     pygrub
 yakkety      = ubuntu eol pygrub
 zesty        = ubuntu eol pygrub ubuntu-keyring-2012-archive.gpg
-artful       = ubuntu     pygrub
+artful       = ubuntu eol pygrub ubuntu-archive-keyring.gpg
 bionic       = ubuntu     pygrub
-cosmic       = ubuntu     pygrub
-disco        = ubuntu     pygrub
+cosmic       = ubuntu eol pygrub ubuntu-archive-keyring.gpg
+disco        = ubuntu eol pygrub ubuntu-archive-keyring.gpg
+eoan         = ubuntu eol pygrub ubuntu-archive-keyring.gpg
+focal        = ubuntu     pygrub
+groovy       = ubuntu     pygrub
+hirsute      = ubuntu     pygrub
 
 devel        = ubuntu     pygrub dont-test

hooks/artful/40-setup-networking-deb-netplan

@@ -72,6 +72,25 @@ setupStaticNetworking ()
     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
@@ -84,7 +103,7 @@ network:
   ethernets:
     eth0:
       addresses: [${ip1}/${cidr}]
-      gateway4: ${gateway} 
+${gate}
       nameservers:
           addresses: [${nameserver}]
 E_O_STATIC

hooks/common/82-install-grub-legacy

@@ -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/debian/20-setup-apt

@@ -66,23 +66,51 @@ if ( test "${dist}" "!=" "sid" && test "${dist}" "!=" "unstable" && \
      test -e /etc/apt/sources.list && \
      grep ^deb.*security -r /etc/apt/sources.list /etc/apt/sources.list.d >/dev/null 2>/dev/null ) ; then
 
-    cat <<E_O_APT >> ${prefix}/etc/apt/sources.list
-# 
-#  Security updates
-# 
+    if echo "${dist}" | egrep -q '\b(sarge|etch|lenny|squeeze|wheezyjessie|stretch|buster)\b'; then
+
+        cat <<E_O_APT >> ${prefix}/etc/apt/sources.list
+#
+# Security updates
+#
 deb     http://security.debian.org/ ${dist}/updates  main contrib non-free
 deb-src http://security.debian.org/ ${dist}/updates  main contrib non-free
 E_O_APT
 
+    else
+
+        cat <<E_O_APT >> ${prefix}/etc/apt/sources.list
+#
+# Security updates
+#
+deb     http://security.debian.org/ ${dist}-security  main contrib non-free
+deb-src http://security.debian.org/ ${dist}-security  main contrib non-free
+E_O_APT
+
+    fi
+
 else
-    cat <<E_O_APT >> ${prefix}/etc/apt/sources.list
-# 
-#  Security updates - Uncomment to enable.
-# 
+
+    if echo "${dist}" | egrep -q '\b(sarge|etch|lenny|squeeze|wheezyjessie|stretch|buster)\b'; then
+
+        cat <<E_O_APT >> ${prefix}/etc/apt/sources.list
+#
+# Security updates - Uncomment to enable.
+#
 # deb     http://security.debian.org/ ${dist}/updates  main contrib non-free
 # deb-src http://security.debian.org/ ${dist}/updates  main contrib non-free
 E_O_APT
 
+    else
+
+        cat <<E_O_APT >> ${prefix}/etc/apt/sources.list
+#
+# Security updates - Uncomment to enable.
+#
+# deb     http://security.debian.org/ ${dist}-security  main contrib non-free
+# deb-src http://security.debian.org/ ${dist}-security  main contrib non-free
+E_O_APT
+
+    fi
 fi
     
 #

hooks/debian/80-install-kernel

@@ -36,12 +36,16 @@ if [ "${arch}" = "i386" ]; then
     XEN_ARCH="686"
 elif [ "${arch}" = "amd64" ]; then
     XEN_ARCH="amd64"
+elif [ "${arch}" = "arm64" ]; then
+    XEN_ARCH="arm64"
 elif [ -z "${arch}" ]; then
     UNAME_ARCH=`uname -m`
     if [ "${UNAME_ARCH}" = "i686" ]; then
         XEN_ARCH="686"
     elif [ "${UNAME_ARCH}" = "x86_64" ]; then
         XEN_ARCH="amd64"
+    elif [ "${UNAME_ARCH}" = "aarch64" ]; then
+        XEN_ARCH="arm64"
     else
         logMessage Unknown kernel architecture ${UNAME_ARCH}.
         logMessage Please report this as bug to xen-tools-dev@xen-tools.org.

partitions/sample-server

@@ -2,7 +2,7 @@
 size=1G
 type=ext3
 mountpoint=/
-options=sync,errors=remount-ro
+options=defaults,errors=remount-ro
 
 [swap]
 size=2G

t/hook-apt.t

@@ -0,0 +1,95 @@
+#!perl -w
+#
+#  Test that the /etc/inittab file is modified as we expect.
+#
+# Steve
+# --
+#
+
+use strict;
+use Test::More;
+use Test::File::Contents;
+use File::Temp;
+use File::Copy;
+use File::Path qw(make_path);
+
+my $hook_dir = $ENV{AS_INSTALLED_TESTING} ? '/usr/share/xen-tools' : 'hooks';
+
+foreach my $dist (qw(stretch buster bullseye bookworm sid)) {
+    testHook( $dist );
+}
+
+done_testing();
+
+sub testHook
+{
+    my ( $dist ) = ( @_ );
+    my $ea   = 'etc/apt';
+    my $easl = "$ea/sources.list";
+    my $hook = "$hook_dir/" .
+        (
+         $ENV{AS_INSTALLED_TESTING} ?
+         $dist :
+         'debian'
+        ) . '/20-setup-apt';
+
+    #
+    #  Create a temporary directory to use as prefix
+    #
+    my $dir = File::Temp::tempdir( CLEANUP => 1 );
+    make_path( "$dir/$ea/apt.conf.d", { chmod => 0755 });
+    make_path( "$dir/bin", { chmod => 0755 });
+    my $tmphook = "$dir/bin/20-setup-apt";
+
+    #
+    # Make sure that worked.
+    #
+    ok( -d $dir, "temporary directory created OK [$dist]" );
+    ok( -d "$dir/bin",
+        "bin inside temporary directory created OK [$dist]" );
+    ok( -d "$dir/$ea",
+        "$ea inside temporary directory created OK [$dist]" );
+
+    # Create a copy of the 20-setup-apt hook to be able to comment out
+    # the chroot + apt-get update call.
+    File::Copy::cp( $hook, $tmphook );
+
+    ok( -e "$tmphook", "hook exists in temporary directory [$dist]" );
+    # File::Copy in Perl 5.10 does not copy permissions, so let's fix
+    # it there and check for it elsewhere.
+    if ($] < 5.011) {
+        chmod(0755, $tmphook);
+    } else {
+        ok( -x "$tmphook", "hook is executable in temporary directory [$dist]" );
+    }
+
+    no warnings qw(qw);
+    is(system(qw(sed -e s/chroot/#chroot/ -i), $tmphook) >> 8, 0,
+       "chroot call in hook could be deactivated [$dist]");
+    use warnings qw(qw);
+
+    #
+    # Set up some variables expected by the hook
+    #
+    $ENV{dist} = $dist;
+    $ENV{mirror} = 'http://deb.debian.org/debian';
+
+    #
+    #  Call the hook
+    #
+    is(system($tmphook, $dir) >> 8, 0,
+       "hook for $dist exited with zero return code");
+
+    ok( -e "$dir/$easl", "A sources.list file has been created. [$dist]" );
+    if ($dist =~ /stretch|buster/) {
+        file_contents_like( "$dir/$easl", qr(\b${dist}/updates\b),
+                            "sources.list contains $dist/updates");
+        file_contents_unlike( "$dir/$easl", qr(\b${dist}-security\b),
+                              "sources.list doesn't contain $dist-security");
+    } else {
+        file_contents_like( "$dir/$easl", qr(\b${dist}-security\b),
+                            "sources.list contains $dist-security");
+        file_contents_unlike( "$dir/$easl", qr(\b${dist}/updates\b),
+                              "sources.list doesn't contain $dist/updates");
+    }
+}

xt/no-tabs.t

@@ -9,11 +9,9 @@
 
 use strict;
 use File::Find;
+use Test::More;
 use Test::NoTabs;
 
-# Check all Perl files
-all_perl_files_ok();
-
 #
 #  Find all the files beneath the current directory,
 # and call 'checkFile' with the name.
@@ -54,25 +52,36 @@ sub checkFile
     my $isShell        = 0;
     my $isPerl        = 0;
 
-    # Read the file.
-    open( INPUT, "<", $file );
-    foreach my $line ( <INPUT> )
-    {
-        if ( ( $line =~ /\/bin\/sh/ ) ||
-             ( $line =~ /\/bin\/bash/ ) )
+
+    if ( $file =~ /\.sh$/ ) {
+        $isShell = 1;
+    } elsif ( $file =~ /\.(pl|pm|t)$/ ) {
+        $isPerl = 1;
+    } else {
+
+        # Read the file.
+        open( INPUT, "<", $file );
+        foreach my $line ( <INPUT> )
         {
-            $isShell = 1;
-            last;
-        }
-        if ( $line =~ /\/usr\/bin\/perl/ )
-        {
-            last;
+            if ( ( $line =~ /^#! *\/bin\/sh/ ) ||
+                 ( $line =~ /^#! *\/bin\/bash/ ) )
+            {
+                $isShell = 1;
+                last;
+            }
+            if ( $line =~ /^#!.*\bperl\b/ )
+            {
+                $isPerl = 1;
+                last;
+            }
         }
+        close( INPUT );
     }
-    close( INPUT );
 
     #
     #  Run check if it is a shell file.
     #
-    notabs_ok( $file ) if $isShell;
+    notabs_ok( $file ) if $isShell or $isPerl;
 }
+
+done_testing();