AUTHORS

@@ -12,6 +12,9 @@ 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.
 
@@ -28,9 +31,6 @@ 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
 

Makefile

@@ -14,7 +14,7 @@
 #
 TMPDIR     ?= /tmp
 DIST_PREFIX = ${TMPDIR}
-VERSION     = 4.10.0
+VERSION     = 4.9.2
 DEBVERSION  = $(shell echo $(VERSION)|sed 's/\(rc\|pre\|beta\|alpha\)/~\1/')
 BASE        = xen-tools
 VCS         = git
@@ -235,7 +235,6 @@ install-hooks:
 	-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

NEWS.markdown

@@ -1,29 +1,3 @@
-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)
 ======================================
 
@@ -36,7 +10,7 @@ Distribution Releases Changes
   + Ubuntu 22.10 Kinetic Kudu
 * Preliminary support for
   + Debian 14 Forky
-  + Ubuntu 23.04 Lunar Lobster
+  + Ubuntu 23.04 Lunar Lobste
 * Declare the following releases as EoL:
   + Ubuntu 12.04 Precise Pangolin (LTS)
   + Ubuntu 20.10 Groovy Gorilla

README.markdown

@@ -251,8 +251,8 @@ 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.
+specification, with the only exception that trailing zeroes are
+omitted.
 
 Between the releases 3.9 and 4.4, the version numbering scheme
 followed roughly the same ideas, but less strict.

bin/xen-create-image

@@ -215,8 +215,6 @@ and EVMS EXAMPLE.
                 Set the number of vcpus that the new instance will
                 have instead of the default value of "1".
 
-   --type=type  Specify the VM type to use for the new guest.
-                Valid choices are 'pv' (default), 'pvh', or 'hvm'.
 
 
   Installation options:
@@ -446,7 +444,7 @@ Create a Xen configuration file in so that xm/xl can start the new domain.
   memory     = 128Mb    # Memory size
   maxmem     = 512Mb    # Memory size
   swap       = 128Mb    # Swap size
-  fs         = ext4     # use EXT4 filesystems
+  fs         = ext3     # use EXT3 filesystems
   dist       = stable   # Default distribution to install.
 
   #
@@ -874,7 +872,7 @@ my $MOUNT_POINT = undef;
 #
 # Release number.
 #
-my $RELEASE = '4.10.0';
+my $RELEASE = '4.9.2';
 
 
 #
@@ -1335,7 +1333,7 @@ sub setupDefaultOptions
     $CONFIG{ 'arch' }          =
         which('dpkg') ? `dpkg --print-architecture` : '';
     chomp($CONFIG{ 'arch' });
-    $CONFIG{ 'fs' }            = 'ext4';
+    $CONFIG{ 'fs' }            = 'ext3';
     $CONFIG{ 'force' }         = 0;
     $CONFIG{ 'install' }       = 1;
     $CONFIG{ 'hooks' }         = 1;
@@ -1347,7 +1345,6 @@ sub setupDefaultOptions
     $CONFIG{ 'ipfile' }        = '/etc/xen-tools/ips.txt';
     $CONFIG{ 'output' }        = '/etc/xen';
     $CONFIG{ 'extension' }     = '.cfg';
-    $CONFIG{ 'type' }          = 'pv';   # Arno: as per man xl.cfg
 
     #
     #  Installation method defaults to "debootstrap" using
@@ -1493,10 +1490,6 @@ sub checkOption
         vlan => {
             check   => qr/^([1-9][0-9]{0,2}|10[01][0-9]|102[0-4])$/i,
             message => "must be a number between 1 and 1024.\n",
-        }, # Arno
-        guestType => {
-            check   => qr/^(pv|pvh|hvm)$/,    # man xl.cfg
-            message => "must be 'pv', 'pvh' or 'hvm'.\n",
         },
     );
 
@@ -1536,7 +1529,6 @@ sub checkOption
         hash_method   => 'hashMethod',
         apt_proxy     => 'uri',
         vlan          => 'vlan',
-        type          => 'guestType', # Arno
     );
 
     # If given option does not exists in optionsTypes,
@@ -1693,7 +1685,6 @@ sub parseCommandLineArguments
             "extension:s",  \&checkOption,
             "dontformat",   \&checkOption,
             "lvm_thin=s",   \$CONFIG{ 'lvm_thin' },
-            "type:s",       \&checkOption, # Arno
 
             # Help options
             "debug!",     \$CONFIG{ 'debug' },
@@ -2728,7 +2719,6 @@ sub showSummary
         }
     }
 
-    logprint("Guest type     :  $CONFIG{'type'}\n");
     logprint("Image type     :  $CONFIG{'image'}\n");
     logprint("Memory size    :  $CONFIG{'memory'}\n");
 

bin/xen-create-nfs

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

bin/xen-delete-image

@@ -167,7 +167,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.10.0';
+my $RELEASE = '4.9.2';
 
 
 #

bin/xen-list-images

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

bin/xen-resize-guest

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

bin/xen-update-image

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

bin/xt-create-xen-config

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

bin/xt-customize-image

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

bin/xt-guess-suite-and-mirror

@@ -80,7 +80,7 @@ use strict;
 #
 # Release number.
 #
-my $RELEASE = '4.10.0';
+my $RELEASE = '4.9.2';
 
 # Init
 my $mirror = '';

bin/xt-install-image

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

debian/changelog

@@ -1,14 +1,3 @@
-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

debian/control

@@ -51,7 +51,7 @@ Recommends: debian-archive-keyring,
             ubuntu-keyring | ubuntu-archive-keyring,
             xen-hypervisor,
             xen-utils
-Suggests: btrfs-progs,
+Suggests: btrfs-progs | btrfs-tools,
           cfengine2,
           grub-xen-host,
           reiserfsprogs,

etc/distributions.conf

@@ -18,7 +18,7 @@ stretch      = debian pygrub
 buster       = debian pygrub
 bullseye     = debian pygrub
 bookworm     = debian pygrub
-trixie       = debian pygrub
+trixie       = debian pygrub dont-test
 forky        = debian pygrub dont-test
 sid          = debian pygrub
 
@@ -64,8 +64,7 @@ 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
+kinetic      = ubuntu     pygrub
+lunar        = ubuntu     pygrub dont-test
 
 devel        = ubuntu     pygrub dont-test

etc/xm.tmpl

@@ -30,7 +30,6 @@ memory      = '{$memory}'
     $OUT .= "maxmem      = '$maxmem'\n";
   }
 }
-type      = '{$type}'
 
 #
 #  Disk device(s).