Document state of Debian package 3.9-3

.gitignore

@@ -1,36 +0,0 @@
-# Note! Please run 'prove t/gitignore.t' after changing
-# this file, to check its coherency
-
-# all dotfiles
-.*
-# but we _wan't_ those dot-files
-!.gitignore
-!.mailmap
-!.travis.yml
-
-# ChangeLog is generated during make
-/ChangeLog
-
-# those are generated during debian package build
-/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
-
-# some backups
-*~
-*.orig
-
-# backups created by "make update-version"
-*.bak
-
-# Devel::Cover cache
-cover_db/

.mailmap

@@ -1,6 +0,0 @@
-Axel Beckert <abe@deuxchevaux.org>
-Dmitry Nedospasov <dmitry@nedos.net>
-Nathan O'Sullivan <nathan@mammoth.com.au>
-Radu Spineanu <radu@debian.org> radu <none@none>
-Steve Kemp <steve@steve.org.uk> steve <none@none>
-Stéphane Jourdois <sjourdois@gmail.com> <stephane@jourdois.fr>

.release

@@ -0,0 +1,34 @@
+#
+#  Configuration file for 'release', a utility to make release more
+# easily:
+#
+#   http://release.repository.steve.org.uk/
+#
+# Steve
+# -- 
+#
+
+
+#
+#  Command to run
+#
+preupload="make release"
+
+
+#
+#
+#  Pattern for our release tarball.
+#
+pattern=xen-tools-[0-9].[0-9].tar.gz*
+
+
+#
+#  Pattern for our GPG-signature.
+#
+signature=xen-tools-[0-9].[0-9].tar.gz.asc
+
+
+#
+#  Upload location.
+#
+upload=steve@www.xen-tools.org:/home/www/www.xen-tools.org/htdocs/software/xen-tools/

.travis.yml

@@ -1,28 +0,0 @@
-language: perl
-perl:
-  - "5.24"
-  - "5.22"
-  - "5.20"
-  - "5.18"
-  - "5.16"
-  - "5.14"
-  - "5.12"
-  - "5.10"
-
-before_install:
-   - sudo apt-get update
-   - sudo apt-get install devscripts dpkg-dev lsb-release
-
-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
-   - 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
-
-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

@@ -1,9 +1,8 @@
-Primary Authors
----------------
 
-  Axel Beckert <abe@deuxchevaux.org>
-  Dmitry Nedospasov <dmitry@nedos.net>
-  Stéphane Jourdois <sjourdois [at] com.gmail>
+        
+Primary Author
+--------------
+
   Steve Kemp <steve [at] uk.org.steve>
 
 
@@ -12,7 +11,7 @@ Contributions
 
   Listed alphabetically by surname.
 
-  C.J. Adams-Collier <cjcollier [at] com.gmail>
+  C.J. Adams-Collier <cjcollier [at] com.gmail.com
    - Added new modular structure to the code.
 
   Nick Anderson  <nick [at] net.anders0n>
@@ -24,94 +23,46 @@ Contributions
   Justin Azoff <JAzoff [at] edu.albany.uamail>
    - Added LVM support to xen-create-image.
 
-  Pieter Barrezeele <macbar [at] be.fab4>
-   - Several small but useful enhancements
-   - Bugfixes
-
-  Brian Bennett <bahamat [at] net.digitalelf>
-   - Made multiple times given --ip options work
-
-  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)
 
   Stefan Fritsch  <sf [at] de.sfritsch>
    - Contributed the policy-rc.d fixups for common.sh
 
-  Raphaël Halimi <raphael.halimi [at] com.gmail>
-    - Contribute bashism fix
-
   Sven Hertge <sven [at] de.svenhartge>
    - Bugfix for Debian/Gentoo package installation.
 
   Joey Hess <joeyh [at] org.debian>
    - Provided sample code for module copying and several useful bug reports
 
-  John Hughes <john [at] com.fallenbit>
-   - Physical devices reordering for pygrub
-
   Kirk Ismay <captain [at] com.netidea>
    - Added hook for automatic CFEngine installation.
 
   Sascha Kettler <kettler [at] net.gmx>
-   - Implemented support for arbitrary partitioning schemes.
+   - Implemented support for arbitary 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
-
   Gordon Messmer <gmessmer [at] edu.washington.u>
    - Supplied .spec file for building .rpm packages.
 
-  Wilson Neil <neil [at] uk.co.aldur>
-   - Several suggestions and code for disabling start-stop-daemon
-   - Compatibility fixups for Ubuntu.
-
-  Nathan O'Sullivan <nathan [at] au.com.mammoth>
-   - New features wrt. options and helper functions
-
-  Guillaume Pernot <gpernot [at] org.praksys>
-    - Fixed Sarge amd64 special case
-
   Walter Reiner <walter [at] at.wreiner>
    - Provided --image-dev + --swap-dev patch.
 
   Jameson Rollins <jrollins [at] edu.columbia.phys>
    - Provided --output + --extension code.
 
-  Michal Safranek (Wejn) <wejn [at] box.cz>
-   - Inspiration for pygrub in the install-kernel scripts
-
   Felipe Scarel <fbscarel [at] com.gmail>
    - Bugfix for --no-swap + LVM
 
-  Johan Schurer <johannes.schurer [at] com.alcatel-lucent>
-   - 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.
+   - Radu is also the Debian package maintainer and has CVS commit access.
 
   Henning Sprang <henning_sprang [at] de.gmx>
    - Many suggestions and useful Debian bug reports.
@@ -122,18 +73,9 @@ Contributions
   Gergely Tamas <dice [at] hu.kfki.mfa>
    - Added patch to make initrd setup optional.
 
-  Alex Tomlins <alex.tomlins [at] com.unboxedconsulting>
-   - apt_proxy support
-
   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
+  Wilson Neil <neil [at] uk.co.aldur>
+   - Several suggestions and code for disabling start-stop-daemon
+   - Compatibility fixups for Ubuntu.

BUGS

@@ -0,0 +1,27 @@
+
+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 which have been reported by the users of the Debian
+ package (the primary user-base):
+
+        http://bugs.debian.org/xen-tools
+
+  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.
+
+Steve
+-- 

LICENSE

@@ -2,12 +2,7 @@
 xen-tools
 ---------
 
-Copyright (c) 2005-2009: Steve Kemp.  All rights reserved.
-Copyright (c) 2010-2013: The Xen-Tools Development Team, currently consisting of:
-                         Axel Beckert <abe@deuxchevaux.org>,
-                         Dmitry Nedospasov <dmitry@nedos.net>, and
-                         Stéphane Jourdois <sjourdois@gmail.com>
-
+Copyright (c) 2005-2007 by Steve Kemp.  All rights reserved.
 
 This project is free software.  You may redistribute it under the
 terms of *either* the Perl Artistic License, or the GNU General
@@ -19,7 +14,7 @@ The text of both of these licenses follows below.
 
 Steve
 --
-https://steve.fi/
+http://www.steve.org.uk/
 
 
 

Makefile

@@ -6,24 +6,21 @@
 #
 # Steve
 # --
-# https://steve.fi/
+# http://www.steve.org.uk/
 #
 
 #
 #  Only used to build distribution tarballs.
 #
-TMPDIR     ?= /tmp
-DIST_PREFIX = ${TMPDIR}
-VERSION     = 4.8
-DEBVERSION  = $(shell echo $(VERSION)|sed 's/\(rc\|pre\|beta\|alpha\)/~\1/')
+DIST_PREFIX = ${TMP}
+VERSION     = 3.9
 BASE        = xen-tools
-VCS         = git
+
 
 #
 #  Installation prefix, useful for the Debian package.
 #
-DESTDIR=
-prefix=${DESTDIR}
+prefix=
 
 
 nop:
@@ -34,9 +31,7 @@ nop:
 	@echo " diff          = See local changes."
 	@echo " install       = Install the software"
 	@echo " manpages      = Make manpages beneath man/"
-	@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 " release       = Make a release tarball"
 	@echo " uninstall     = Remove the software"
 	@echo " update        = Update from the source repository."
 	@echo " "
@@ -47,46 +42,40 @@ nop:
 # with those details.
 #
 changelog:
-	$(VCS) log -v > ChangeLog
+	hg log -v > ChangeLog
 
 
 #
 #  Delete all temporary files, recursively.
 #
 clean:
-	@find . \
-		-path ./.git -prune -o \
-		\( \
-			-name '*~' -o \
-			-name '.#*' -o \
-			-name '*.bak' -o \
-			-name '*.tmp' -o \
-			-name 'tags' -o \
-			-name '*.8.gz' -o \
-			-name '*.tdy' \
-		\) -exec rm "{}" +
-	@if [ -d man ]; then rm -rf man ; fi
+	@find . -name '.*~' -exec rm \{\} \;
+	@find . -name '.#*' -exec rm \{\} \;
+	@find . -name '*~' -exec rm \{\} \;
+	@find . -name '*.bak' -exec rm \{\} \;
+	@find . -name '*.tmp' -exec rm \{\} \;
+	@find . -name 'tags' -exec rm \{\} \;
+	@find . -name '*.8.gz' -exec rm \{\} \;
+	@find man -name '*.html' -exec rm \{\} \;
 	@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
 
 
 #
 #  If the testsuite runs correctly then commit any pending changes.
 #
 commit: test
-	$(VCS) commit
+	hg commit
 
 
 #
 #  Show what has been changed in the local copy vs. the remote repository.
 #
 diff:
-	$(VCS) diff 2>/dev/null
+	hg diff 2>/dev/null
 
 
 #
@@ -95,10 +84,10 @@ diff:
 fixup-perms:
 	for i in hooks/*/*-*; do chmod 755 $$i; done
 	chmod 755 hooks/common.sh
-	chmod 644 etc/*.conf
+	chmod 644 etc/xen-tools.conf
 	chmod 644 etc/xm.tmpl
 	chmod 644 etc/xm-nfs.tmpl
-	chmod 644 misc/*
+	chmod 644 misc/xm misc/xen-tools misc/README
 
 #
 #  Install files to /etc/
@@ -109,14 +98,13 @@ 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/*.conf         ${prefix}/etc/xen-tools/
+	cp etc/xen-tools.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}/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
+	-mkdir -p             ${prefix}/etc/bash_completion.d
+	cp misc/xen-tools     ${prefix}/etc/bash_completion.d/
+	cp misc/xm            ${prefix}/etc/bash_completion.d/
 
 
 #
@@ -132,7 +120,6 @@ 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/xt-guess-suite-and-mirror ${prefix}/usr/bin
 	chmod 755 ${prefix}/usr/bin/xen-create-image
 	chmod 755 ${prefix}/usr/bin/xen-create-nfs
 	chmod 755 ${prefix}/usr/bin/xt-customize-image
@@ -141,7 +128,6 @@ install-bin:
 	chmod 755 ${prefix}/usr/bin/xen-delete-image
 	chmod 755 ${prefix}/usr/bin/xen-list-images
 	chmod 755 ${prefix}/usr/bin/xen-update-image
-	chmod 755 ${prefix}/usr/bin/xt-guess-suite-and-mirror
 
 
 
@@ -150,83 +136,35 @@ install-bin:
 #
 install-hooks:
 	for i in roles/* ; do if [ -f $$i ]; then cp $$i ${prefix}/etc/xen-tools/role.d; fi ; done
-	for i in ${prefix}/usr/share/xen-tools/*.d; do if [ -L "$$i" ]; then rm -vf "$$i"; fi; done
-	mkdir -p ${prefix}/usr/share/xen-tools/centos-4.d/
-	mkdir -p ${prefix}/usr/share/xen-tools/centos-5.d/
-	mkdir -p ${prefix}/usr/share/xen-tools/centos-6.d/
-	mkdir -p ${prefix}/usr/share/xen-tools/fedora-core-6.d/
-	cp -R hooks/centos-4/*-* ${prefix}/usr/share/xen-tools/centos-4.d
-	cp -R hooks/centos-5/*-* ${prefix}/usr/share/xen-tools/centos-5.d
-	cp -R hooks/centos-6/*-* ${prefix}/usr/share/xen-tools/centos-6.d
-	cp -R hooks/fedora-core-6/*-* ${prefix}/usr/share/xen-tools/fedora-core-6.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-4.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-5.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-7.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-8.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-9.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-10.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-11.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-12.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-13.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-14.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-15.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-16.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-17.d
-	mkdir -p ${prefix}/usr/share/xen-tools/debian.d/
-	cp -R hooks/debian/*-* ${prefix}/usr/share/xen-tools/debian.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d sarge.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d etch.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d lenny.d
-	-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 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/
-	cp -R hooks/dapper/*-* ${prefix}/usr/share/xen-tools/dapper.d/
-	mkdir -p ${prefix}/usr/share/xen-tools/edgy.d/
-	cp -R hooks/edgy/*-* ${prefix}/usr/share/xen-tools/edgy.d/
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s edgy.d feisty.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s edgy.d gutsy.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s edgy.d hardy.d
-	mkdir -p ${prefix}/usr/share/xen-tools/intrepid.d/
-	cp -R hooks/intrepid/*-* ${prefix}/usr/share/xen-tools/intrepid.d/
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s intrepid.d jaunty.d
-	mkdir -p ${prefix}/usr/share/xen-tools/karmic.d/
-	cp -R hooks/karmic/*-* ${prefix}/usr/share/xen-tools/karmic.d/
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d lucid.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d maverick.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d natty.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d oneiric.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d precise.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d quantal.d
-	-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 devel.d
-	cp hooks/common.sh ${prefix}/usr/share/xen-tools
-	cp -r hooks/common ${prefix}/usr/share/xen-tools
+	mkdir -p ${prefix}/usr/lib/xen-tools/centos-4.d/
+	mkdir -p ${prefix}/usr/lib/xen-tools/centos-5.d/
+	mkdir -p ${prefix}/usr/lib/xen-tools/fedora-core-6.d/
+	cp -R hooks/centos-4/*-* ${prefix}/usr/lib/xen-tools/centos-4.d
+	cp -R hooks/centos-5/*-* ${prefix}/usr/lib/xen-tools/centos-5.d
+	cp -R hooks/fedora-core-6/*-* ${prefix}/usr/lib/xen-tools/fedora-core-6.d
+	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-4.d
+	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-5.d
+	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-7.d
+	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-8.d
+	mkdir -p ${prefix}/usr/lib/xen-tools/debian.d/
+	cp -R hooks/debian/*-* ${prefix}/usr/lib/xen-tools/debian.d
+	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d sarge.d
+	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d lenny.d
+	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d etch.d
+	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d sid.d
+	mkdir -p ${prefix}/usr/lib/xen-tools/gentoo.d/
+	cp -R hooks/gentoo/*-* ${prefix}/usr/lib/xen-tools/gentoo.d
+	 mkdir -p ${prefix}/usr/lib/xen-tools/edgy.d/
+	cp -R hooks/edgy/*-* ${prefix}/usr/lib/xen-tools/edgy.d/
+	-cd ${prefix}/usr/lib/xen-tools/ && ln -s edgy.d feisty.d
+	-cd ${prefix}/usr/lib/xen-tools/ && ln -s edgy.d gutsy.d
+	mkdir -p ${prefix}/usr/lib/xen-tools/dapper.d/
+	cp -R hooks/dapper/*-* ${prefix}/usr/lib/xen-tools/dapper.d/
+	mkdir -p ${prefix}/usr/lib/xen-tools/edgy.d/
+	cp -R hooks/edgy/*-* ${prefix}/usr/lib/xen-tools/edgy.d/
+	mkdir -p ${prefix}/usr/lib/xen-tools/dapper.d/
+	cp -R hooks/dapper/*-* ${prefix}/usr/lib/xen-tools/dapper.d/
+	cp hooks/common.sh ${prefix}/usr/lib/xen-tools
 
 
 #
@@ -234,6 +172,7 @@ install-hooks:
 #
 install-libraries:
 	-mkdir -p ${prefix}/usr/share/perl5/Xen/Tools
+	cp ./lib/Xen/*.pm ${prefix}/usr/share/perl5/Xen
 	cp ./lib/Xen/Tools/*.pm ${prefix}/usr/share/perl5/Xen/Tools
 
 #
@@ -254,59 +193,40 @@ install: fixup-perms install-bin install-etc install-hooks install-libraries ins
 #  Build our manpages via the `pod2man` command.
 #
 manpages:
-	-mkdir -p man
-	cd bin; for i in *-*[!y]; do pod2man --release=${VERSION} --official --section=8 $$i ../man/$$i.8; done
+	cd bin; for i in *-*; do pod2man --release=${VERSION} --official --section=8 $$i ../man/$$i.8; done
 	for i in man/*.8; do gzip --force -9 $$i; done
 
 
 #
 #  Make a new release tarball, and make a GPG signature.
 #
-release: orig-tar-gz
-	gpg --armour --detach-sign ../$(BASE)-$(VERSION).tar.gz
-	git tag -s -m "Release as $(VERSION)" "release-$(VERSION)"
-
-tarball: test tidy fixup-perms update-version update-modules clean changelog
+release: 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*
+	rm -rf $(DIST_PREFIX)/$(BASE)-$(VERSION)/.hg*
 	cd $(DIST_PREFIX) && tar -cvf $(DIST_PREFIX)/$(BASE)-$(VERSION).tar $(BASE)-$(VERSION)/
-	gzip -9nv $(DIST_PREFIX)/$(BASE)-$(VERSION).tar
-	mv $(DIST_PREFIX)/$(BASE)-$(VERSION).tar.gz ..
+	gzip $(DIST_PREFIX)/$(BASE)-$(VERSION).tar
+	mv $(DIST_PREFIX)/$(BASE)-$(VERSION).tar.gz .
 	rm -rf $(DIST_PREFIX)/$(BASE)-$(VERSION)
-
-#
-#  Make a new orig.tar.gz for the Debian package
-#
-orig-tar-gz: tarball
-	cp -p ../$(BASE)-$(VERSION).tar.gz ../$(BASE)_$(DEBVERSION).orig.tar.gz
+	gpg --armour --detach-sign $(BASE)-$(VERSION).tar.gz
 
 
 #
 #  Run the test suite.
 #
-test: non-author-test author-test
-
-non-author-test: update-modules
+test:
 	prove --shuffle t/
 
-author-test:
-	prove xt/
-
 
 #
-#  Run our main script(s) through perltidy
+#  Run the test suite verbosely.
 #
-tidy:
-	if [ -x /usr/bin/perltidy ]; then \
-	for i in bin/*-*[^~]; do \
-		echo "tidying $$i"; \
-		perltidy  $$i \
-	; done \
-	; fi
+test-verbose:
+	prove --shuffle --verbose t/
+
+
 
 #
 #  Uninstall the software, completely.
@@ -320,17 +240,13 @@ uninstall:
 	rm -f ${prefix}/usr/bin/xt-install-image
 	rm -f ${prefix}/usr/bin/xt-create-xen-config
 	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/
 	-rm -f ${prefix}/etc/bash_completion.d/xen-tools
-	# Maybe needed to remove older releases of xen-tools
+	-rm -f ${prefix}/etc/bash_completion.d/xm
 	rm -rf ${prefix}/usr/lib/xen-tools
-	rm -rf ${prefix}/usr/share/xen-tools
 	rm -f ${prefix}/usr/share/man/man8/xen-create-image.8.gz
 	rm -f ${prefix}/usr/share/man/man8/xen-delete-image.8.gz
 	rm -f ${prefix}/usr/share/man/man8/xen-list-images.8.gz
@@ -342,8 +258,8 @@ uninstall:
 #
 #  NOTE: Removes empty local directories.
 #
-update:
-	$(VCS) pull --update 2>/dev/null
+update: 
+	hg pull --update 2>/dev/null
 
 
 #
@@ -351,7 +267,7 @@ update:
 # cases to ensure that all required modules are available.
 #
 update-modules:
-	@cd t && make modules
+	cd t && make modules
 
 
 #
@@ -359,4 +275,4 @@ update-modules:
 # at the top of this file.  Steve-Specific?
 #
 update-version:
-	perl -pi.bak -e "s/RELEASE = '[0-9]\.[0-9][^']*';/RELEASE = '${VERSION}';/g" bin/*-*[!~]
+	perl -pi.bak -e "s/RELEASE = '[0-9]\.[0-9]';/RELEASE = '${VERSION}';/g" bin/*-*

NEWS.markdown

@@ -1,449 +0,0 @@
-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)
-======================================
-
-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
----------
-
-* Fix several testuite failures depending on the build host's
-  installation.
-
-Other Changes
--------------
-
-* Remove most Mercurial traces
-
-
-xen-tools 4.2.1 (released 17 Mar 2011)
-======================================
-
-Bugfix Release only
-
-
-xen-tools 4.2 (released 05 Oct 2010)
-====================================
-
-First final release of the new Xen-Tools Team.
-
-Supports Ubuntu up to 11.04 (Natty) and Debian up to 7.0 (Wheezy).
-
-
-New Options
------------
-
-    --debootstrap-cmd (xen-create-image and xt-install-image)
-
-New Features and Major Changes
-------------------------------
-
-* 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 https://wiki.debian.org/DebianGeoMirror for
-  details.
-* New helper program `xt-guess-suite-and-mirror`, used to find the
-  default mirror and suite.

README

@@ -0,0 +1,137 @@
+
+Homepage:
+    http://www.xen-tools.org/software/xen-tools
+
+Mercurial Repository:
+    http://xen-tools.repository.steve.org.uk/
+
+Mailing Lists:
+    http://xen-tools.org/software/xen-tools/lists.html
+
+
+
+xen-tools
+---------
+
+  The xen-tools package contains a collection of Perl scripts for
+ working with Xen guest images under Debian GNU/Linux.
+
+  Using this software, you can easily create new Xen guests configured
+ to be accessible over your local network and complete with an installed
+ copy of OpenSSH.
+
+  This software is primarily aimed at users who wish to create virtual 
+ instances of Debian Sarge, Etch, or Sid.  Although other distributions
+ such as Ubuntu Dapper, Edgy, and Feisty are supported if you have the
+ appropriate packages installed.
+
+
+Requirements
+------------
+
+  To use these tools you'll need the following software:
+
+        * debootstrap
+        * Perl
+        * The Perl module "Text::Template"
+        * The Perl module "Config::IniFiles"
+          - Both of these modules are available as Debian packages,
+            or direct from http://www.cpan.org/ for non-Debian distributions.
+
+
+  In order to install RPM-based distributions such as CentOS, or
+ Fedora Core you will need a correctly installed and configured
+ "rinse" package.
+
+  To install Ubuntu distributions upon a Debian host system you will
+ need either:
+
+        * The Ubuntu version of debootstrap installed.
+        * A patched debootstrap package from:
+                http://steve.org.uk/Software/tmp/debootstrap/
+
+  If you wish to create new Xen instances which may be controlled by
+ users via a login shell you should also install the xen-shell package
+ which is available from:
+
+          http://xen-tools.org/software/xen-shell/
+
+
+
+The Scripts
+-----------
+
+  There now follows a brief description of each included script,
+ for more thorough documentation please consult the appropriate
+ manpage.
+
+
+
+xen-create-image
+----------------
+
+  This script is designed to create new images which may be used
+ with the Xen hypervisor.
+
+  The virtual images will have their networking settings created and,
+ you may optionally cause the new instance to boot once it has
+ been created.
+
+  This script performs the initial setup, then delegates the real
+ work to a collection of helper scripts:
+
+    * xt-install-image
+      Installs a distribution into a directory.
+
+    * xt-customize-image
+      Run a collection of hook scripts to configure the freshly 
+      installed system.
+
+    * xt-create-xen-config
+      Create a configuration file in /etc/xen such that Xen can
+      boot the newly created machine.
+
+
+xen-create-nfs
+--------------
+
+  This script is similar in spirit to xen-create-image, but much
+ less complex.  It allows the creation of Xen guests which are
+ diskless, mounting their root filesystem over a remote NFS-share.
+
+  There are not many options to tweak, but still a useful addition 
+ to the suite.
+
+
+xen-delete-image
+----------------
+
+  This script will allow you to completely remove Xen instances
+ which have previously been created by xen-create-image, this
+ includes removing the storage block devices from the system,
+ and deleting the Xen configuration file.
+
+
+xen-list-images
+---------------
+
+  List all the created images beneath a given root directory along
+ with a brief overview of their setup details.
+
+
+xen-update-image
+----------------
+
+  This script runs "apt-get update; apt-get upgrade" for a given
+ Xen image.
+
+  NOTES: 
+
+  *  The image should not be running or corruption will occur!
+  *  The script should only be used for Xen instances of Debian or
+    a Debian-derived distribution.
+
+
+Steve
+--
+

README.markdown

@@ -1,296 +0,0 @@
-xen-tools
-=========
-
-[![Travis CI Build Status](https://api.travis-ci.org/xen-tools/xen-tools.svg)](https://travis-ci.org/xen-tools/xen-tools)
-
-* [Homepage](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
------
-
-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
-network via [OpenSSH](http://www.openssh.org/).
-
-xen-tools currently has scripts to install most releases of
-[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.
-
-However, currently only Debian and Ubuntu releases are tested and
-known to work reliably, i.e.:
-
-### Debian
-
-* 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 (under development)
-* Bullseye 11 (knows about this future release name)
-* Bookworm 12 (knows about this future release name)
-* Sid (always under development; works at least at the moment of writing :-)
-
-### Ubuntu
-
-(only DomUs tested)
-
-* Dapper Drake 6.06 (LTS) [¹](#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)
-* 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 (under development)
-
-### Footnotes
-
-<dl compact="compact">
-
-<dt><a id="1" name="1">¹</a></dt><dd>
-
-Installation with `xen-create-image` and updating with
-`xen-update-image` might fail with newer kernels/distributions as Dom0
-without `vsyscall=emulate` on the kernel commandline.
-
-</dd><dt><a id="2" name="2">²</a></dt><dd>
-
-At least between debootstrap version 1.0.37
-and 1.0.93 (including) these distributions needs editing of
-`/usr/share/debootstrap/scripts/edgy`, see [#659360][1].
-
-</dd></dl>
-
-[1]: https://bugs.debian.org/659360
-    "debootstrap in Wheezy can no more build Ubuntu Edgy or earlier"
-
-[2]: http://www.linux-vserver.org/Installing_Ubuntu_8.04_Hardy_as_guest
-    "There is an issue with debootstrap on hardy not installing ksyslogd."
-
-### CentOS
-
-(only DomUs tested, pygrub support incomplete)
-
-* CentOS 5
-* CentOS 6
-
-Packages
---------
-
-xen-tools are available prepackaged in Debian (and derivates) and as
-source tar-ball for local installation. Installing from source should
-work flawlessly on most Linux systems that meet the installation
-requirements.
-
-Requirements
-------------
-
-To use these tools you'll need the following software:
-
-* [debootstrap](https://packages.debian.org/debootstrap)
-* Perl and the following Perl modules
-  * [Config::IniFiles](https://metacpan.org/release/Config-IniFiles)
-	([Debian Package libconfig-inifiles-perl](https://packages.debian.org/libconfig-inifiles-perl))
-  * [Text::Template](https://metacpan.org/release/Text-Template)
-	([Debian Package libtext-template-perl](https://packages.debian.org/libtext-template-perl))
-  * [Data::Validate::Domain](https://metacpan.org/release/Data-Validate-Domain)
-	([Debian Package libdata-validate-domain-perl](https://packages.debian.org/libdata-validate-domain-perl))
-  * [Data::Validate::IP](https://metacpan.org/release/Data-Validate-IP)
-	([Debian Package libdata-validate-ip-perl](https://packages.debian.org/libdata-validate-ip-perl))
-  * [Data::Validate::URI](https://metacpan.org/release/Data-Validate-URI)
-	([Debian Package libdata-validate-uri-perl](https://packages.debian.org/libdata-validate-uri-perl))
-  * [File::Slurp](https://metacpan.org/release/File-Slurp)
-	([Debian Package libfile-slurp-perl](https://packages.debian.org/libfile-slurp-perl))
-  * [File::Which](https://metacpan.org/release/File-Which)
-	([Debian Package libfile-which-perl](https://packages.debian.org/libfile-which-perl))
-  * and some more modules which are part of the Perl core and hence do not need to be installed separately.
-* "Make", if you are not installing through a package manager.
-
-You can try to install RPM-based distributions such as CentOS, or
-Fedora Core, but you will need a correctly installed and configured
-[rinse](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](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 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
-ball).
-
-
-The Scripts
------------
-
-Here is a brief description of each included script, for more thorough
-documentation please consult the appropriate man page.
-
-
-### xen-create-image
-
-This script is designed to create new images which may be used
-with the Xen hypervisor.
-
-This script performs the initial setup, then delegates the real
-work to a collection of helper scripts:
-
-* `xt-install-image`: Installs a distribution into a directory.
-
-* `xt-customize-image`: Run a collection of hook scripts to configure
-  the freshly installed system.
-
-* `xt-create-xen-config`: Create a configuration file in `/etc/xen`
-  such that Xen can boot the newly created machine.
-
-* `xt-guess-suite-and-mirror`: In case of a Debian or Ubuntu Dom0,
-  this script tries to guess the most suitable suite and mirror for
-  DomUs based on the Dom0's `/etc/apt/sources.list`.
-
-
-### xen-create-nfs
-
-This script is similar in spirit to `xen-create-image`, but much less
-complex.  It allows the creation of Xen guests which are diskless,
-mounting their root filesystem over a remote NFS-share.
-
-There are not many options to tweak, but still a useful addition 
-to the suite.
-
-
-### xen-delete-image
-
-This script will allow you to completely remove Xen instances which
-have previously been created by `xen-create-image`, this includes
-removing the storage block devices from the system, and deleting the
-Xen configuration file.
-
-
-### xen-list-images
-
-List all the created images beneath a given root directory along with
-a brief overview of their setup details.
-
-
-### xen-update-image
-
-This script runs "apt-get update; apt-get upgrade" for a given Xen
-image.
-
-#### NOTES
-
-* The image should not be running or corruption will occur!
-* 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 trailing zeroes are
-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

@@ -0,0 +1,42 @@
+
+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/
+
+  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
+
+  Included with the release you should find the file "BUGS" which
+ contains some notes on reporting bugs.
+
+
+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
+
+  The members of that list are very good at diagnosing issues with
+ networking, block devices, and other Xen oddities.
+
+
+
+Contact The Author
+------------------
+
+  As a last resort feel free to contact the author at <steve@steve.org.uk>.
+
+  I say last resort not because I'm unwilling to help, but because
+ it will take longer for me to respond to you personally and I hate
+ answering the same question multiple times.
+
+Steve
+-- 

SUPPORT.markdown

@@ -1,41 +0,0 @@
-Mailing List
-============
-
-For assistance on using, or customising, these scripts please consult
-the manpages initially, then the
-[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](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.
-
-
-Xen Queries
-===========
-
-If your query is mostly related to Xen, rather than these tools, then
-please consider joining the [xen-users mailing
-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](https://freenode.net/) IRC network.
-
-
-Contact The Author
-==================
-
-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
-because it may take longer for me to respond to you personally.
-
--- 
-Axel

TODO

@@ -0,0 +1,16 @@
+TODO
+----
+
+  1. Test and support more file system types.  Actually this should be
+    pretty simple now that the parameters are stored in the configuration
+    hash.  The only issue is that trailing whitespace is missing from the
+    "make_fs_foo" option.
+
+  2. Write more test cases.
+
+  3. LVM snapshot support as an install source.
+
+  4. xen-delete-image should unallocate any used IP addresses.
+
+Steve
+--

TODO.markdown

@@ -1,67 +0,0 @@
-TODO
-====
-
-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
----------------------------------------
-
-* Fix xdm and gdm roles wrt. to uptodate package names.
-
-* Test and support more file system types.
-
-  Actually this should be pretty simple now that the parameters are
-  stored in the configuration hash.
-
-* Setup locales in the hooks?
-
-  Currently no locales are set and this causes several domU errors
-  which appear in the domU's logs.
-
-* Generic grub support
-
-  This will generate a much nicer `menu.lst` as a side effect, as its
-  currently generated once at install, and is never updated. Installing
-  a full grub into the domU should update the `menu.lst` every time a
-  new kernel is installed and will also use the domU distro's `menu.lst`
-  conform.
-
-* More generic roles
-
-  Deploy a web server or setup ssmtp directly via flag when setting up
-  the machine. Open to suggestions, should just be some general use-cases
-  that are fairly common.
-
-* Sections for the xen-tools.conf file
-
-  Currently it's really annoying when you are trying to create VMs
-  on multiple subnets. It would be nice to specify with a flag what
-  "type" of configuration you want, and a set of options specific to
-  that flag could be parsed from xen-tools.conf
-
-* 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.
-
-* Make used Xen toolstack configurable, i.e. via --xen-toolstack=xl
-
-* Add test for `--size` constraints (upper- and lowercase letters,
-  with and without `B`, etc.)
-
-  * Needs a `--dry-run` or `--check-constraints` option in
-    `xen-create-image` first. Which probably both would be a good
-    idea.
-
-* Maybe check for `vsyscall=emulate` in `GRUB_CMDLINE_LINUX_DEFAULT`
-  in `/etc/default/grub` if trying to install an affected Linux
-  distribution.
-
-Stuff from Steve's TODO list / Generic TODOs
---------------------------------------------
-
-* Write more test cases.
-
-* `xen-delete-image` should unallocate any used IP addresses.

bin/xen-create-nfs

@@ -1,7 +1,5 @@
 #!/usr/bin/perl -w
 
-=encoding utf8
-
 =head1 NAME
 
 xen-create-nfs - Create a Xen configuration file for an NFS-root guest.
@@ -21,9 +19,8 @@ xen-create-nfs - Create a Xen configuration file for an NFS-root guest.
    --dhcp       Configure the guest to use DHCP for IP allocation.
    --gateway    The gateway address to use when configured with a static IP.
    --hostname   The hostname to configure for the guest.
-   --ip         The IP address to use when configured with a static IP.
    --netmask    The netmask to use when configured with a static IP.
-   --nameserver The nameserver to use when configured with a static IP.
+   --ip         The IP address to use when configured with a static IP.
 
   General options:
    --admins     Specify which users should be setup as xen-shell admins.
@@ -38,6 +35,8 @@ xen-create-nfs - Create a Xen configuration file for an NFS-root guest.
    --nfs_server Specify the NFS server to mount the root partition from.
    --nfs_root   Specify the path, upon the NFS server, to mount.
 
+=cut
+
 
 =head1 OPTIONS
 
@@ -55,8 +54,11 @@ Read the manual for this script.
 =item B<--version>
 Show the version number and exit.
 
+
 =back
 
+=cut
+
 
 =head1 DESCRIPTION
 
@@ -68,31 +70,38 @@ Show the version number and exit.
  support more than the minimal number of options to completement the
  existing xen-create-image script, however it is hopefully useful.
 
+=cut
+
 
 =head1 REFERENCE
 
   For more details on what you'll need to support NFS-root Xen guests
  the following article, written by the author, might be useful:
 
-    https://debian-administration.org/articles/505
+    http://www.debian-administration.org/articles/505
+
+=cut
 
 
-=head1 AUTHORS
+=head1 AUTHOR
 
- Steve Kemp, https://steve.fi/
- Stéphane Jourdois
+ Steve
+ --
+ http://www.steve.org.uk/
+
+=cut
 
 
 =head1 LICENSE
 
-Copyright (c) 2005-2009 by Steve Kemp, (c) 2010 by The Xen-Tools
-Development Team. All rights reserved.
+Copyright (c) 2005-2007 by Steve Kemp.  All rights reserved.
 
 This module is free software;
 you can redistribute it and/or modify it under
 the same terms as Perl itself.
 The LICENSE file contains the full text of the license.
 
+
 =cut
 
 
@@ -102,7 +111,7 @@ use Env;
 use Getopt::Long;
 use Pod::Usage;
 use Text::Template;
-use Xen::Tools::Common;
+
 
 
 #
@@ -115,23 +124,23 @@ my %CONFIG;
 #
 #  Default options
 #
-$CONFIG{ 'template' } = '/etc/xen-tools/xm-nfs.tmpl';
+$CONFIG{'template'} = '/etc/xen-tools/xm-nfs.tmpl';
 
 
 #
 # Release number.
 #
-my $RELEASE = '4.8';
+my $RELEASE = '3.9';
 
 
 # store version number away.
-$CONFIG{ 'xen_tools_version' } = $RELEASE;
+$CONFIG{'xen_tools_version'} = $RELEASE;
 
 
 #
 #  Read the global configuration file.
 #
-readConfigurationFile("/etc/xen-tools/xen-tools.conf", \%CONFIG);
+readConfigurationFile( "/etc/xen-tools/xen-tools.conf" );
 
 
 #
@@ -152,15 +161,15 @@ testArguments();
 if ( -e "/etc/xen/$CONFIG{'hostname'}.cfg" )
 {
     die "Configuration file for $CONFIG{'hostname'} already exists"
-      unless ( $CONFIG{ 'force' } );
+      unless( $CONFIG{'force'} );
 }
 
 #
 #  If we've been given any administrators then set them up.
 #
-if ( $CONFIG{ 'admins' } )
+if ( $CONFIG{'admins'} )
 {
-    setupAdminUsers(\%CONFIG);
+    setupAdminUsers();
 }
 
 #
@@ -176,6 +185,87 @@ createNewConfigurationFile();
 exit;
 
 
+
+=begin doc
+
+  Read the specified configuration file, and update our global configuration
+ hash with the values found in it.
+
+=end doc
+
+=cut
+
+sub readConfigurationFile
+{
+    my ($file) = ( @_ );
+
+    # Don't read the file if it doesn't exist.
+    return if ( ! -e $file );
+
+
+    my $line = "";
+
+    open( FILE, "<", $file ) or die "Cannot read file '$file' - $!";
+
+    while (defined($line = <FILE>) )
+    {
+        chomp $line;
+        if ($line =~ s/\\$//)
+        {
+            $line .= <FILE>;
+            redo unless eof(FILE);
+        }
+
+        # Skip lines beginning with comments
+        next if ( $line =~ /^([ \t]*)\#/ );
+
+        # Skip blank lines
+        next if ( length( $line ) < 1 );
+
+        # Strip trailing comments.
+        if ( $line =~ /(.*)\#(.*)/ )
+        {
+            $line = $1;
+        }
+
+        # Find variable settings
+        if ( $line =~ /([^=]+)=([^\n]+)/ )
+        {
+            my $key = $1;
+            my $val = $2;
+
+            # Strip leading and trailing whitespace.
+            $key =~ s/^\s+//;
+            $key =~ s/\s+$//;
+            $val =~ s/^\s+//;
+            $val =~ s/\s+$//;
+
+            # command expansion?
+            if ( $val =~ /(.*)`([^`]+)`(.*)/ )
+            {
+                # store
+                my $pre  = $1;
+                my $cmd  = $2;
+                my $post = $3;
+
+                # get output
+                my $output = `$cmd`;
+                chomp( $output );
+
+                # build up replacement.
+                $val = $pre . $output . $post;
+            }
+
+            # Store value.
+            $CONFIG{ $key } = $val;
+        }
+    }
+
+    close( FILE );
+}
+
+
+
 =begin doc
 
   Parse the command line arguments this script was given.
@@ -196,43 +286,48 @@ sub parseCommandLineArguments
     #
     GetOptions(
 
-        # Networking options
-        "dhcp",         \$CONFIG{ 'dhcp' },
-        "gateway=s",    \$CONFIG{ 'gateway' },
-        "broadcast=s",  \$CONFIG{ 'broadcast' },
-        "ip=s",         \$CONFIG{ 'ip' },
-        "netmask=s",    \$CONFIG{ 'netmask' },
-        "nameserver=s", \$CONFIG{ 'nameserver' },
-        "hostname=s",   \$CONFIG{ 'hostname' },
-        "memory=s",     \$CONFIG{ 'memory' },
-        "mac=s",        \$CONFIG{ 'mac' },
+               # Networking options
+               "dhcp",         \$CONFIG{'dhcp'},
+               "gateway=s",    \$CONFIG{'gateway'},
+               "broadcast=s",  \$CONFIG{'broadcast'},
+               "ip=s",         \$CONFIG{'ip'},
+               "netmask=s",    \$CONFIG{'netmask'},
+               "hostname=s",   \$CONFIG{'hostname'},
+               "memory=s",     \$CONFIG{'memory'},
+               "mac=s",        \$CONFIG{'mac'},
 
-        # NFS options.
-        "nfs_server=s", \$CONFIG{ 'nfs_server' },
-        "nfs_root=s",   \$CONFIG{ 'nfs_root' },
+               # NFS options.
+               "nfs_server=s", \$CONFIG{'nfs_server'},
+               "nfs_root=s",   \$CONFIG{'nfs_root'},
 
-        # Misc. options
-        "admins=s",   \$CONFIG{ 'admins' },
-        "kernel=s",   \$CONFIG{ 'kernel' },
-        "initrd=s",   \$CONFIG{ 'initrd' },
-        "force",      \$CONFIG{ 'force' },
-        "template=s", \$CONFIG{ 'template' },
+               # Misc. options
+               "admins=s",     \$CONFIG{'admins'},
+               "kernel=s",     \$CONFIG{'kernel'},
+               "initrd=s",     \$CONFIG{'initrd'},
+               "force",        \$CONFIG{'force'},
+               "template=s",   \$CONFIG{'template'},
 
-        # Help options
-        "help",    \$HELP,
-        "manual",  \$MANUAL,
-        "verbose", \$CONFIG{ 'verbose' },
-        "version", \$VERSION
+               # Help options
+               "help",         \$HELP,
+               "manual",       \$MANUAL,
+               "verbose",      \$CONFIG{'verbose'},
+               "version",      \$VERSION
 
-    );
+              );
 
     pod2usage(1) if $HELP;
-    pod2usage( -verbose => 2 ) if $MANUAL;
+    pod2usage(-verbose => 2 ) if $MANUAL;
 
 
-    if ($VERSION)
+    if ( $VERSION )
     {
-        logprint("xen-create-nfs release $RELEASE\n");
+        my $REVISION      = '$Revision: 1.13 $';
+        if ( $REVISION =~ /1.([0-9.]+) / )
+        {
+            $REVISION = $1;
+        }
+
+        logprint( "xen-create-nfs release $RELEASE - CVS: $REVISION\n" );
         exit;
     }
 }
@@ -249,68 +344,113 @@ sub parseCommandLineArguments
 
 sub testArguments
 {
-
     #
     #  Hostname is mandatory
     #
-    die "No hostname" unless ( $CONFIG{ 'hostname' } );
+    die "No hostname" unless( $CONFIG{'hostname'} );
 
     my @network = qw/ ip gateway netmask /;
 
     #
     #  If DHCP then all the other options aren't needed
     #
-    if ( $CONFIG{ 'dhcp' } )
+    if ( $CONFIG{'dhcp'} )
     {
-        foreach my $f (@network)
+        foreach my $f ( @network )
         {
             delete( $CONFIG{ $f } );
         }
     }
     else
     {
-        foreach my $f (@network)
+        foreach my $f ( @network )
         {
-            die "Missing --$f" unless ( $CONFIG{ $f } );
+            die "Missing --$f" unless( $CONFIG{$f} );
         }
     }
 
     #
     #  We need an NFS server + root
     #
-    die "Missing NFS server." unless ( $CONFIG{ 'nfs_server' } );
-    die "Missing NFS root."   unless ( $CONFIG{ 'nfs_root' } );
+    die "Missing NFS server." unless( $CONFIG{'nfs_server'} );
+    die "Missing NFS root."   unless( $CONFIG{'nfs_root'} );
 
 
-    # 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...
-
-    if ( exists($CONFIG{ 'memory' }) and
-         defined($CONFIG{ 'memory' }) ) {
-
-        #
-        #  The memory size:  Convert Gb -> Mb.
-        #
-        if ( $CONFIG{ 'memory' } =~ /^(\d+)Gb.*$/i )
-        {
-            $CONFIG{ 'memory' } = $1 * 1024;
-        }
-
-        #
-        #  Remove any trailing Mb.
-        #
-        if ( $CONFIG{ 'memory' } =~ /^(\d+)Mb.*$/i )
-        {
-            $CONFIG{ 'memory' } = $1;
-        }
-
-    }
     # All OK.
 }
 
 
 
+
+=begin doc
+
+  This routine is designed to ensure that any users specified with
+ the --admins flag are setup as administrators of the new instance.
+
+=end doc
+
+=cut
+
+sub setupAdminUsers
+{
+    #
+    #  If we're not root we can't modify users.
+    #
+    return if ( $EFFECTIVE_USER_ID != 0 );
+
+    #
+    #  If we don't have a sudoers file then we'll also ignore this.
+    #
+    return if ( ! -e "/etc/sudoers" );
+
+    #
+    #  Find the path to the xen-login-shell
+    #
+    my $shell = undef;
+    $shell = "/usr/bin/xen-login-shell" if ( -x "/usr/bin/xen-login-shell" );
+    $shell = "/usr/local/bin/xen-login-shell" if ( -x "/usr/bin/local/xen-login-shell" );
+
+    return if ( !defined( $shell ) );
+
+
+    #
+    #  For each user make sure they exist, and setup the
+    # login shell for them.
+    #
+    foreach my $user ( split( /,/, $ENV{'admins'} ) )
+    {
+        # Strip leading and trailing whitespace.
+        $user =~ s/^\s+//;
+        $user =~ s/\s+$//;
+
+        # Ignore root
+        next if ( $user =~ /^root$/i );
+
+        # Does the user exist?
+        if ( getpwnam($user) )
+        {
+            # Change shell.
+            $CONFIG{'verbose'} && print "Changing shell for $user: $shell\n";
+            system( "chsh", "-s", $shell, $user );
+        }
+        else
+        {
+            # Add a new user.
+            $CONFIG{'verbose'} && print "Adding new user: $user\n";
+            system( "useradd", "-s", $shell, $user );
+        }
+
+        #
+        #  Add the entry to /etc/sudoers.
+        #
+        open( SUDOERS, ">>", "/etc/sudoers" ) or warn "Failed to add user to sudoers file : $user - $!";
+        print SUDOERS "$user ALL = NOPASSWD: /usr/sbin/xm, /usr/bin/xen-create-image\n";
+        close( SUDOERS );
+
+    }
+}
+
+
 =begin doc
 
   Create the Xen configuration file for our new Xen guest.
@@ -321,16 +461,15 @@ sub testArguments
 
 sub createNewConfigurationFile
 {
-    die "Template file missing: $CONFIG{'template'}"
-      unless ( -e $CONFIG{ 'template' } );
+    die "Template file missing: $CONFIG{'template'}" unless( -e $CONFIG{'template'} );
 
     #
     #  Load the template.
     #
     my $template = new Text::Template( TYPE   => 'FILE',
-                                       SOURCE => $CONFIG{ 'template' } );
+                                       SOURCE => $CONFIG{'template'} );
 
-    my $result = $template->fill_in( HASH => \%CONFIG );
+    my $result   = $template->fill_in( HASH => \%CONFIG );
 
     #
     #  The file we'll write to.
@@ -342,5 +481,5 @@ sub createNewConfigurationFile
     #
     open( FILE, ">", $file ) or die "Failed to write to $file - $!";
     print FILE $result;
-    close(FILE);
+    close( FILE );
 }

bin/xen-delete-image

@@ -1,7 +1,5 @@
 #!/usr/bin/perl -w
 
-=encoding utf8
-
 =head1 NAME
 
 xen-delete-image - Delete previously created Xen instances.
@@ -10,10 +8,6 @@ xen-delete-image - Delete previously created Xen instances.
 
   xen-delete-image [options] [--hostname=]imageName1 [--hostname=]imageName2
 
-  Filename Options:
-   --extension  Specify the file extension to use. An empty extension is equal
-                to any extension.
-
   Help Options:
    --help     Show help information.
    --manual   Read the manual for this script.
@@ -22,15 +16,16 @@ xen-delete-image - Delete previously created Xen instances.
 
   General options:
    --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.
+   --evms     Specify the EVMS container to use.
 
   Specifying hosts:
    --hostname Specify the image name to delete.
 
   Testing options:
-   --test      Don't complain if we're not invoked by root.
+   --test     Don't complain if we're not invoked by root.
+
+=cut
 
 
 =head1 OPTIONS
@@ -52,21 +47,20 @@ 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.
 
 =item B<--test>
-Do not complain, or exit, if the script is not executed by the root
-user. (Only works in conjunction with --dir.)
+Don not complain, or exit, if the script is not executed by the root user.
 
 =item B<--version>
 Show the version number and exit.
 
+
 =back
 
+=cut
+
 
 =head1 DESCRIPTION
 
@@ -80,6 +74,8 @@ Show the version number and exit.
  but will fail to remove anything which the user does not have permission
  to delete.)
 
+=cut
+
 
 =head1 LOOPBACK EXAMPLE
 
@@ -95,6 +91,8 @@ Show the version number and exit.
   (The matching Xen configuration files beneath /etc/xen will also be
  removed.)
 
+=cut
+
 
 =head1 LVM EXAMPLE
 
@@ -111,6 +109,8 @@ Show the version number and exit.
 
   The Xen configuration files will also be removed from beneath /etc/xen.
 
+=cut
+
 
 =head1 EVMS EXAMPLE
 
@@ -127,24 +127,28 @@ Show the version number and exit.
 
   The Xen configuration files will also be removed.
 
+=cut
 
-=head1 AUTHORS
 
- Steve Kemp, https://steve.fi/
- Axel Beckert, https://axel.beckert.ch/
- Stéphane Jourdois
+=head1 AUTHOR
+
+ Steve
+ --
+ http://www.steve.org.uk/
+
+=cut
 
 
 =head1 LICENSE
 
-Copyright (c) 2005-2009 by Steve Kemp, (c) 2010-2013 by The Xen-Tools
-Development Team. All rights reserved.
+Copyright (c) 2005-2007 by Steve Kemp.  All rights reserved.
 
 This module is free software;
 you can redistribute it and/or modify it under
 the same terms as Perl itself.
 The LICENSE file contains the full text of the license.
 
+
 =cut
 
 
@@ -152,8 +156,6 @@ use strict;
 use English;
 use Getopt::Long;
 use Pod::Usage;
-use File::Path;
-use Xen::Tools::Common;
 
 
 #
@@ -167,18 +169,9 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.8';
+my $RELEASE = '3.9';
 
 
-#
-# Find xen toolstack command
-#
-$CONFIG{ 'xm' } = findXenToolstack();
-
-#
-#  Default values
-#
-$CONFIG{ 'extension' } = '.cfg';
 
 
 #
@@ -186,7 +179,7 @@ $CONFIG{ 'extension' } = '.cfg';
 #
 if ( -e "/etc/xen-tools/xen-tools.conf" )
 {
-    readConfigurationFile("/etc/xen-tools/xen-tools.conf", \%CONFIG);
+    readConfigurationFile( "/etc/xen-tools/xen-tools.conf" );
 }
 
 
@@ -206,14 +199,14 @@ checkArguments();
 #
 #  Abort if non-root user.
 #
-if ( ( !$CONFIG{ 'test' } ) && ( $EFFECTIVE_USER_ID != 0 ) )
+if ( (!$CONFIG{'test'}) && ( $EFFECTIVE_USER_ID != 0 ) )
 {
-    print <<EOROOT;
+    print <<E_O_ROOT;
 
   This script is not running with root privileges, so the configuration
  file(s) beneath /etc/xen will not be removed.
 
-EOROOT
+E_O_ROOT
 
     exit 127;
 }
@@ -222,23 +215,29 @@ EOROOT
 
 #
 #  Loop over the supplied arguments, and attempt to delete each
-# image. Check both, bare parameters as well as --hostname options.
+# image.
 #
-
-my @hosts = ();
-if (exists($CONFIG{ 'hostname' }) and defined($CONFIG{ 'hostname' })) {
-    my $hostname_option = $CONFIG{ 'hostname' };
-    @hosts = 'ARRAY' eq ref($hostname_option) ?
-        @$hostname_option : $hostname_option;
+while( my $name = shift )
+{
+    if ( !xenRunning( $name ) )
+    {
+        deleteXenImage( $name );
+    }
+    else
+    {
+        print "Skipping xen guest '$name' - it appears to be running.\n";
+    }
 }
 
-foreach my $name (@ARGV, @hosts)
+#
+#  Also delete any which were specified using the --hostname flag
+#
+my $hosts = $CONFIG{'hostname'};
+foreach my $name ( @$hosts )
 {
-    my %PER_HOST_CONFIG = %CONFIG;
-    $PER_HOST_CONFIG{ 'hostname' } = $name;
-    unless ( xenRunning($name, \%PER_HOST_CONFIG) )
+    if ( !xenRunning( $name ) )
     {
-        deleteXenImage($name);
+        deleteXenImage( $name );
     }
     else
     {
@@ -254,6 +253,82 @@ exit 0;
 
 
 
+=begin doc
+
+  Read the configuration file specified.
+
+=end doc
+
+=cut
+
+sub readConfigurationFile
+{
+    my ($file) = ( @_ );
+
+    open( FILE, "<", $file ) or die "Cannot read file '$file' - $!";
+
+    my $line       = "";
+
+    while (defined($line = <FILE>) )
+    {
+        chomp $line;
+        if ($line =~ s/\\$//)
+        {
+            $line .= <FILE>;
+            redo unless eof(FILE);
+        }
+
+        # Skip lines beginning with comments
+        next if ( $line =~ /^([ \t]*)\#/ );
+
+        # Skip blank lines
+        next if ( length( $line ) < 1 );
+
+        # Strip trailing comments.
+        if ( $line =~ /(.*)\#(.*)/ )
+        {
+            $line = $1;
+        }
+
+        # Find variable settings
+        if ( $line =~ /([^=]+)=([^\n]+)/ )
+        {
+            my $key = $1;
+            my $val = $2;
+
+            # Strip leading and trailing whitespace.
+            $key =~ s/^\s+//;
+            $key =~ s/\s+$//;
+            $val =~ s/^\s+//;
+            $val =~ s/\s+$//;
+
+            # command expansion?
+            if ( $val =~ /(.*)`([^`]+)`(.*)/ )
+            {
+                # store
+                my $pre  = $1;
+                my $cmd  = $2;
+                my $post = $3;
+
+                # get output
+                my $output = `$cmd`;
+                chomp( $output );
+
+                # build up replacement.
+                $val = $pre . $output . $post;
+            }
+
+            # Store value.
+            $CONFIG{ $key } = $val;
+        }
+    }
+
+    close( FILE );
+}
+
+
+
+
 =begin doc
 
   Parse the arguments specified upon the command line.
@@ -267,33 +342,36 @@ sub parseCommandLineArguments
     my $HELP    = 0;
     my $MANUAL  = 0;
     my $VERSION = 0;
-    $CONFIG{ 'dry-run' } = 0;
 
     #  Parse options.
     #
-    GetOptions( "dir=s",       \$CONFIG{ 'dir' },
-                "dry-run",     \$CONFIG{ 'dry-run' },
-                "lvm=s",       \$CONFIG{ 'lvm' },
-                "evms=s",      \$CONFIG{ 'evms' },
-                "zpool=s",     \$CONFIG{ 'zpool' },
-                "extension:s", \$CONFIG{ 'extension' },
-                "hostname=s@", \$CONFIG{ 'hostname' },
-                "test",        \$CONFIG{ 'test' },
-                "verbose",     \$CONFIG{ 'verbose' },
-                "no-xen-ok",   sub { warn "Option --no-xen-ok is deprecated and ignored."; },
-                "help",        \$HELP,
-                "manual",      \$MANUAL,
-                "version",     \$VERSION
-              );
+    GetOptions(
+              "dir=s",       \$CONFIG{'dir'},
+              "lvm=s",       \$CONFIG{'lvm'},
+              "evms=s",      \$CONFIG{'evms'},
+              "hostname=s@", \$CONFIG{'hostname'},
+              "test",        \$CONFIG{'test'},
+              "verbose",     \$CONFIG{'verbose'},
+              "help",        \$HELP,
+              "manual",      \$MANUAL,
+              "version",     \$VERSION
+             );
 
     pod2usage(1) if $HELP;
-    pod2usage( -verbose => 2 ) if $MANUAL;
+    pod2usage(-verbose => 2 ) if $MANUAL;
 
 
-    if ($VERSION)
+    if ( $VERSION )
     {
-        print "xen-delete-image release $RELEASE\n";
-        exit;
+       my $REVISION      = '$Revision: 1.41 $';
+
+       if ( $REVISION =~ /1.([0-9.]+) / )
+       {
+           $REVISION = $1;
+       }
+
+       print "xen-delete-image release $RELEASE - CVS: $REVISION\n";
+       exit;
 
     }
 }
@@ -310,23 +388,22 @@ sub parseCommandLineArguments
 
 sub checkArguments
 {
-
     #
     #  When testing we only care about loopback images, not disk images.
     #
-    if ( $CONFIG{ 'test' } and ( $CONFIG{ 'lvm' } or $CONFIG{ 'evms' } or $CONFIG{ 'zpool' } ))
+    if ( $CONFIG{'test'} )
     {
-        print "Error: --test only works with --dir.\n";
-        exit 1;
+        $CONFIG{'lvm'}  = undef;
+        $CONFIG{'evms'} = undef;
     }
 
     #
     #  Make sure we got one and only one installation method.
     #
     my $count = 0;
-    foreach my $type (qw/dir lvm evms zpool/)
+    foreach my $type ( qw/dir lvm evms/ )
     {
-        $count += 1 if defined( $CONFIG{ $type } );
+        $count += 1 if defined( $CONFIG{$type} );
     }
 
     #
@@ -335,17 +412,44 @@ sub checkArguments
     #
     if ( $count != 1 )
     {
-        print "Please select one and only one of the installation methods to delete the DomU:\n";
-        print " --dir\n";
-        print " --evms\n";
-        print " --lvm\n";
-        print " --zpool\n";
-        exit 2;
+       print "Please select one and only one of the installation methods:\n";
+       print " --dir\n";
+       print " --evms\n";
+       print " --lvm\n";
+       exit;
     }
 }
 
 
 
+
+=begin doc
+
+  Test to see if the given instance is running.
+
+=end doc
+
+=cut
+
+sub xenRunning
+{
+    my( $hostname ) =  (@_ );
+
+    my $running = 0;
+
+    open( CMD, "xm list $hostname 2>/dev/null |")
+      or die "Failed to run 'xm list $hostname'";
+    while( <CMD> )
+    {
+        my $line = $_;
+        $running = 1 if ( $line =~ /\Q$hostname\E/ )
+    }
+    close( CMD );
+
+    return( $running );
+}
+
+
 =begin doc
 
   Delete the named image, and the corresponding configuration file
@@ -357,7 +461,7 @@ sub checkArguments
 
 sub deleteXenImage
 {
-    my ($hostname) = (@_);
+    my ($hostname) = ( @_ );
 
     #
     #  Collect the names of files to delete.
@@ -367,32 +471,28 @@ sub deleteXenImage
     #
     #  Delete the Xen auto-start file if it exists.
     #
-    if ( -e "/etc/xen/auto/$hostname".$CONFIG{ 'extension' } )
+    if ( -e "/etc/xen/auto/$hostname.cfg" )
     {
-        push( @delete, "/etc/xen/auto/$hostname".$CONFIG{ 'extension' } );
+        push( @delete, "/etc/xen/auto/$hostname.cfg" );
     }
 
     #
     #  Delete the Xen configuration file if it exists.
     #
-    if ( -e "/etc/xen/$hostname".$CONFIG{ 'extension' } )
+    if ( -e "/etc/xen/$hostname.cfg" )
     {
-        push( @delete, "/etc/xen/$hostname".$CONFIG{ 'extension' } );
+        push( @delete, "/etc/xen/$hostname.cfg" );
     }
 
     #
     #  If we're working on disk images remove them.
     #
-    foreach my $file (@delete)
+    foreach my $file ( @delete )
     {
         if ( -e $file )
         {
-            if ($CONFIG{ 'dry-run' }) {
-                print "Would delete: $file\n";
-            } else {
-                print "Deleting: $file\n";
-                unlink($file);
-            }
+            print "Deleting: $file\n";
+            unlink( $file );
         }
         else
         {
@@ -400,127 +500,133 @@ sub deleteXenImage
         }
     }
 
-    my %PER_HOST_CONFIG = %CONFIG;
-    $PER_HOST_CONFIG{ 'hostname' } = $hostname;
-    if ( defined( $CONFIG{ 'dir' } ) )
-    {
-        my $prefix = $CONFIG{ 'dir' } . "/domains/";
 
-        #
-        #  Now remove the directory.
-        #
-        if ( -d $prefix . $hostname )
-        {
-            if ($CONFIG{ 'dry-run' }) {
-                print "Would delete: $prefix$hostname\n";
-            } else {
-                print "Removing: " . $prefix . $hostname . "\n";
-                rmtree( $prefix . $hostname );
-            }
-        }
+    if ( defined( $CONFIG{'dir'} ) )
+    {
+       my $prefix = $CONFIG{'dir'} . "/domains/";
+
+       #
+       #  Now remove the directory.
+       #
+       if ( -d $prefix . $hostname )
+       {
+           print "Removing: " . $prefix . $hostname . "\n";
+           rmdir ( $prefix . $hostname );
+       }
     }
-    elsif ( defined( $CONFIG{ 'lvm' } ) )
+    elsif ( defined( $CONFIG{'lvm'} ) )
     {
+       #
+       #  LVM volumes
+       #
+       #
+       #  TODO: Check we're not mounted.
+       #
 
-        #
-        #  LVM volumes
-        #
-        #
-        #  TODO: Check we're not mounted.
-        #
+       if ( -e "/dev/$CONFIG{'lvm'}/$hostname-swap" )
+       {
+           print "Removing swap volume\n";
+           runCommand( "lvremove /dev/$CONFIG{'lvm'}/$hostname-swap --force" );
+       }
 
-        if ( -e "/dev/$CONFIG{'lvm'}/$hostname-swap" )
-        {
-            if ($CONFIG{ 'dry-run' }) {
-                print "Would remove LVM swap volume /dev/$CONFIG{'lvm'}/$hostname-swap\n";
-            } else {
-                print "Removing swap volume\n";
-                runCommand("lvremove /dev/$CONFIG{'lvm'}/$hostname-swap --force", \%PER_HOST_CONFIG);
-            }
-        }
-
-        if ( -e "/dev/$CONFIG{'lvm'}/$hostname-disk" )
-        {
-            if ($CONFIG{ 'dry-run' }) {
-                print "Would remove LVM disk volume /dev/$CONFIG{'lvm'}/$hostname-disk\n";
-            } else {
-                print "Removing LVM disk volume\n";
-                runCommand("lvremove /dev/$CONFIG{'lvm'}/$hostname-disk --force", \%PER_HOST_CONFIG);
-            }
-        }
+       if ( -e "/dev/$CONFIG{'lvm'}/$hostname-disk" )
+       {
+           print "Removing LVM disk volume\n";
+           runCommand( "lvremove /dev/$CONFIG{'lvm'}/$hostname-disk --force" );
+       }
 
     }
-    elsif ( defined( $CONFIG{ 'evms' } ) )
+    elsif ( defined( $CONFIG{'evms'} ) )
     {
+       #
+       #  EVMS volumes
+       #
+       #
+       #  TODO: Check we're not mounted.
+       #
 
-        #
-        #  EVMS volumes
-        #
-        #
-        #  TODO: Check we're not mounted.
-        #
+       if ( -e "/dev/evms/$hostname-swap" )
+       {
+           print "Removing EVMS swap volume\n";
+           runCommand( "echo Delete : /dev/evms/$hostname-swap | evms" );
+           runCommand( "echo Delete : $CONFIG{'evms'}/$hostname-swap | evms" );
+       }
 
-        if ( -e "/dev/evms/$hostname-swap" )
-        {
-            if ($CONFIG{ 'dry-run' }) {
-                print "Would remove EVMS swap volume: /dev/evms/$hostname-swap\n";
-                print "Would remove EVMS swap volume: $CONFIG{'evms'}/$hostname-swap\n";
-            } else {
-                print "Removing EVMS swap volume\n";
-                runCommand("echo Delete : /dev/evms/$hostname-swap | evms", \%PER_HOST_CONFIG);
-                runCommand("echo Delete : $CONFIG{'evms'}/$hostname-swap | evms", \%PER_HOST_CONFIG);
-            }
-        }
-
-        if ( -e "/dev/evms/$hostname-disk" )
-        {
-            if ($CONFIG{ 'dry-run' }) {
-                print "Would remove EVMS disk volume: /dev/evms/$hostname-swap\n";
-                print "Would remove EVMS disk volume: $CONFIG{'evms'}/$hostname-swap\n";
-            } else {
-                print "Removing EVMS disk volume\n";
-                runCommand("echo Delete : /dev/evms/$hostname-disk | evms", \%PER_HOST_CONFIG);
-                runCommand("echo Delete : $CONFIG{'evms'}/$hostname-disk | evms", \%PER_HOST_CONFIG);
-            }
-        }
-
-    }
-    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);
-            }
-        }
+       if ( -e "/dev/evms/$hostname-disk" )
+       {
+           print "Removing EVMS disk volume\n";
+           runCommand( "echo Delete : /dev/evms/$hostname-disk | evms" );
+           runCommand( "echo Delete : $CONFIG{'evms'}/$hostname-disk | evms" );
+       }
 
     }
     else
     {
-        print "Error:  No installation type specified\n";
-        print "Can't happen!\n";
-        print "Hostname : $hostname\n";
-        exit 127;
+       print "Error:  No installation type specified\n";
+       print "Can't happen!\n";
+       print "Hostname : $hostname\n";
+       exit 127;
     }
 }
+
+
+
+=begin doc
+
+  A utility method to run a system command.  We will capture the return
+ value and exit if the command files.
+
+  When running verbosely we will also display any command output.
+
+=end doc
+
+=cut
+
+sub runCommand
+{
+    my ( $cmd ) = (@_ );
+
+    #
+    #  Header.
+    #
+    $CONFIG{'verbose'} && print "Executing : $cmd\n";
+
+    #
+    #  Hide output unless running with --debug.
+    #
+    if ( $CONFIG{'verbose'} )
+    {
+       #
+       #  Copy stderr to stdout, so we can see it.
+       #
+       $cmd .= " 2>&1";
+    }
+    else
+    {
+       $cmd .= " >/dev/null 2>/dev/null" ;
+    }
+
+
+    #
+    #  Run it.
+    #
+    my $output = `$cmd`;
+
+    if ( $? != 0 )
+    {
+       print "Running command '$cmd' failed.\n";
+       print "Aborting\n";
+       exit;
+    }
+
+
+    #
+    # All done.
+    #
+    $CONFIG{'verbose'} && print "Output\n";
+    $CONFIG{'verbose'} && print "======\n";
+    $CONFIG{'verbose'} && print $output . "\n";
+    $CONFIG{'verbose'} && print "Finished : $cmd\n";
+
+    return( $output );
+}

bin/xen-list-images

@@ -1,7 +1,5 @@
 #!/usr/bin/perl -w
 
-=encoding utf8
-
 =head1 NAME
 
 xen-list-images - List all the created and configured Xen images.
@@ -10,10 +8,6 @@ xen-list-images - List all the created and configured Xen images.
 
   xen-list-image [options]
 
-  Filename Options:
-   --extension  Specify the file extension to use. An empty extension is equal
-                to any extension.
-
   Help Options:
    --help     Show this scripts help information.
    --manual   Read this scripts manual.
@@ -22,7 +16,6 @@ xen-list-images - List all the created and configured Xen images.
   Testing options:
    --test     Specify an alternate Xen configuration directory.
 
-
 =head1 OPTIONS
 
 =over 8
@@ -55,23 +48,28 @@ Show the version number and exit.
  and then either the IP address configured, or "DHCP" to denote
  a dynamic host.
 
+=cut
 
 =head1 TODO
 
   It should be possible to determine the disk(s) used by the images,
  and then display their sizes.
 
+=cut
 
-=head1 AUTHORS
 
- Steve Kemp, https://steve.fi/
- Stéphane Jourdois
+=head1 AUTHOR
+
+ Steve
+ --
+ http://www.steve.org.uk/
+
+=cut
 
 
 =head1 LICENSE
 
-Copyright (c) 2005-2009 by Steve Kemp, (c) 2010-2013 by The Xen-Tools
-Development Team. All rights reserved.
+Copyright (c) 2005-2007 by Steve Kemp.  All rights reserved.
 
 This module is free software;
 you can redistribute it and/or modify it under
@@ -86,7 +84,6 @@ use English;
 use File::Temp qw/ tempdir /;
 use Getopt::Long;
 use Pod::Usage;
-use Xen::Tools::Common;
 
 
 #
@@ -98,22 +95,21 @@ use Xen::Tools::Common;
 my %CONFIG;
 
 #
-#  Default values
+#  Default prefix
 #
-$CONFIG{ 'prefix' } = "/etc/xen";
-$CONFIG{ 'extension' } = '.cfg';
+$CONFIG{'prefix'} = "/etc/xen";
 
 #
 # Release number.
 #
-my $RELEASE = '4.8';
+my $RELEASE = '3.9';
 
 
 
 #
 #  Read the global configuration file if it exists.
 #
-readConfigurationFile("/etc/xen-tools/xen-tools.conf", \%CONFIG);
+readConfigurationFile( "/etc/xen-tools/xen-tools.conf" );
 
 
 #
@@ -133,11 +129,11 @@ my @instances = findXenInstances();
 #  Now process each instance.
 #
 my $count = 0;
-foreach my $instance (@instances)
+foreach my $instance ( @instances )
 {
-    if ($count) {print "\n";}
+    if ( $count ) { print "\n"; }
 
-    displayInstance($instance);
+    displayInstance( $instance );
     $count += 1;
 }
 
@@ -149,6 +145,83 @@ exit;
 
 
 
+=begin doc
+
+  Read the configuration file specified.
+
+=end doc
+
+=cut
+
+sub readConfigurationFile
+{
+    my ($file) = ( @_ );
+
+    # Don't read the file if it doesn't exist.
+    return if ( ! -e $file );
+
+    open( FILE, "<", $file ) or die "Cannot read file '$file' - $!";
+
+
+    while (defined(my $line = <FILE>) )
+    {
+        chomp $line;
+        if ($line =~ s/\\$//)
+        {
+            $line .= <FILE>;
+            redo unless eof(FILE);
+        }
+
+        # Skip lines beginning with comments
+        next if ( $line =~ /^([ \t]*)\#/ );
+
+        # Skip blank lines
+        next if ( length( $line ) < 1 );
+
+        # Strip trailing comments.
+        if ( $line =~ /(.*)\#(.*)/ )
+        {
+            $line = $1;
+        }
+
+        # Find variable settings
+        if ( $line =~ /([^=]+)=([^\n]+)/ )
+        {
+            my $key = $1;
+            my $val = $2;
+
+            # Strip leading and trailing whitespace.
+            $key =~ s/^\s+//;
+            $key =~ s/\s+$//;
+            $val =~ s/^\s+//;
+            $val =~ s/\s+$//;
+
+            # command expansion?
+            if ( $val =~ /(.*)`([^`]+)`(.*)/ )
+            {
+                # store
+                my $pre  = $1;
+                my $cmd  = $2;
+                my $post = $3;
+
+                # get output
+                my $output = `$cmd`;
+                chomp( $output );
+
+                # build up replacement.
+                $val = $pre . $output . $post;
+            }
+
+            # Store value.
+            $CONFIG{ $key } = $val;
+        }
+    }
+    close( FILE );
+}
+
+
+
+
 =begin doc
 
   Parse the arguments specified upon the command line.
@@ -161,23 +234,30 @@ sub parseCommandLineArguments
 {
     my $HELP    = 0;
     my $MANUAL  = 0;
-    my $VERSION = 0;
+    my $VERSION        = 0;
 
     #  Parse options.
     #
-    GetOptions( "test=s", \$CONFIG{ 'prefix' },
-                "extension:s", \$CONFIG{ 'extension' },
-                "help", \$HELP,
-                "manual", \$MANUAL,
-                "version", \$VERSION );
+    GetOptions(
+               "test=s",     \$CONFIG{'prefix'},
+               "help",       \$HELP,
+               "manual",     \$MANUAL,
+               "version",    \$VERSION
+             );
 
     pod2usage(1) if $HELP;
-    pod2usage( -verbose => 2 ) if $MANUAL;
+    pod2usage(-verbose => 2 ) if $MANUAL;
 
 
-    if ($VERSION)
+    if ( $VERSION )
     {
-        print "xen-list-images release $RELEASE\n";
+        my $REVISION      = '$Revision: 1.30 $';
+        if ( $REVISION =~ /1.([0-9.]+) / )
+        {
+            $REVISION = $1;
+        }
+
+        print "xen-list-images release $RELEASE - CVS: $REVISION\n";
         exit;
     }
 }
@@ -197,22 +277,19 @@ sub findXenInstances
 {
     my @found;
 
-    foreach my $file ( sort( glob( $CONFIG{ 'prefix' } . "/*" . $CONFIG{ 'extension' } ) ) )
+    foreach my $file ( sort( glob( $CONFIG{'prefix'} . "/*.cfg" ) ) )
     {
-        push @found, $file if (
-            -f $file and
-            $file !~ m(~$|\.dpkg-[a-z]+$|\.sxp$|/xl\.conf$)
-            );
+        push @found, $file if ( -e $file );
     }
 
-    return (@found);
+    return( @found );
 }
 
 
 
 =begin doc
 
-  Show details about the Xen instance contained in the given
+  Show details about the the Xen instance contained in the given
  configuration file.
 
 =end doc
@@ -221,14 +298,14 @@ sub findXenInstances
 
 sub displayInstance
 {
-    my ($file) = (@_);
+    my ( $file ) = ( @_ );
 
     #
     #  Read each line.
     #
     open( FILY, "<", $file );
     my @LINES = <FILY>;
-    close(FILY);
+    close( FILY );
 
     #
     #  Is it dynamic?
@@ -239,7 +316,7 @@ sub displayInstance
     my $name = '';
     my $mem  = 0;
 
-    foreach my $line (@LINES)
+    foreach my $line ( @LINES )
     {
         if ( $line =~ /^\s*dhcp\s*=\s*"dhcp\"/i )
         {
@@ -249,7 +326,7 @@ sub displayInstance
         {
             $name = $1;
         }
-        if ( $line =~ /^\s*memory[^0-9]*([0-9]+)/i )
+        if ( $line =~ /.*memory[^0-9]*([0-9]+)/i )
         {
             $mem = $1;
         }
@@ -264,10 +341,9 @@ sub displayInstance
     }
 
     print "Name: $name\n";
-    print "Memory: $mem MB\n";
-    print "IP: " . $ip . $mac . "\n" if length($ip);
+    print "Memory: $mem\n";
+    print "IP: "  . $ip . $mac . "\n" if length( $ip );
     print "DHCP" . $mac . "\n" if $dhcp;
-    print "Config: $file\n";
 }
 
 

bin/xen-resize-guest

@@ -1,7 +1,5 @@
 #!/usr/bin/perl -w
 
-=encoding utf8
-
 =head1 NAME
 
 xen-resize-guest - Resize a loopback or LVM based xen guest.
@@ -22,6 +20,8 @@ xen-resize-guest - Resize a loopback or LVM based xen guest.
    --force    Force the resize to happen without a last-chance delay.
    --hostname Specify the hostname of the guest to resize.
 
+=cut
+
 
 =head1 OPTIONS
 
@@ -53,6 +53,8 @@ Show the version number and exit.
 
 =back
 
+=cut
+
 
 =head1 DESCRIPTION
 
@@ -72,23 +74,27 @@ Show the version number and exit.
   More than once I've heard of users making mistakes and breaking their
  filesystems; hence this tool.
 
+=cut
 
-=head1 AUTHORS
+=head1 AUTHOR
 
- Steve Kemp, https://steve.fi/
- Axel Beckert, https://axel.beckert.ch/
+ Steve
+ --
+ http://www.steve.org.uk/
+
+=cut
 
 
 =head1 LICENSE
 
-Copyright (c) 2005-2009 by Steve Kemp, (c) 2010 by The Xen-Tools
-Development Team. All rights reserved.
+Copyright (c) 2005-2007 by Steve Kemp.  All rights reserved.
 
 This module is free software;
 you can redistribute it and/or modify it under
 the same terms as Perl itself.
 The LICENSE file contains the full text of the license.
 
+
 =cut
 
 
@@ -98,7 +104,8 @@ use Env;
 use Getopt::Long;
 use Pod::Usage;
 use Text::Template;
-use Xen::Tools::Common;
+
+
 
 
 
@@ -111,19 +118,14 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.8';
+my $RELEASE = '3.9';
 
 
-#
-# Find xen toolstack command
-#
-$CONFIG{ 'xm' } = findXenToolstack();
-
 
 #
 #  Read the global configuration file.
 #
-readConfigurationFile("/etc/xen-tools/xen-tools.conf", \%CONFIG);
+readConfigurationFile( "/etc/xen-tools/xen-tools.conf" );
 
 
 #
@@ -143,15 +145,13 @@ testArguments();
 #
 my $path = undef;
 
-if ( $CONFIG{ 'dir' } )
+if ( $CONFIG{'dir'} )
 {
-
     #
     #  Make sure we can find the disk
     #
-    $path =
-      $CONFIG{ 'dir' } . "/domains/" . $CONFIG{ 'hostname' } . "/disk.img";
-    if ( !-e $path )
+    $path = $CONFIG{'dir'} . "/domains/" . $CONFIG{'hostname'} . "/disk.img";
+    if ( ! -e $path )
     {
         print <<EOF;
 
@@ -188,7 +188,7 @@ EOF
     #
     #  Allow panic
     #
-    if ( !$CONFIG{ 'force' } )
+    if ( !$CONFIG{'force'} )
     {
         foreach my $i ( 1 .. 10 )
         {
@@ -201,16 +201,15 @@ EOF
     print "DO NOT INTERRUPT\n";
 
     my $cmd = "dd if=/dev/zero bs=1M count=$CONFIG{'add'}k >> $path";
-    system($cmd );
+    system( $cmd );
 }
-elsif ( $CONFIG{ 'lvm' } )
+elsif ( $CONFIG{'lvm'} )
 {
-
     #
     #  Make sure we can find the disk
     #
-    $path = "/dev/" . $CONFIG{ 'lvm' } . "/" . $CONFIG{ 'hostname' } . "-disk";
-    if ( !-e $path )
+    $path = "/dev/" . $CONFIG{'lvm'} . "/" . $CONFIG{'hostname'} . "-disk";
+    if ( ! -e $path )
     {
         print <<EOF;
 
@@ -247,7 +246,7 @@ EOF
     #
     #  Allow panic
     #
-    if ( !$CONFIG{ 'force' } )
+    if ( !$CONFIG{'force'} )
     {
         foreach my $i ( 1 .. 10 )
         {
@@ -259,7 +258,7 @@ EOF
 
     print "DO NOT INTERRUPT\n";
     my $cmd = "lvextend -L+$CONFIG{'add'}M $path";
-    system($cmd );
+    system( $cmd );
 }
 else
 {
@@ -272,13 +271,13 @@ else
 #  Check filesystem.
 #
 print "Checking filesystem\n";
-system("fsck.ext3 -f $path");
+system( "fsck.ext3 -f $path" );
 
 #
 #  Run ext3resize.
 #
 print "Resizing in place\n";
-system("resize2fs $path");
+system( "resize2fs $path" );
 
 
 #
@@ -289,6 +288,80 @@ exit 0;
 
 
 
+=begin doc
+
+  Read the configuration file specified.
+
+=end doc
+
+=cut
+
+sub readConfigurationFile
+{
+    my ($file) = ( @_ );
+
+    open( FILE, "<", $file ) or die "Cannot read file '$file' - $!";
+
+    my $line       = "";
+
+    while (defined($line = <FILE>) )
+    {
+        chomp $line;
+        if ($line =~ s/\\$//)
+        {
+            $line .= <FILE>;
+            redo unless eof(FILE);
+        }
+
+        # Skip lines beginning with comments
+        next if ( $line =~ /^([ \t]*)\#/ );
+
+        # Skip blank lines
+        next if ( length( $line ) < 1 );
+
+        # Strip trailing comments.
+        if ( $line =~ /(.*)\#(.*)/ )
+        {
+            $line = $1;
+        }
+
+        # Find variable settings
+        if ( $line =~ /([^=]+)=([^\n]+)/ )
+        {
+            my $key = $1;
+            my $val = $2;
+
+            # Strip leading and trailing whitespace.
+            $key =~ s/^\s+//;
+            $key =~ s/\s+$//;
+            $val =~ s/^\s+//;
+            $val =~ s/\s+$//;
+
+            # command expansion?
+            if ( $val =~ /(.*)`([^`]+)`(.*)/ )
+            {
+                # store
+                my $pre  = $1;
+                my $cmd  = $2;
+                my $post = $3;
+
+                # get output
+                my $output = `$cmd`;
+                chomp( $output );
+
+                # build up replacement.
+                $val = $pre . $output . $post;
+            }
+
+            # Store value.
+            $CONFIG{ $key } = $val;
+        }
+    }
+
+    close( FILE );
+}
+
+
 =begin doc
 
   Parse the command line arguments this script was given.
@@ -314,46 +387,46 @@ sub parseCommandLineArguments
     #
     GetOptions(
 
-        # Misc. options
-        "add=s",      \$CONFIG{ 'add' },
-        "dir=s",      \$install{ 'dir' },
-        "lvm=s",      \$install{ 'lvm' },
-        "hostname=s", \$CONFIG{ 'hostname' },
-        "force",      \$CONFIG{ 'force' },
+               # Misc. options
+               "add=s",        \$CONFIG{'add'},
+               "dir=s",        \$install{'dir'},
+               "lvm=s",        \$install{'lvm'},
+               "hostname=s",   \$CONFIG{'hostname'},
+               "force",        \$CONFIG{'force'},
 
-        # Help options
-        "help",    \$HELP,
-        "manual",  \$MANUAL,
-        "verbose", \$CONFIG{ 'verbose' },
-        "version", \$VERSION
-    );
+               # Help options
+               "help",         \$HELP,
+               "manual",       \$MANUAL,
+               "verbose",      \$CONFIG{'verbose'},
+               "version",      \$VERSION
+              );
 
     pod2usage(1) if $HELP;
-    pod2usage( -verbose => 2 ) if $MANUAL;
+    pod2usage(-verbose => 2 ) if $MANUAL;
 
 
-    if ($VERSION)
+    if ( $VERSION )
     {
-        print("xen-resize-guest release $RELEASE\n");
+        print( "xen-resize-guest release $RELEASE\n" );
         exit 1;
     }
 
     #
     #  Setup mutually exclusive options in such a way that
-    # they will allow the configuration values to be overridden by
+    # they will allow the configuration values to be overriden by
     # the command line.
     #
-    if ( $install{ 'lvm' } )
+    if ( $install{'lvm'} )
     {
-        $CONFIG{ 'lvm' } = $install{ 'lvm' };
-        $CONFIG{ 'dir' } = undef;
-        delete $CONFIG{ 'dir' };
+        $CONFIG{'lvm'} = $install{'lvm'};
+        $CONFIG{'dir'} = undef;
+        delete $CONFIG{'dir'};
     }
-    if ( $install{ 'dir' } )
+    if ( $install{'dir'} )
     {
-        $CONFIG{ 'dir' } = $install{ 'dir' };
-        $CONFIG{ 'lvm' } = undef;
-        delete $CONFIG{ 'lvm' };
+        $CONFIG{'dir'} = $install{'dir'};
+        $CONFIG{'lvm'} = undef;
+        delete $CONFIG{'lvm'};
     }
 }
 
@@ -369,11 +442,10 @@ sub parseCommandLineArguments
 
 sub testArguments
 {
-
     #
     #  Make sure we received a hostname.
     #
-    if ( !$CONFIG{ 'hostname' } )
+    if ( !$CONFIG{'hostname'} )
     {
         print <<EOF;
 
@@ -388,7 +460,7 @@ EOF
     #
     #  Make sure we received a size.
     #
-    if ( !$CONFIG{ 'add' } )
+    if ( !$CONFIG{'add'} )
     {
         print <<EOF;
 
@@ -404,7 +476,7 @@ EOF
     #
     #  Make sure the guest isn't running
     #
-    if ( xenRunning( $CONFIG{ 'hostname' }, \%CONFIG ) )
+    if ( xenRunning( $CONFIG{'hostname'} ) )
     {
         print "The guest $CONFIG{'hostname'} appears to be running!\n";
         exit 1;
@@ -414,10 +486,8 @@ EOF
     #  We should either have LVM *or* directory - not neither or both.
     #
     my $options = 0;
-    $options += 1
-      if ( defined( $CONFIG{ 'lvm' } ) && length( $CONFIG{ 'lvm' } ) );
-    $options += 1
-      if ( defined( $CONFIG{ 'dir' } ) && length( $CONFIG{ 'dir' } ) );
+    $options += 1if ( defined($CONFIG{'lvm'}) && length( $CONFIG{'lvm'} ) );
+    $options += 1if ( defined($CONFIG{'dir'}) && length( $CONFIG{'dir'} ) );
 
     #
     #  Report
@@ -436,12 +506,40 @@ EOF
     #
     #  Convert from Gb -> Mb;
     #
-    if ( $CONFIG{ 'add' } =~ /^([0-9.]+)Gb*$/i )
+    if ( $CONFIG{'add'} =~ /^([0-9.]+)Gb*$/i )
     {
-        $CONFIG{ 'add' } = $1 * 1024;
+        $CONFIG{'add'} = $1 * 1024;
     }
-    if ( $CONFIG{ 'add' } =~ /^([0-9.]+)Mb*$/i )
+    if ( $CONFIG{'add'} =~ /^([0-9.]+)Mb*$/i )
     {
-        $CONFIG{ 'add' } = $1;
+        $CONFIG{'add'} = $1;
     }
 }
+
+
+
+=begin doc
+
+  Test to see if the given instance is running.
+
+=end doc
+
+=cut
+
+sub xenRunning
+{
+    my( $hostname ) =  (@_ );
+
+    my $running = 0;
+
+    open( CMD, "xm list $hostname 2>/dev/null |")
+      or die "Failed to run 'xm list $hostname'";
+    while( <CMD> )
+    {
+        my $line = $_;
+        $running = 1 if ( $line =~ /\Q$hostname\E/ )
+    }
+    close( CMD );
+
+    return( $running );
+}

bin/xen-update-image

@@ -1,7 +1,5 @@
 #!/usr/bin/perl -w
 
-=encoding utf8
-
 =head1 NAME
 
 xen-update-image - Update the software installed upon offline Xen images.
@@ -20,6 +18,9 @@ xen-update-image - Update the software installed upon offline Xen images.
    --lvm       Specify the LVM volume group which contains the image(s).
    --evms      Specify the EVMS container which contains the image(s).
 
+=cut
+
+
 
 =head1 OPTIONS
 
@@ -45,6 +46,8 @@ Show the version number and exit.
 
 =back
 
+=cut
+
 
 =head1 DESCRIPTION
 
@@ -62,6 +65,8 @@ Show the version number and exit.
  corruption otherwise it will allow you to update your image without
  booting it.
 
+=cut
+
 
 =head1 EXAMPLES
 
@@ -72,18 +77,22 @@ Show the version number and exit.
 
      xen-update-images --dir=/home/xen test.my.flat x11.my.flat
 
+=cut
 
-=head1 AUTHORS
 
- Steve Kemp, https://steve.fi/
- Axel Beckert, https://axel.beckert.ch/
- Stéphane Jourdois
+=head1 AUTHOR
+
+
+ Steve
+ --
+ http://www.steve.org.uk/
+
+=cut
 
 
 =head1 LICENSE
 
-Copyright (c) 2005-2009 by Steve Kemp, (c) 2010 by The Xen-Tools
-Development Team. All rights reserved.
+Copyright (c) 2005-2007 by Steve Kemp.  All rights reserved.
 
 This module is free software;
 you can redistribute it and/or modify it under
@@ -96,10 +105,8 @@ The LICENSE file contains the full text of the license.
 use strict;
 use English;
 use File::Temp qw/ tempdir /;
-use File::Copy qw/ mv cp /;
 use Getopt::Long;
 use Pod::Usage;
-use Xen::Tools::Common;
 
 
 #
@@ -113,13 +120,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.8';
-
-
-#
-# Find xen toolstack command
-#
-$CONFIG{ 'xm' } = findXenToolstack();
+my $RELEASE = '3.9';
 
 
 #
@@ -127,7 +128,7 @@ $CONFIG{ 'xm' } = findXenToolstack();
 #
 if ( -e "/etc/xen-tools/xen-tools.conf" )
 {
-    readConfigurationFile("/etc/xen-tools/xen-tools.conf", \%CONFIG);
+    readConfigurationFile( "/etc/xen-tools/xen-tools.conf" );
 }
 
 
@@ -149,13 +150,13 @@ checkArguments();
 #
 if ( $EFFECTIVE_USER_ID != 0 )
 {
-    print <<EOROOT;
+    print <<E_O_ROOT;
 
   This script is not running with root privileges.
 
   root privileges are required to successfully mount the disk image(s).
 
-EOROOT
+E_O_ROOT
 
     exit;
 }
@@ -165,11 +166,11 @@ EOROOT
 #
 #  Loop over the supplied arguments, and attempt to update each image.
 #
-while ( my $name = shift )
+while( my $name = shift )
 {
-    if ( !xenRunning($name, \%CONFIG) )
+    if ( !xenRunning( $name ) )
     {
-        updateXenImage($name);
+        updateXenImage( $name );
     }
     else
     {
@@ -195,7 +196,7 @@ exit;
 
 sub updateXenImage
 {
-    my ($name) = (@_);
+    my ( $name ) = ( @_ );
 
     #
     #  Create a temporary directory, and prepare to mount the
@@ -209,13 +210,12 @@ sub updateXenImage
     #  If we're dealing with loopback images find the main one,
     # and mount it.
     #
-    if ( $CONFIG{ 'dir' } )
+    if ( $CONFIG{'dir'} )
     {
-
         # The loopback image.
-        $img = $CONFIG{ 'dir' } . "/domains/" . $name . "/disk.img";
+        $img =  $CONFIG{'dir'} . "/domains/" . $name . "/disk.img";
 
-        if ( !-e $img )
+        if ( ! -e $img )
         {
             print "Disk image '$img' for host '$name' not found\n";
             return;
@@ -223,14 +223,13 @@ sub updateXenImage
 
         $mount_cmd = "mount -t auto -o loop $img $tmp";
     }
-    elsif ( $CONFIG{ 'lvm' } )
+    elsif ( $CONFIG{'lvm'} )
     {
-
         # The LVM volume
-        $img = "/dev/" . $CONFIG{ 'lvm' } . "/$name-disk";
+        $img = "/dev/" . $CONFIG{'lvm'} . "/$name-disk";
 
         # make sure it exists.
-        if ( !-e $img )
+        if ( ! -e $img )
         {
             print "Logical volume '$img' for host '$name' not found\n";
             return;
@@ -238,31 +237,25 @@ sub updateXenImage
 
         $mount_cmd = "mount -t auto $img $tmp";
     }
-    elsif ( $CONFIG{ 'evms' } )
+    elsif ( $CONFIG{'evms'} )
     {
+        # The EVMS volume  -- note, unlike LVM, you don't need the $CONFIG{'evms'}
+        # to see it and mount the volume. $CONFIG{'evms'} is only used for manipulating
+        # the underlying object.  Still, I don't want to mess with the parse code and
+        # make it confusing - otherwise --evms takes an argument everywhere but here,
+        # which will confuse users.  The better solution is to make it so that --evms can
+        # take a following container, but doesn't require it.  For the moment, it is
+        # better to leave it as it is, take a container, and then ignore it.
 
-        # The EVMS volume -- note, unlike LVM, you don't need the
-        # $CONFIG{'evms'} to see it and mount the
-        # volume. $CONFIG{'evms'} is only used for manipulating the
-        # underlying object.  Still, I don't want to mess with the
-        # parse code and make it confusing - otherwise --evms takes an
-        # argument everywhere but here, which will confuse users.  The
-        # better solution is to make it so that --evms can take a
-        # following container, but doesn't require it.  For the
-        # moment, it is better to leave it as it is, take a container,
-        # and then ignore it.
-
-        # The best way to do it is to just read it out of the
-        # configuration file, tell the user what you got and where you
-        # got it from, and not bother the user with picking --dir or
-        # --lvm or --evms at all, but infer it from the config file's
-        # disk = parameter.  xen-delete-image might work the same way,
-        # but it could be *slightly* more dangerous in the context of
-        # deleting.
+        # The best way to do it is to just read it out of the configuration file,
+        # tell the user what you got and where you got it from, and not bother the user
+        # with picking --dir or --lvm or --evms at all, but infer it from the config
+        # file's disk = parameter.  xen-delete-image might work the same way, but
+        # it could be *slightly* more dangerous in the context of deleting.
         $img = "/dev/evms/$name-disk";
 
         # make sure it exists.
-        if ( !-e $img )
+        if ( ! -e $img )
         {
             print "EVMS volume '$img' for host '$name' not found\n";
             return;
@@ -286,37 +279,20 @@ sub updateXenImage
     if ( ( -e $tmp . "/usr/bin/apt-get" ) &&
          ( -x $tmp . "/usr/bin/apt-get" ) )
     {
-        #
-        #  Copy dom0's resolv.conf to domU
-        #
-        mv("$tmp/etc/resolv.conf", "$tmp/etc/resolv.conf.old") if -f "$tmp/etc/resolv.conf";
-        cp("/etc/resolv.conf", "$tmp/etc/resolv.conf");
-
-        #
-        #  Now run the update command.
-        #
-        system("chroot $tmp /usr/bin/apt-get update");
+       #
+       #  Now run the update command.
+       #
+       system( "chroot $tmp /usr/bin/apt-get update" );
 
 
-        #
-        #  Now upgrade
-        #
-        system(
-            "DEBIAN_FRONTEND=noninteractive  chroot $tmp /usr/bin/apt-get upgrade --yes"
-        );
-
-        #
-        #  Restore domU's resolv.conf if needed
-        #
-        if (-f "$tmp/etc/resolv.conf") {
-            mv("$tmp/etc/resolv.conf.old", "$tmp/etc/resolv.conf");
-        } else {
-            unlink "$tmp/etc/resolv.conf";
-        }
+       #
+       #  Now upgrade
+       #
+       system( "DEBIAN_FRONTEND=noninteractive  chroot $tmp /usr/bin/apt-get upgrade --yes --force-yes" );
     }
     else
     {
-        print "Xen image $name is not a Debian GNU/Linux image.  Skipping\n";
+       print "Xen image $name is not a Debian GNU/Linux image.  Skipping\n";
     }
 
 
@@ -330,6 +306,113 @@ sub updateXenImage
 
 
 
+
+
+=begin doc
+
+  Test to see if the given instance is running.
+
+=end doc
+
+=cut
+
+sub xenRunning
+{
+    my( $hostname ) =  (@_ );
+
+    my $running = 0;
+
+    open( CMD, "xm list 2>/dev/null |")
+      or die "Failed to run 'xm list $hostname'";
+    while( <CMD> )
+    {
+        my $line = $_;
+        $running = 1 if ( $line =~ /\Q$hostname\E/ )
+    }
+    close( CMD );
+
+    return( $running );
+}
+
+
+
+
+=begin doc
+
+  Read the configuration file specified.
+
+=end doc
+
+=cut
+
+sub readConfigurationFile
+{
+    my ($file) = ( @_ );
+
+    open( FILE, "<", $file ) or die "Cannot read file '$file' - $!";
+
+    my $line       = "";
+
+    while (defined($line = <FILE>) )
+    {
+        chomp $line;
+        if ($line =~ s/\\$//)
+        {
+            $line .= <FILE>;
+            redo unless eof(FILE);
+        }
+
+        # Skip lines beginning with comments
+        next if ( $line =~ /^([ \t]*)\#/ );
+
+        # Skip blank lines
+        next if ( length( $line ) < 1 );
+
+        # Strip trailing comments.
+        if ( $line =~ /(.*)\#(.*)/ )
+        {
+            $line = $1;
+        }
+
+        # Find variable settings
+        if ( $line =~ /([^=]+)=([^\n]+)/ )
+        {
+            my $key = $1;
+            my $val = $2;
+
+            # Strip leading and trailing whitespace.
+            $key =~ s/^\s+//;
+            $key =~ s/\s+$//;
+            $val =~ s/^\s+//;
+            $val =~ s/\s+$//;
+
+            # command expansion?
+            if ( $val =~ /(.*)`([^`]+)`(.*)/ )
+            {
+                # store
+                my $pre  = $1;
+                my $cmd  = $2;
+                my $post = $3;
+
+                # get output
+                my $output = `$cmd`;
+                chomp( $output );
+
+                # build up replacement.
+                $val = $pre . $output . $post;
+            }
+
+            # Store value.
+            $CONFIG{ $key } = $val;
+        }
+    }
+
+    close( FILE );
+}
+
+
+
+
 =begin doc
 
   Parse the arguments specified upon the command line.
@@ -346,19 +429,27 @@ sub parseCommandLineArguments
 
     #  Parse options.
     #
-    GetOptions( "dir=s",  \$CONFIG{ 'dir' },
-                "lvm=s",   \$CONFIG{ 'lvm' },
-                "evms=s", \$CONFIG{ 'evms' },
-                "help",    \$HELP,
-                "manual", \$MANUAL,
-                "version", \$VERSION );
+    GetOptions(
+              "dir=s",      \$CONFIG{'dir'},
+              "lvm=s",      \$CONFIG{'lvm'},
+              "evms=s",     \$CONFIG{'evms'},
+              "help",       \$HELP,
+              "manual",     \$MANUAL,
+              "version",    \$VERSION
+             );
 
     pod2usage(1) if $HELP;
-    pod2usage( -verbose => 2 ) if $MANUAL;
+    pod2usage(-verbose => 2 ) if $MANUAL;
 
-    if ($VERSION)
+    if ( $VERSION )
     {
-        print "xen-update-image release $RELEASE\n";
+        my $REVISION      = '$Revision: 1.29 $';
+
+        if ( $REVISION =~ /1.([0-9.]+) / )
+        {
+            $REVISION = $1;
+        }
+        print "xen-update-image release $RELEASE - CVS: $REVISION\n";
         exit;
 
     }
@@ -377,14 +468,13 @@ sub parseCommandLineArguments
 
 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/ )
     {
-        $count += 1 if defined( $CONFIG{ $type } );
+        $count += 1 if defined( $CONFIG{$type} );
     }
 
     #
@@ -393,10 +483,10 @@ sub checkArguments
     #
     if ( $count != 1 )
     {
-        print "Please select one and only one of the installation methods:\n";
-        print " --dir\n";
-        print " --evms\n";
-        print " --lvm\n";
-        exit;
+       print "Please select one and only one of the installation methods:\n";
+       print " --dir\n";
+       print " --evms\n";
+       print " --lvm\n";
+       exit;
     }
 }

bin/xt-create-xen-config

@@ -1,11 +1,11 @@
 #!/usr/bin/perl -w
 
-=encoding utf8
-
 =head1 NAME
 
 xt-create-config - Create a Xen configuration file for a new guest
 
+=cut
+
 =head1 SYNOPSIS
 
   xt-create-config [options]
@@ -39,6 +39,7 @@ xt-create-config - Create a Xen configuration file for a new guest
   All other options from xen-create-image, such as the new IP address(es)
  to give to the new instance, will be passed as environmental variables.
 
+=cut
 
 =head1 ABOUT
 
@@ -52,6 +53,8 @@ xt-create-config - Create a Xen configuration file for a new guest
 
   By default the script will use /etc/xen-tools/xm.tmpl as its input.
 
+=cut
+
 
 =head1 INVOCATION
 
@@ -72,6 +75,9 @@ xt-create-config - Create a Xen configuration file for a new guest
 =for example end
 
 
+=cut
+
+
 =head1 ARGUMENT PASSING
 
   This script will be invoked with a full copy of the arguments from
@@ -96,18 +102,21 @@ xt-create-config - Create a Xen configuration file for a new guest
  for the "Text::Template" perl module.   (If you have the perldoc
  package installed you can read this with "perldoc Text::Template".)
 
+=cut
 
-=head1 AUTHORS
 
- Steve Kemp, https://steve.fi/
- Axel Beckert, https://axel.beckert.ch/
- Stéphane Jourdois
+=head1 AUTHOR
+
+ Steve
+ --
+ http://www.steve.org.uk/
+
+=cut
 
 
 =head1 LICENSE
 
-Copyright (c) 2005-2009 by Steve Kemp, (c) 2010-2012 by The Xen-Tools
-Development Team. All rights reserved.
+Copyright (c) 2005-2007 by Steve Kemp.  All rights reserved.
 
 This module is free software;
 you can redistribute it and/or modify it under
@@ -141,14 +150,14 @@ my @PARTITIONS = undef;
 #
 #  Default options
 #
-$CONFIG{ 'template' } = '/etc/xen-tools/xm.tmpl';
-$CONFIG{ 'extension' } = '.cfg';
+$CONFIG{'template'} = '/etc/xen-tools/xm.tmpl';
 
 
 #
 # Release number.
 #
-my $RELEASE = '4.8';
+my $RELEASE = '3.9';
+
 
 
 
@@ -167,9 +176,9 @@ checkArguments();
 #
 #  If we've been given any administrators then set them up.
 #
-if ( $ENV{ 'admins' } )
+if ( $ENV{'admins'} )
 {
-    setupAdminUsers(\%CONFIG);
+    setupAdminUsers();
 }
 
 
@@ -180,6 +189,9 @@ createXenConfig();
 
 
 
+
+
+
 #
 #  Exit cleanly - any errors which have already occurred will result
 # in "exit 1".
@@ -188,6 +200,9 @@ exit 0;
 
 
 
+
+
+
 =begin doc
 
   Parse the command line arguments this script was given.
@@ -205,23 +220,30 @@ sub parseCommandLineArguments
     #
     #  Parse options.
     #
-    GetOptions( "admins=s",    \$ENV{ 'admins' },
-                "output=s",    \$CONFIG{ 'output' },
-                "extension:s", \$CONFIG{ 'extension' },
-                "template=s",  \$CONFIG{ 'template' },
-                "verbose",     \$CONFIG{ 'verbose' },
-                "help",        \$HELP,
-                "manual",      \$MANUAL,
-                "version",     \$VERSION
+    GetOptions(
+               "admins=s",   \$ENV{'admins'},
+               "output=s",   \$CONFIG{'output'},
+               "extension=s",\$CONFIG{'extension'},
+               "template=s", \$CONFIG{'template'},
+               "verbose",    \$CONFIG{'verbose'},
+               "help",       \$HELP,
+               "manual",     \$MANUAL,
+               "version",    \$VERSION
               );
 
     pod2usage(1) if $HELP;
-    pod2usage( -verbose => 2 ) if $MANUAL;
+    pod2usage(-verbose => 2 ) if $MANUAL;
 
 
-    if ($VERSION)
+    if ( $VERSION )
     {
-        print "xt-create-xen-config release $RELEASE\n";
+        my $REVISION      = '$Revision: 1.47 $';
+        if ( $REVISION =~ /1.([0-9.]+) / )
+        {
+            $REVISION = $1;
+        }
+
+        print "xt-create-xen-config release $RELEASE - CVS: $REVISION\n";
         exit;
     }
 }
@@ -238,11 +260,10 @@ sub parseCommandLineArguments
 
 sub checkArguments
 {
-
     #
     #  We require an output location.
     #
-    if ( !defined( $CONFIG{ 'output' } ) )
+    if ( ! defined( $CONFIG{'output'} ) )
     {
         print "The '--output' argument is mandatory\n";
         exit 1;
@@ -251,10 +272,9 @@ sub checkArguments
     #
     #  The output location should be a directory which exists.
     #
-    if ( !-d $CONFIG{ 'output' } )
+    if ( ! -d $CONFIG{'output'} )
     {
-        print
-          "The output directory we've been given, $CONFIG{'output'}, doesn't exist\n";
+        print "The output directory we've been given, $CONFIG{'output'}, doesnt exist\n";
         print "Aborting\n";
         exit 1;
     }
@@ -262,12 +282,11 @@ sub checkArguments
     #
     #  Make sure that any specified template file exists.
     #
-    if ( defined( $CONFIG{ 'template' } ) )
+    if ( defined( $CONFIG{'template'} ) )
     {
-        if ( !-e $CONFIG{ 'template' } )
+        if ( ! -e $CONFIG{'template'} )
         {
-            print
-              "The specified template file, $CONFIG{'template'} does not exist.\n";
+            print "The specified template file, $CONFIG{'template'} does not exist.\n";
             exit 1;
         }
     }
@@ -291,18 +310,20 @@ sub importPartitionsFromEnvironment
 {
     @PARTITIONS = ();
 
-    return unless exists $ENV{ 'NUMPARTITIONS' };
-    for ( my $i = 1 ; $i <= $ENV{ 'NUMPARTITIONS' } ; $i++ )
+    for (my $i=1; $i <= $ENV{'NUMPARTITIONS'}; $i++)
     {
-        my @parts = split( /:/, $ENV{ 'PARTITION' . $i }, 7 );
+        my @parts = split(/:/, $ENV{'PARTITION' . $i}, 7);
         push( @PARTITIONS,
-              {  'name'       => $parts[0],
-                 'size'       => $parts[1],
-                 'type'       => $parts[2],
-                 'mountpoint' => $parts[3],
-                 'options'    => $parts[4],
-                 'imagetype'  => $parts[5],
-                 'image'      => $parts[6] } );
+            {
+                'name'       => $parts[0],
+                'size'       => $parts[1],
+                'type'       => $parts[2],
+                'mountpoint' => $parts[3],
+                'options'    => $parts[4],
+                'imagetype'  => $parts[5],
+                'image'      => $parts[6]
+            }
+        );
     }
 }
 
@@ -323,31 +344,26 @@ sub createXenConfig
     #
     #  The output file we're going to process.
     #
-    my $file =
-      $CONFIG{ 'output' } . '/' . $ENV{ 'hostname' } . $CONFIG{ 'extension' };
+    my $file = $CONFIG{'output'} . '/' . $ENV{'hostname'} . $ENV{'extension'};
 
     #
     #  The template we're going to read from.
     #
     my $template = new Text::Template( TYPE   => 'FILE',
-                                       SOURCE => $CONFIG{ 'template' } );
+                                       SOURCE => $CONFIG{'template'} );
 
 
     #
     #  The device we're using.
     #
-    my $device = 'xvda';
-    if ( defined( $ENV{ 'ide' } ) )
+    my $device = 'sda';
+    if ( defined( $ENV{'ide'} ) )
     {
         $device = 'hda';
     }
-    elsif ( defined( $ENV{ 'scsi' } ) )
+    elsif ( defined( $ENV{'disk_device'} ) )
     {
-        $device = 'sda';
-    }
-    elsif ( defined( $ENV{ 'disk_device' } ) )
-    {
-        $device = $ENV{ 'disk_device' };
+        $device = $ENV{'disk_device'};
 
         # strip /dev/, if present.
         if ( $device =~ /^(.*)\/(.*)$/ )
@@ -355,77 +371,65 @@ sub createXenConfig
             $device = $2;
         }
     }
-    $ENV{ 'device' } = $device;
+    $ENV{'device'} = $device;
 
 
     #
     #  The memory size:  Convert Gb -> Mb.
     #
-    if ( $ENV{ 'memory' } =~ /^(\d+)Gb?.*$/i )
+    if ( $ENV{'memory'} =~ /^(\d+)Gb*$/i )
     {
-        $ENV{ 'memory' } = $1 * 1024;
+        $ENV{'memory'} = $1 * 1024;
     }
 
     #
     #  Remove any trailing Mb.
     #
-    $ENV{ 'memory' } =~ s/^(\d+)Mb?.*$/$1/i;
-
-    #
-    #  The maxmem size:  Convert Gb -> Mb.
-    #
-    if ( exists($ENV{ 'maxmem' }) and defined($ENV{ 'maxmem' })) {
-
-        if ($ENV{ 'maxmem' } =~ /^(\d+)Gb?.*$/i )
-        {
-            $ENV{ 'maxmem' } = $1 * 1024;
-        }
-
-    #
-    #  Remove any trailing Mb.
-    #
-        $ENV{ 'maxmem' } =~ s/^(\d+)Mb?.*$/$1/i;
+    if ( $ENV{'memory'} =~ /^(\d+)Mb*$/i )
+    {
+        $ENV{'memory'} = $1;
     }
 
+
     #
     # Images as presented to Xen - either loopback images, or LVM partitions.
     #
-    if ( $ENV{ 'lvm' } )
+    if ( $ENV{'lvm'} )
     {
-        $ENV{ 'image_prefix' } = "phy:$ENV{'lvm'}/$ENV{'hostname'}-";
-        $ENV{ 'image_suffix' } = '';
+        $ENV{'image_prefix'} = "phy:$ENV{'lvm'}/$ENV{'hostname'}-";
+        $ENV{'image_suffix'} = '';
         importPartitionsFromEnvironment();
     }
-    elsif ( $ENV{ 'evms' } )
+    elsif ( $ENV{'evms'} )
     {
-        $ENV{ 'image_prefix' } = "phy:/dev/evms/$ENV{'hostname'}-";
-        $ENV{ 'image_suffix' } = '';
+        $ENV{'image_prefix'} = "phy:/dev/evms/$ENV{'hostname'}-";
+        $ENV{'image_suffix'} = '';
         importPartitionsFromEnvironment();
     }
-    elsif ( $ENV{ 'image_dev' } )
+    elsif ( $ENV{'image-dev'} )
     {
-        $ENV{ 'image_vbd' } = "phy:$ENV{'image_dev'}";
+        $ENV{'image_vbd'} = "phy:$ENV{'image-dev'}";
 
-        if ( $ENV{ 'swap_dev' } )
+        if ( $ENV{'swap-dev'} )
         {
-            $ENV{ 'swap_vbd' } = "phy:$ENV{'swap_dev'}";
+            $ENV{'swap_vbd'} = "phy:$ENV{'swap-dev'}";
         }
         else
         {
-            $ENV{ 'swap_vbd' } = undef;
+            $ENV{'swap_vbd'}  = undef;
         }
     }
     else
     {
-        $ENV{ 'image_prefix' } = "file:$ENV{'dir'}/domains/$ENV{'hostname'}/";
-        $ENV{ 'image_suffix' } = '.img';
+        $ENV{'image_prefix'} = "file:$ENV{'dir'}/domains/$ENV{'hostname'}/";
+        $ENV{'image_suffix'} = '.img';
         importPartitionsFromEnvironment();
     }
 
     #
     # The xen-tools version.
     #
-    $ENV{ 'xen_tools_version' } = $RELEASE;
+    $ENV{'xen_tools_version'} = $RELEASE;
 
 
     #
@@ -434,11 +438,11 @@ sub createXenConfig
     # made available to our template file.
     #
     my %vars;
-    foreach my $key ( sort keys %ENV )
+    foreach my $key (sort keys %ENV )
     {
-        $vars{ $key } = $ENV{ $key };
+        $vars{$key} = $ENV{$key};
     }
-    $vars{ 'PARTITIONS' } = \@PARTITIONS;
+    $vars{'PARTITIONS'} = \@PARTITIONS;
 
     #
     #  Now output the data.
@@ -453,9 +457,9 @@ sub createXenConfig
     #
     #  Write the output of processing the template file, if it succeeds.
     #
-    if ( defined $result )
+    if (defined $result)
     {
-        print FILE $result;
+        print FILE $result ;
     }
     else
     {
@@ -465,6 +469,77 @@ sub createXenConfig
     #
     #  Close the output file.
     #
-    close(FILE);
+    close( FILE );
 
 }
+
+
+
+
+=begin doc
+
+  This routine is designed to ensure that any users specified with
+ the --admins flag are setup as administrators of the new instance.
+
+=end doc
+
+=cut
+
+sub setupAdminUsers
+{
+    #
+    #  If we're not root we can't modify users.
+    #
+    return if ( $EFFECTIVE_USER_ID != 0 );
+
+    #
+    #  If we don't have a sudoers file then we'll also ignore this.
+    #
+    return if ( ! -e "/etc/sudoers" );
+
+    #
+    #  Find the path to the xen-login-shell
+    #
+    my $shell = undef;
+    $shell = "/usr/bin/xen-login-shell" if ( -x "/usr/bin/xen-login-shell" );
+    $shell = "/usr/local/bin/xen-login-shell" if ( -x "/usr/bin/local/xen-login-shell" );
+
+    return if ( !defined( $shell ) );
+
+
+    #
+    #  For each user make sure they exist, and setup the
+    # login shell for them.
+    #
+    foreach my $user ( split( /,/, $ENV{'admins'} ) )
+    {
+        # Strip leading and trailing whitespace.
+        $user =~ s/^\s+//;
+        $user =~ s/\s+$//;
+
+        # Ignore root
+        next if ( $user =~ /^root$/i );
+
+        # Does the user exist?
+        if ( getpwnam($user) )
+        {
+            # Change shell.
+            $CONFIG{'verbose'} && print "Changing shell for $user: $shell\n";
+            system( "chsh", "-s", $shell, $user );
+        }
+        else
+        {
+            # Add a new user.
+            $CONFIG{'verbose'} && print "Adding new user: $user\n";
+            system( "useradd", "-s", $shell, $user );
+        }
+
+        #
+        #  Add the entry to /etc/sudoers.
+        #
+        open( SUDOERS, ">>", "/etc/sudoers" ) or warn "Failed to add user to sudoers file : $user - $!";
+        print SUDOERS "$user ALL = NOPASSWD: /usr/sbin/xm, /usr/bin/xen-create-image\n";
+        close( SUDOERS );
+
+    }
+}

bin/xt-customize-image

@@ -1,11 +1,11 @@
 #!/usr/bin/perl -w
 
-=encoding utf8
-
 =head1 NAME
 
 xt-customize-image - Customize a freshly installed copy of GNU/Linux
 
+=cut
+
 =head1 SYNOPSIS
 
   xt-customize-image [options]
@@ -25,11 +25,12 @@ xt-customize-image - Customize a freshly installed copy of GNU/Linux
   All other options from xen-create-image, such as the new IP address(es)
  to give to the new instance, will be passed as environmental variables.
 
+=cut
 
 =head1 NOTES
 
   This script is invoked by xen-create-image after it has created a
- fresh installation of Linux within a temporary location.
+ fresh installation of Linux withing 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
@@ -40,6 +41,8 @@ xt-customize-image - Customize a freshly installed copy of GNU/Linux
    --location  - The temporary installation root of the new install
    --dist      - The distribution which has been installed.
 
+=cut
+
 
 =head1 HOOK SCRIPTS
 
@@ -51,30 +54,24 @@ xt-customize-image - Customize a freshly installed copy of GNU/Linux
  the --location option.
 
   For the distribution named 'foo' the scripts will be loaded and
- executed from '/usr/share/xen-tools/foo.d'.  Each executable will
+ executed from '/usr/lib/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.
+=cut
 
 
-=head1 AUTHORS
+=head1 AUTHOR
 
- Steve Kemp, https://steve.fi/
- Axel Beckert, https://axel.beckert.ch/
- Stéphane Jourdois
+ Steve
+ --
+ http://www.steve.org.uk/
+
+=cut
 
 
 =head1 LICENSE
 
-Copyright (c) 2005-2009 by Steve Kemp, (c) 2010 by The Xen-Tools
-Development Team. All rights reserved.
+Copyright (c) 2005-2007 by Steve Kemp.  All rights reserved.
 
 This module is free software;
 you can redistribute it and/or modify it under
@@ -100,7 +97,8 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.8';
+my $RELEASE = '3.9';
+
 
 
 
@@ -130,6 +128,9 @@ exit 0;
 
 
 
+
+
+
 =begin doc
 
   Parse the command line arguments this script was given.
@@ -147,22 +148,29 @@ sub parseCommandLineArguments
     #
     #  Parse options.
     #
-    GetOptions( "location=s", \$CONFIG{ 'location' },
-                "dist=s",     \$CONFIG{ 'dist' },
-                "verbose",    \$CONFIG{ 'verbose' },
-                "help",       \$HELP,
-                "manual",     \$MANUAL,
-                "version",    \$VERSION
-              );
+    GetOptions(
+               "location=s", \$CONFIG{'location'},
+               "dist=s",     \$CONFIG{'dist'},
+               "verbose",    \$CONFIG{'verbose'},
+               "help",       \$HELP,
+               "manual",     \$MANUAL,
+               "version",    \$VERSION
+             );
 
     pod2usage(1) if $HELP;
-    pod2usage( -verbose => 2 ) if $MANUAL;
+    pod2usage(-verbose => 2 ) if $MANUAL;
 
 
-    if ($VERSION)
+    if ( $VERSION )
     {
-        print "xt-customize-image release $RELEASE\n";
-        exit;
+       my $REVISION      = '$Revision: 1.33 $';
+       if ( $REVISION =~ /1.([0-9.]+) / )
+       {
+           $REVISION = $1;
+       }
+
+       print "xt-customize-image release $RELEASE - CVS: $REVISION\n";
+       exit;
     }
 }
 
@@ -178,11 +186,10 @@ sub parseCommandLineArguments
 
 sub checkArguments
 {
-
     #
     #  We require a location.
     #
-    if ( !defined( $CONFIG{ 'location' } ) )
+    if ( ! defined( $CONFIG{'location'} ) )
     {
         print "The '--location' argument is mandatory\n";
         exit 1;
@@ -192,7 +199,7 @@ sub checkArguments
     #
     #  Test that the location we've been given exists
     #
-    if ( !-d $CONFIG{ 'location' } )
+    if ( ! -d $CONFIG{'location'} )
     {
         print "The installation directory we've been given doesn't exist\n";
         print "We tried to use : $CONFIG{'location'}\n";
@@ -203,7 +210,7 @@ sub checkArguments
     #
     #  We require a distribution name.
     #
-    if ( !defined( $CONFIG{ 'dist' } ) )
+    if ( ! defined( $CONFIG{'dist'} ) )
     {
         print "The '--dist' argument is mandatory\n";
         exit 1;
@@ -217,21 +224,21 @@ sub checkArguments
     #  If there are no scripts then we clearly cannot
     # customise it!
     #
-    my $dir = "/usr/share/xen-tools/" . $CONFIG{ 'dist' } . ".d";
+    my $dir = "/usr/lib/xen-tools/"  . $CONFIG{'dist'} .  ".d";
 
-    if ( !-d $dir )
+    if ( ! -d $dir )
     {
-        print <<EOR;
+        print <<E_OR;
 
-  We\'re trying to configure an installation of $CONFIG{'dist'} in
+  We're trying to configure an installation of $CONFIG{'dist'} in
  $CONFIG{'location'} - but there is no hook directory for us to use.
 
-  This means we don\'t know how to configure this installation.
+  This means we don't know how to configure this installation.
 
-  We\'d expect the hook directory to be : $dir
+  We'd expect the hook directory to be : $dir
 
   Aborting.
-EOR
+E_OR
         exit 1;
     }
 
@@ -255,17 +262,15 @@ EOR
 
 sub runDistributionHooks
 {
-
     #
     #  Hook directory.
     #
-    my $hooks = "/usr/share/xen-tools/" . $CONFIG{ 'dist' } . ".d/";
-    my $hooks_local = "/etc/xen-tools/hooks.d/";
+    my $hooks = "/usr/lib/xen-tools/"  . $CONFIG{'dist'} .  ".d/";
 
     #
     #  Installation prefix
     #
-    my $prefix = $CONFIG{ 'location' };
+    my $prefix = $CONFIG{'location'};
 
     #
     #  If we're running verbosely then setup the client environment
@@ -274,9 +279,9 @@ sub runDistributionHooks
     #  This is useful in case this script is called outwith the usual
     # xen-create-image framework.
     #
-    if ( $CONFIG{ 'verbose' } )
+    if ( $CONFIG{'verbose'} )
     {
-        $ENV{ 'verbose' } = 1;
+        $ENV{'verbose'} = 1;
     }
 
     #
@@ -285,7 +290,6 @@ sub runDistributionHooks
     #
     foreach my $file ( sort( glob( $hooks . "*" ) ) )
     {
-
         # skip files that end with .dpkg-new, .dpkg-old or '~'
         next if ( $file =~ /\.dpkg-(new|old)/ );
         next if ( $file =~ /~$/ );
@@ -295,7 +299,6 @@ sub runDistributionHooks
         #
         if ( ( -x $file ) && ( -f $file ) )
         {
-
             #
             # Just display the name - no need to see the full path.
             #
@@ -305,45 +308,27 @@ 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 = $file . " $CONFIG{'location'}";
+            my $cmd = $hooks . $name . " $CONFIG{'location'}";
 
             #
             #  Run the command.  This has different prolog and epilog
             # depending on whether we're running verbosely or not.
             #
-            if ( $CONFIG{ 'verbose' } )
+            if ( $CONFIG{'verbose'} )
             {
                 print "Running hook $name ['$cmd']\n";
                 print "--\n";
-                my $rc = system($cmd);
-                if ($rc != 0) {
-                print "hook $name failed: $?\n";
-                exit 1;
-            }
+                system( $cmd );
                 print "--\n";
                 print "Done\n\n";
             }
             else
             {
                 print "Running hook $name\n";
-                my $rc = system($cmd);
-                if ($rc != 0) {
-                    print "hook $name failed: $?\n";
-                    exit 1;
-                }
+                system( $cmd );
                 print "hook $name: done.\n";
             }
         }

bin/xt-guess-suite-and-mirror

@@ -1,188 +0,0 @@
-#!/usr/bin/perl -w
-
-=encoding utf8
-
-=head1 NAME
-
-xt-guess-suite-and-mirror - Tries to guess the most suitable suite and
-mirror for DomUs on Debian and Ubuntu Dom0s.
-
-=head1 SYNOPSIS
-
-  --suite       Show suite
-  --mirror      Show mirror
-
-  Shows both if no parameter is given.
-
-  Help Options:
-
-   --help       Show the help information for this script.
-   --manual     Show the manual for this script.
-   --version    Show the version number and exit.
-
-
-=head1 DESCRIPTION
-
-xt-guess-suite-and-mirror tries to find the mirror and suite the Xen
-Dom0 is currently using and returns them in a way suitable for
-xen-create-image(1) or the backticks feature in xen-tools.conf.
-
-
-=head1 AUTHORS
-
- Axel Beckert, https://axel.beckert.ch/
- Stéphane Jourdois
-
-
-=head1 LICENSE
-
-Copyright (C) 2010-2012 by The Xen-Tools Development Team. All rights
-reserved.
-
-This module is free software; you can redistribute it and/or modify it
-under the same terms as Perl itself. The LICENSE file contains the
-full text of the license.
-
-=cut
-
-###
-### Configuration
-###
-
-# Fallback to Debian or Ubuntu in case we can't find anything
-my $fallback = 'Debian';
-
-# Which mirrors to use if everything else fails (deb.debian.org
-# redirects to a working mirror nearby)
-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"
-# should be the best choice independent of the time. Ubuntu does not
-# 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 => 'bionic' );
-
-# Where to look for the sources.list to parse
-my @sources_list_files = ( '/etc/apt/sources.list',
-                           glob('/etc/apt/sources.list.d/*.list'));
-
-use File::Slurp;
-use Getopt::Long;
-use Pod::Usage;
-use File::Which;
-
-use strict;
-
-
-#
-# Release number.
-#
-my $RELEASE = '4.8';
-
-# Init
-my $mirror = '';
-my $suite = '';
-my $found = 0;
-
-# Parsing command line options
-my $want_mirror  = 0;
-my $want_suite   = 0;
-my $want_version = 0;
-my $want_help    = 0;
-my $want_manual  = 0;
-
-my $result = GetOptions( 'mirror|m' => \$want_mirror,
-                         'suite|s'  => \$want_suite,
-                         'version'  => \$want_version,
-                         'manual'   => \$want_manual,
-                         'help'     => \$want_help );
-
-if ($want_help) {
-    pod2usage(0);
-}
-
-if ($want_manual) {
-    pod2usage( -verbose => 2 );
-}
-
-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.
-
-        # read sources.list and split it into lines
-        my @sources_list = read_file($sources_list_file);
-
-        # Find the first line which is a Debian or Ubuntu mirror but not
-        # an updates, backports, volatile or security mirror.
-        foreach my $sources_list_entry (@sources_list) {
-            # Normalize line
-            chomp($sources_list_entry);
-            $sources_list_entry =~ s/^\s*(.*?)\s*$/$1/;
-
-            # Skip definite non-entries
-            next if $sources_list_entry =~ /^\s*($|#)/;
-
-            # Split up into fields
-            my @source_components = split(/\s+/, $sources_list_entry);
-
-            # Minimum number of components is 4
-            next if $#source_components < 3;
-
-            # Don't use deb-src entries.
-            next if $source_components[0] eq 'deb-src';
-
-            # Skip updates, backports, volatile or security mirror.
-            next if $source_components[2] !~ /^[a-z]+$/;
-
-            if ($source_components[1] =~ m(/debian/?$|/ubuntu/?$)) {
-                # Seems a typical mirror. Let's use that one
-
-                $mirror = $source_components[1];
-                $suite = $source_components[2];
-
-                $found = 1;
-                last all_sources_list_files;
-            }
-        }
-    }
-}
-die "Couldn't find a useful entry in the sources.list files of the Dom0. Tried:\n  ".
-    join("\n  ", @sources_list_files)."\n" unless $found;
-
-my $lsb_release = which('lsb_release');
-if (!$found and defined($lsb_release) and -x $lsb_release) {
-    my $vendor = `$lsb_release -s -i`;
-
-    if ($vendor eq 'Debian' or $vendor eq 'Ubuntu') {
-        $suite = `$lsb_release -s -c`;
-        chomp($suite);
-
-        unless ($suite) {
-            $suite = $fallback_suite{$vendor};
-            warn "Dom0 seems to be $vendor, but couldn't determine suite. Falling back to $suite.\n";
-        }
-
-        $mirror = $fallback_mirror{$vendor};
-
-        $found = 1;
-    }
-}
-
-if ($found) {
-    unless ($want_help || $want_version || $want_suite || $want_mirror) {
-        print "$mirror $suite\n";
-    } else {
-        if ($want_mirror) {
-            print "$mirror";
-        }
-        if ($want_suite) {
-            print "$suite";
-        }
-        print "\n";
-    }
-} else {
-    $suite  = $fallback_suite{$fallback};
-    $mirror = $fallback_mirror{$fallback};
-}

debian/NEWS

@@ -1,56 +0,0 @@
-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
-    environment variable names are from now on converted to underscores
-    ("_") before being exported. May affect some hook or role scripts.
-
-  * /usr/lib/xen-tools/ has been moved to /usr/share/xen-tools/ to
-    properly adhere to FHS. In case you had local scripts added to
-    /usr/lib/xen-tools/, please move them to /usr/share/xen-tools/, too
-    and then remove /usr/lib/xen-tools/ and its left-over subdirectories
-    which all should be empty at that point, i.e. "rmdir -p
-    /usr/lib/xen-tools/*" should do the trick.
-
- -- Axel Beckert <abe@debian.org>  Fri, 23 Aug 2013 19:01:16 +0200
-
-xen-tools (4.2~rc1-1) unstable; urgency=low
-
-  By default, xen-create-image now generates a random root password and
-  displays it as plain text at the end of the DomU generation process.
-  Use --genpass=0 and --passwd=1 to interactively set a root password
-  without the password being displayed.
-
- -- Axel Beckert <abe@debian.org>  Tue, 03 Aug 2010 16:14:42 +0200
-
-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 running "update-initramfs -u"
-  afterwards may help.
-
-  If the Dom0 is a Debian or Ubuntu, the distribution and suite for
-  DomUs defaults to the distribution and suite the Dom0 is
-  running. Otherwise Debian DomUs get "stable" and Ubuntu "lucid" by
-  default.
-
-  Default Debian/Ubuntu mirror is now determined by looking into
-  /etc/apt/sources.list (if it exists) and taking the first entry with
-  path ending in /debian/ there.
-
- -- Axel Beckert <abe@debian.org>  Sun, 30 May 2010 22:36:16 +0200

debian/README.source

@@ -1,21 +0,0 @@
-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://github.com/xen-tools/xen-tools.git
-$ cd xen-tools
-
-If you just want to build the binary package, run
-
-$ make changelog
-$ dpkg-buildpackage -uc -us -b
-
-If you want to build source and binary packages, e.g. for an upload to
-Debian or Ubuntu:
-
-$ make orig-tar-gz
-$ dpkg-buildpackage
-
- -- Axel Beckert <abe@debian.org>, Tue, 14 Jul 2015 18:35:38 +0200

debian/changelog

@@ -1,641 +1,3 @@
-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
-    - Run t/gitignore.t only if git is installed and .git present.
-    - Rework "minimal" role to be less based on personal preferences.
-      + No more installs sudo, vim, syslog-ng, etc.
-      + Fixes usage together with pygrub.
-    - hooks/common.sh: Split up installDebianPackage into
-      installDebianPackage and installDebianPackageAndRecommends.
-  * Also add build-dependency on "libterm-ui-perl | perl (<< 5.17.0)" and
-    "liblog-message-perl | perl (<< 5.17.0)" to avoid warnings with Perl
-    5.18 and future FTBFS.
-  * Mention Ubuntu 14.04 Trusty Tahr in long description.
-
- -- Axel Beckert <abe@debian.org>  Wed, 11 Dec 2013 20:59:06 +0100
-
-xen-tools (4.4~rc1-1) unstable; urgency=low
-
-  * New upstream release candidate
-    - Also switch from cdn.debian.net to http.debian.net in xen-tools.conf
-    - Do not run "passwd" via runCommand as that one captures STDOUT for
-      logging. Makes --passwd usable again. Thanks to Christian Herzog for
-      the bug report.
-    - Loop around calling "passwd" to get a second chance to change the
-      password. (Closes: #703159) Thanks to Joan <aseques@gmail.com> for a
-      bug fix in this new code.
-      + Add dependency on "libterm-ui-perl | perl (<< 5.17.0)"
-    - Declares one more POD encoding and recode Xen::Tools::Common to
-      UTF-8. Fixes FTBFS with Perl 5.18. (Finally closes: #720519)
-    - Apply patch by Philipp Erbelding to fix overzealous line matching in
-      xen-list-images. (Gitorious merge request #5)
-    - xen-list-images now displays a unit after the memory size
-    - Drop support for memory size in kilobytes in xen-create-image,
-      neither xt-create-xen-config nor xm support it.
-    - Refactoring: Replace all occurrences of "! -z" by "-n" in hooks and
-      bash completion.
-    - Handle potentially empty gateway setting properly in
-      hooks/common/40-setup-networking-deb. Thanks Simone Caruso!
-    - Reformat hooks/common/40-setup-networking-deb so that the result
-      neither has trailing whitespace nor broken indentation.
-    - Also display MAC address after the DomU has been created.
-    - Preliminary support for Ubuntu 14.04 Trusty Tahr.
-    - Added --maxmem flag to set a maximum value for dynamic memory
-      ballooning. Thanks to Joan <aseques@gmail.com> for the patch!
-    - Added fix by Patryk Ściborek againsat disableStartStopDaemon()
-      aborting under some circumstances. (Closes: #725192)
-    - Abort early and with proper error message if "xen-delete-image
-      --test" is not used with "--dir". (Closes: #704878)
-    - xen-delete-image: Exit with return code != 0 in all error cases.
-    - Refactoring: xt-create-xen-config: Use s/// to strip trailing MB
-      size suffixes.
-  * Bump Standards-Version to 3.9.5 (no changes).
-
- -- Axel Beckert <abe@debian.org>  Mon, 28 Oct 2013 22:31:03 +0100
-
-xen-tools (4.4~beta1-1) unstable; urgency=low
-
-  * New upstream beta release
-    - 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.
-    - Fix symbolic link hooks/centos-6/15-setup-arch (Closes: #690299)
-    - Execute END block not on --version/--help/--manual (Closes: #684346)
-    - Move code for --boot feature to END block. Fixes missing SSH
-      fingerprint display if --boot was used. (Closes: #679183)
-    - Correctly handle aborts in END block. (Closes: #704882)
-    - Use local parameter instead of global variable in unMountImage.
-    - Also recognize "M" and "G" instead of "MB" and "GB" as size unit for
-      --memory. (Closes: #691320) Document the recognized units.
-    - Default DomUs to use the noop scheduler (Closes: #693131)
-    - Overwork TLS disabling on Debian and Ubuntu
-    - xen-list-images now also outputs the file name of the config file.
-    - xen-list-images and xen-delete-image now understand --extension.
-    - Fixes "--extension=" with empty parameter.
-    - Sarge amd64 case handle properly
-    - Remove CVS revisions from --version output
-    - Support for Debian Jessie, Ubuntu Raring and preliminary support for
-      Ubuntu Saucy (debootstrap doesn't have support for Saucy at the time
-      of writing)
-    - Preliminary support for xl toolstack
-    - xen-create-image: Consistently use runCommand() instead of system()
-    - xt-install-image: Don't bail out if only cdebootstrap is installed
-      but not debootstrap (Thanks Elmar Heeb!)
-    - Makefile accepts DESTDIR=…
-    - Move examples from debian/examples to examples.
-    - Uses File::Which exclusively (no more findBinary, no more `which`),
-      added (build-) dependency on libfile-which-perl
-    - Knows about module-init-tools → kmod transition in wheezy/raring.
-    - Adds default mount options for ext4, identical to ext2/ext3.
-    - Ships /etc/initramfs-tools/conf.d/xen-tools for generating Dom0
-      initrds also suitable for DomU usage. Trigger update-initramfs.
-    - By default install linux-image-virtual instead of linux-image-server
-      on Ubuntu Intrepid and newer (Hopefully closes: #640099, LP #839492)
-    - 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.
-    - hooks/common.sh: Rename installCentOS4Package to installRPMPackage.
-      Add installCentOS4Package wrapper for backward compatibility.
-    - 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: #715340) Also supports RPM-based
-      distributions now.
-    - Fixes export of environment variables. Previously they could contain
-      dashes and then were only accessible from within Perl, but not from
-      within Bash.
-    - Fixes creation of "ARRAY(0x…).log" named log files.
-    - Makes some options (like --pygrub) negatable.
-    - Uses Test::NoTabs; add according build-dependency.
-    - Removes unused Perl modules Xen::Tools and Xen::Tools::Log from
-      source code. Also removes the according tests from the test suite.
-      → Remove no more needed build-dependency on Moose.
-    - Better documents and checks requirements for the --apt_proxy
-      value. (See #623443 for the corresponding apt issue.) Add (build-)
-      dependency on libdata-validate-uri-perl.
-    - Use Data::Validate::{Domain,IP} for IP addresses and hostname checks.
-      Add corresponding (build-) dependencies on
-      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 build xen-tools with
-    git-buildpackage.
-  * Clean up debian/rules:
-    - Don't mention (generated) upstream changelog explicitly,
-      dh_installchangelogs finds it by itself if it exist. That way
-      building out of a freshly clone git repository does not fail due to
-      a missing upstream changelog.
-    - Use dh_auto_{install,clean}; use "$(MAKE)" instead of "make" where
-      dh_auto_* can't help. No more explicitly call "make manpages", it's
-      a depedency of "make install" in the next line anyway.
-    - Finally switch to a minimal dh style debian/rules.
-  * Bump debhelper compatibility to 9
-    - Update versioned debhelper build-dependency
-  * Bump Standards-Version to 3.9.4 (no changes)
-  * Add dependency on ${perl:Depends} to fix dpkg-gencontrol warning.
-  * Bump copyright years in debian/copyright.
-  * Apply wrap-and-sort.
-
- -- Axel Beckert <abe@debian.org>  Fri, 23 Aug 2013 19:00:03 +0200
-
-xen-tools (4.3.1-1) unstable; urgency=low
-
-  * Remove t/modules.t in upstream's t/Makefile instead of debian/rules'
-    clean target.
-  * Run t/hook-tls.t only if distribution actually has
-    10-disable-tls. Fixes test suite failure on 32 bit architectures.
-
- -- Axel Beckert <abe@debian.org>  Sat, 30 Jun 2012 16:44:50 +0200
-
-xen-tools (4.3-1) unstable; urgency=low
-
-  * New upstream release
-    - Remove most Mercurial traces
-  * Fixes FTBFS due to testsuite failures (Closes: #676681)
-    - Disable tests of not yet used Xen::Tools. Fixes FTBFS in test suite
-      due to not satisifed Moose dependency in Xen::Tools::Log.
-    - Added build-dependencies on libmoose-perl, git, and
-      libtest-pod-coverage-perl for t/perl-syntax.t, t/gitignore.t, and
-      t/pod-coverage.t.
-    - Skip t/hook-inittab.t if /etc/inittab is not present on the build
-      host. Fixes FTBFS on Ubuntu.
-  * Switch to source format to "3.0 (quilt)"
-  * Don't remove stamp files manually, dh_clean does that already
-  * Remove generated file t/modules.t in clean target to be able to build
-    twice in a row.
-
- -- Axel Beckert <abe@debian.org>  Tue, 26 Jun 2012 22:23:59 +0200
-
-xen-tools (4.3~rc1-1) unstable; urgency=low
-
-  * New upstream release candidate
-    - Correctly checks and documents valid values for
-      disk_device. (Closes: #621499)
-    - Supports creating Ubuntu 11.10 Oneiric DomUs (LP: #848654)
-    - Supports creating Ubuntu 12.04 Precise and 12.10 Quantal DomUs
-    - Supports creating CentOS 6 DomUs (Closes: #578399; Thanks Johan
-      Schurer)
-      + Recommend rinse >= 1.9.1-1
-    - Supports rinse 2.0
-    - Updated mirror list for discontinued releases of Debian and Ubuntu
-    - Workaround for missing unit parsing in xen-create-nfs (Closes:
-      #648814)
-    - Fix wildcard vs regexp in memory configuration parsing.
-    - Fix misbehaviour if --ip option is passed multiple times (Closes:
-      #652110; Thanks Brian Bennett and Alexander Mette!)
-    - Supports /etc/apt/sources.list.d/ (Closes: #650300)
-    - xt-guess-suite-and-mirror exits with non-zero if no proper mirror
-      could be extracted from /etc/apt/sources.list or
-      /etc/apt/sources.list.d/*.list (Thanks Phil Frost!)
-    - Only attempts to generate the ssh host keys if not already present
-      (Closes: #607236; Thanks Vagrant Cascadian!)
-    - New option --apt_proxy (Closes: #610457; Thanks Alex Tomlins!)
-    - Always write down root partition as first physical device, otherwise
-      pygrub fails (Closes: #609673)
-    - No more expect at least one option to mkfs.* calls. Fixes btrfs
-      creation.  (Closes: #609982)
-    - Fixes call to non-existent function logPrint (Closes: #673335)
-    - Also disable initctl in the chroot, not only start-stop-daemon
-      (LP: #997063; Thanks xstasi!)
-    - Massive code deduplication in hooks directory
-    - Use release blacklist for libc6-xen instead of whitelist in
-      hooks/debian.d/20-setup-apt
-    - Enforces umask 022 in 50-setup-hostname* (Hopefully closes: #619630)
-  * Add dependency on openssh-client for ssh-keygen (Closes: #649108)
-  * Use dh_auto_test for build time tests and add according
-    build-dependencies on devscripts and libfile-slurp-perl.
-  * No more suggest evms-cli -- it's no more available on any supported
-    Dom0 distribution. Thanks to Markus Waldeck for the hint.
-  * Add NEWS to debian/docs.
-  * Bump Standards-Version to 3.9.3 (no changes)
-  * Fix the following Lintian warnings:
-    - copyright-refers-to-symlink-license
-    - debian-rules-missing-recommended-target
-  * debian/copyright: Update copyright years
-  * Move xen-utils (for pygrub) from Suggests to Recommends as pygrub
-    becomes the necessary way to boot more and more often.
-  * Remove xen-shell from Recommends, nobody picked it up. (Closes:
-    #603708)
-
- -- Axel Beckert <abe@debian.org>  Fri, 08 Jun 2012 14:18:38 +0200
-
-xen-tools (4.2.1-1) unstable; urgency=low
-
-  * New upstream release
-    - Fixes bashism in "editor" roles script. Thanks Raphaël Halimi for
-      the patch! (Closes: #605203)
-    - Fixes missing architecture check in Sarge amd64 special case. Thanks
-      to Guillaume Pernot! (Closes: #611397) Also changes default Sarge
-      amd64 mirror to http://archive.debian.org/debian-amd64/.
-    - Allows --ip=auto again (Closes: #611407)
-    - Unmounts /proc and /dev/pts of the freshly installed DomU just
-      before unmounting the disk image. (Closes: #588783)
-
- -- Axel Beckert <abe@debian.org>  Thu, 17 Mar 2011 01:00:47 +0100
-
-xen-tools (4.2-1) unstable; urgency=low
-
-  * New upstream release
-    - Fixes several cases of broken or incomplete config files with
-      unexpected or seldom parameter combinations. (Closes: #484652)
-    - Updates examples in /etc/xen-tools.conf to better reflect current
-      state
-    - Allows usage of xvc* as serial console as used as default by older
-      Xen versions.
-    - Preliminary support for Ubuntu 11.04 (Natty) and Debian 7.0 (Wheezy)
-      (Closes: #597521)
-    - Switches default mirror for EoL'ed Ubuntu 8.10 (Intrepid) and Debian
-      4.0 (Etch) to the distributions' archives for old releases.
-  * Does no more try extract the upstream changelog during debian package
-    build. The commit which introduced this problem has been reverted.
-    Document more clearly in debian/README.source how to build the package
-    from a checked out copy of the git repository, especially that the
-    upstream changelog has to be generated first out of the VCS log.
-    (Closes: #595883)
-  * Update debian/copyright: Add Stéphane Jourdois to list of authors.
-
- -- Axel Beckert <abe@debian.org>  Tue, 05 Oct 2010 19:01:49 +0200
-
-xen-tools (4.2~rc1-1) unstable; urgency=low
-
-  [Axel Beckert]
-  * New upstream release candidate
-    - Uses GeoIP for Debian mirrors: Default Debian mirror is now
-      cdn.debian.net, see http://wiki.debian.org/DebianGeoMirror for
-      details.
-    - Uses the same 15-disable-hwclock hook for Debian as for Ubuntu DomUs
-      (Closes: #588880)
-    - Mounts not only /proc but also /dev/pts automatically before running
-      any customisation hooks (Closes: #588783)
-    - Uses apt-config to parse Dom0's apt.conf. (Closes: #560011)
-    - Fixes wrong loop module parameter syntax in warning. Thanks to
-      Daniel Baumann for spotting this. (Closes: #516902)
-    - With --verbose, the output of commands called by xen-tools
-      (e.g. debootstrap) is not only logged, but also printed to
-      STDOUT. (Closes: #513126)
-    - Adds btrfs support.
-  * Bump Standards-Version to 3.9.1 (no changes)
-
-  [Stéphane Jourdois]
-  * [debian/control] Suggest btrfs-tools
-
- -- Axel Beckert <abe@debian.org>  Sun, 15 Aug 2010 19:34:38 +0200
-
-xen-tools (4.2~beta1-1) unstable; urgency=low
-
-  * New maintainer and upstream authors
-  * Reintroduction into Debian Unstable (Closes: #566714)
-  * New upstream beta version
-    - Needs dependency on libfile-slurp-perl
-    - Supports for more recent versions of Fedora, Ubuntu and Debian
-      (Closes: #499477)
-    - Supports pygrub. (Added "Suggests: xen-utils" to debian/control)
-    - Uses hvc0 and xvda devices by default
-    - Sets umask to 0077 before creating disk images (Closes: #548909)
-    - Makes sure, MAKEDEV is found in either /dev/ or /sbin/
-      (Closes: #502798, #515228)
-    - Changed rinse path to /usr/sbin/. (Closes: #511211)
-    - Doesn't delete configuration file if it already exists when
-      xen-create-image is run. (Closes: #520177)
-    - Doesn't write the FQDN into /etc/hostname (Closes: #492583)
-    - Dereferences pointers before hashing them to generate a MAC
-      address. (Closes: #547265)
-    - Calls pwconv and grpconv inside chroot when installing Fedora
-      (Closes: #499476)
-    - Fixed typo in /usr/lib/xen-tools/*.d/75-fixup-securetty
-      (Closes: #503339)
-    - Makes better decisions about when to enable Debian security updates
-      in the created DomU (LP: #309750)
-    - Installs dhclient for CentOS and Fedora if DHCP networking is
-      requested (LP: #241446)
-    - Fixes some bashisms (Closes: #530226)
-      * [^y] → [!y] (Thanks to Mathieu Parent!)
-      * kill -HUP → kill -s HUP (found by checkbashism)
-      * ${parm/?/pat[/str]} → echo | sed
-      * echo -e → printf
-      * read → read dummy
-    - xt-install-image now exits with return value 127 instead of 0 to
-      indicate errors on running the command given in --install-method.
-      (Closes: #534290)
-    - The debootstrap command now also can be configured on the
-      commandline with --debootstrap-cmd in xen-create-image and
-      xt-install-image (Enhances fix for #436480 which added the
-      debootstrap-cmd config file option)
-    - Checks for debootstrap and cdebootstrap, uses debootstrap if both
-      are installed (Changed "Depends: debootstrap" to "Depends:
-      debootstrap | cdebootstrap" in debian/control)
-    - Added new files TODO and KNOWN_BUGS to debian/docs.
-  * Removal of /etc/bash_completion.d/xm from the package since
-    bash-completion ships a more elaborate version of that file. (Closes:
-    #566683, #550590, LP: #538917, #484098)
-  * Downgrade reiserfsprogs and xfsprogs to Suggests. (Closes: #561618,
-    LP: #80233)
-  * Added evms-cli to Suggests. It has been removed from Debian before
-    Lenny, but it is necessary for some optional functionality of
-    xen-tools. And since some Debian derived distributions (e.g. Ubuntu
-    LTS and grml) still support it, it's included for the sake of
-    completeness and correctness.
-  * Added cfengine2 to Suggests. It is helpful to have it installed when
-    using the cfengine2 role.
-  * Bump Standards-Version to 3.8.4 (no changes necessary)
-  * Bump Debhelper Compatibility to 7
-    - Replace "dh_clean -k" by "dh_prep"
-  * Add Vcs-* headers pointing to new upstream and packaging repository
-  * Fix some Lintian warnings:
-    - [debian/control]: debhelper-but-no-misc-depends
-    - [debian/copyright]: copyright-without-copyright-notice
-    - [debian/source/format]: missing-debian-source-format
-  * Added a README.source explaining how to build xen-tools directly from
-    the Git repository.
-  * Overhauled package description
-
- -- Axel Beckert <abe@debian.org>  Sun, 30 May 2010 22:32:30 +0200
-
-xen-tools (4.1-1) unstable; urgency=low
-
-  - New command line argument '--no-hosts' to avoid touching /etc/hosts
-    on dom0
-  - New command line argument '--pygrub' to setup a guest for pygrub use.
-  - Generated configuration file should work for --image-dev + --swap-dev
-    again.
-  - Always use /dev/pts for new images.
-
- -- Steve Kemp <skx@debian.org>  Sun, 23 Nov 2008 13:06:01 +0000
-
-xen-tools (3.9-6) unstable; urgency=low
-
-  - Allow command line flags to be unset.
-    Thanks to Ruud Koolen for the patch.
-    (Closes: #484338)
-
- -- Steve Kemp <skx@debian.org>  Tue, 14 Oct 2008 22:00:22 +0000
-
-xen-tools (3.9-5) unstable; urgency=medium
-
-  - Record the ARCH for RPM-based distros.
-    (Closes: #475125)
-  - Abort if the generated configuration file already exists.
-    (Closes: #499475)
-
- -- Steve Kemp <skx@debian.org>  Mon, 13 Oct 2008 19:20:21 +0000
-
-xen-tools (3.9-4) unstable; urgency=high
-
-  * Changed two defaults in xen-tools.conf to conform
-    to the defaults used by the xen packages:
-      + serial_device: tty1 -> hvc0
-      + disk_device:   sda  -> xvda
-
-  * Priority High because of RC bug. (closes: #499282)
-
- -- Radu Spineanu <radu@debian.org>  Tue, 30 Sep 2008 02:02:21 +0300
-
 xen-tools (3.9-3) unstable; urgency=medium
 
   - Ensure that Fedora guests get /dev/pts mounted.
@@ -652,7 +14,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 the broadcast address.
+    Debian & Ubuntu guests will correctly setup teh broadcast address.
 
  -- Steve Kemp <skx@debian.org>  Wed, 20 Feb 2007 21:22:23 +0000
 
@@ -786,7 +148,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 accidentally trashed.  (Closes: #404443)
+    - Xen configuration files are not accidently 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)
@@ -1134,3 +496,4 @@ 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 +1 @@
-10
+4

debian/control

@@ -1,102 +1,18 @@
 Source: xen-tools
 Section: utils
-Priority: optional
-Maintainer: Axel Beckert <abe@debian.org>
-Build-Depends: debhelper (>= 10~),
-               devscripts,
-               git,
-               libdata-validate-domain-perl,
-               libdata-validate-ip-perl,
-               libdata-validate-uri-perl,
-               libfile-slurp-perl,
-               libfile-which-perl,
-               liblog-message-perl | perl (<< 5.17.0),
-               libterm-ui-perl | perl (<< 5.17.0),
-               libsort-versions-perl,
-               libtest-notabs-perl,
-               libtest-pod-coverage-perl,
-               libtest-pod-perl,
-               libtext-template-perl
-Standards-Version: 4.3.0
-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
+Priority: extra
+Maintainer: Roland Stigge <stigge@antcom.de>
+Uploaders: Radu Spineanu <radu@debian.org>, Steve Kemp <skx@debian.org>
+Build-Depends: debhelper (>= 4.0.0), libtest-pod-perl, libtext-template-perl
+Standards-Version: 3.7.3
+Homepage: http://xen-tools.org/software/xen-tools
 
 Package: xen-tools
 Architecture: all
-Depends: debootstrap | cdebootstrap,
-         libconfig-inifiles-perl,
-         libdata-validate-domain-perl,
-         libdata-validate-ip-perl,
-         libdata-validate-uri-perl,
-         libfile-slurp-perl,
-         libfile-which-perl,
-         libsort-versions-perl,
-         libterm-ui-perl | perl (<< 5.17.0),
-         libtext-template-perl,
-         openssh-client,
-         perl,
-         ${misc:Depends},
-         ${perl:Depends}
-Recommends: debian-archive-keyring,
-            e2fsprogs,
-            libexpect-perl,
-            lvm2,
-            rinse (>= 1.9.1-1),
-            ubuntu-keyring | ubuntu-archive-keyring,
-            xen-hypervisor,
-            xen-utils
-Suggests: btrfs-progs | btrfs-tools,
-          cfengine2,
-          grub-xen-host,
-          reiserfsprogs,
-          xfsprogs
-Description: Tools to manage Xen virtual servers
- This package contains tools to manage Debian based Xen virtual servers.
+Depends: debootstrap, perl-modules, libtext-template-perl, libconfig-inifiles-perl
+Recommends: xen-hypervisor-amd64 | xen-hypervisor-i386 | xen-hypervisor-i386-pae, reiserfsprogs, xfsprogs, rinse, xen-shell, libexpect-perl
+Description: Tools to manage Debian XEN virtual servers
+ This package contains tools to manage Debian based XEN virtual servers.
  .
  Using the scripts you can easily create fully configured Xen guest
- domains (DomU) which can be listed, updated, or copied easily.
- .
- xen-tools currently can install:
- .
-   * Debian 3.1 Sarge (i386 only)
-   * Debian 4.0 Etch
-   * Debian 5.0 Lenny
-   * Debian 6.0 Squeeze
-   * 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 Sid (Unstable)
-   * Ubuntu 6.06 Dapper Drake (LTS)
-   * Ubuntu 6.10 Edgy Eft
-   * Ubuntu 7.04 Feisty Fawn
-   * Ubuntu 7.10 Gutsy Gibbon
-   * Ubuntu 8.04 Hardy Heron (LTS)
-   * Ubuntu 8.10 Intrepid Ibex
-   * Ubuntu 9.04 Jaunty Jackaplope
-   * Ubuntu 9.10 Karmic Koala
-   * Ubuntu 10.04 Lucid Lynx (LTS)
-   * Ubuntu 10.10 Maverick Meerkat
-   * Ubuntu 11.04 Natty Narwhal
-   * Ubuntu 11.10 Oneiric Ocelot
-   * Ubuntu 12.04 Precise Pangolin (LTS)
-   * Ubuntu 12.10 Quantal Quetzal
-   * Ubuntu 13.04 Raring Ringtail
-   * Ubuntu 13.10 Saucy Salamander
-   * 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 (preliminary support, under development)
-   * CentOS 5
-   * CentOS 6
+ domains (domU) which can be listed, updated, or copied easily.

debian/copyright

@@ -1,13 +1,9 @@
 This package was debianized by Radu Spineanu <radu@debian.org> on
 Tue, 20 Dec 2005 02:21:05 +0200.
 
-It was downloaded from https://xen-tools.org/software/xen-tools/
+It was downloaded from http://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:
-		     Axel Beckert <abe@deuxchevaux.org>,
-		     Dmitry Nedospasov <dmitry@nedos.net>, and
-		     Stéphane Jourdois <sjourdois@gmail.com>
+Copyright Holder: Steve Kemp <steve@steve.org.uk>
 
 License:
 
@@ -23,17 +19,6 @@ Perl is distributed under licenses:
     b) the "Artistic License" which comes with Perl.
 
     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
+    Public License can be found in /usr/share/common-licenses/GPL' 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,5 +1,4 @@
 /etc/xen-tools
 /etc/xen-tools/role.d
-/etc/xen-tools/hooks.d
 /etc/xen-tools/skel
-/usr/share/xen-tools
+/usr/lib/xen-tools

debian/docs

@@ -1,4 +1,5 @@
 AUTHORS
-README.markdown
-SUPPORT.markdown
-TODO.markdown
+README
+SUPPORT
+BUGS
+TODO

debian/examples

@@ -1 +0,0 @@
-examples/*

debian/examples/setup-kernel-initrd

@@ -53,7 +53,7 @@ cat <<EOF
   Press enter to continue, or Ctrl-c to abort.
 
 EOF
-read __dummy
+read
 
 
 

debian/gbp.conf

@@ -1,3 +0,0 @@
-[DEFAULT]
-upstream-tag=release-%(version)s
-debian-tag=debian-%(version)s

debian/lintian-overrides

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

debian/maintscript

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

debian/preinst

@@ -23,16 +23,5 @@ if [ -d "/usr/lib/xen-tools/ubuntu.d" ]; then
 	rm -r /usr/lib/xen-tools/ubuntu.d
 fi
 
-#
-# 4.1 -> 4.2
-#
-
-if [ -L "/usr/lib/xen-tools/intrepid.d" ]; then
-        rm /usr/lib/xen-tools/intrepid.d
-fi
-if [ -L "/usr/lib/xen-tools/karmic.d" ]; then
-        rm /usr/lib/xen-tools/karmic.d
-fi
-
 #DEBHELPER#
 exit 0

debian/rules

@@ -2,15 +2,54 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-%:
-	dh $@
 
-override_dh_auto_test:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS) $(DEB_BUILD_PROFILES)))
-	$(MAKE) non-author-test
-endif
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	touch configure-stamp
 
-override_dh_installchangelogs:
-	dh_installchangelogs NEWS.markdown
 
-override_dh_auto_build:
+build: build-stamp
+
+build-stamp: configure-stamp 
+	dh_testdir
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	make clean
+	rm -f build-stamp configure-stamp
+	dh_clean 
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+
+	make manpages
+	make install prefix=`pwd`/debian/xen-tools
+
+	dh_installdirs
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_install
+	dh_installexamples debian/examples/setup-kernel-initrd debian/examples/update-modules
+	dh_installchangelogs ChangeLog
+	dh_installdocs
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure

debian/source/format

@@ -1 +0,0 @@
-3.0 (quilt)

debian/tests/adequate

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

debian/tests/control

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

debian/tests/functionality

@@ -1,15 +0,0 @@
-#!/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 +0,0 @@
-activate-noawait update-initramfs

debian/upstream/metadata

@@ -1,12 +0,0 @@
-%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

@@ -1,147 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1
-
-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+iQI2BBMBCAAgBQJK
-WmewAhsDBAsJCAcFFQoJCAsFFgIDAQACHgECF4AACgkQL/nNWWEmFrWEPQ/9GGFX
-pnfigWU5hMLJQ94b5k6yv1+faLhuhYN26MhbijYW9vs5D7B6TlgnvmMh+jCbSBiO
-f2GRnVf4nFCPY3mDfGKvU1IDbxsLJ9jgIbJcCKAmJ4kV+iaHP8FopHFKrxLroz+O
-XDkVCHblA5GMBgnKLqylcc5sUf4XCPu9YX+sSLTNPbwzXfxyuAQpN1cX+MPvJ7iq
-EI+qRgLtjtZVp8pYX5Xb/xSvQKMLtlRDHGL0INhNWoJHYdODH2mNA2h5yOTpTF9y
-R+WiRQa5ftNWqEkJWeMVu8XMcSB3QqVeYC/rkmle9YHW4fVmOY3HRTF3fp/iBK5l
-I4q+iPROn00SxRYEF9RZ22D/OIl6rqVd41T3F9EOr3aYwrkG5JTRdaf+uRER51Wc
-lpKg36WlI6SSsgM8JAEdMf/UlqiAjaRyqloZ65nCg5eDigK6BhdQwpyp6nN2BjsW
-7zNrZ3AnoB36QlHlesb8Khk/G8bv7D7VA3U48H72ZrjQJPyDWROVVbf23fCbZP1p
-n4NAOogNDBJs+n8nJoO9KSIyonUwNKVvQZnEaO4fzeYcuPgO3aQk91sdK7DW8x8Y
-k89MD0QZCXsy1kOUz8LlOI/ATVkDyi43qIj0rACXu2bFhPCoGSlgFLF8CU6sz5Up
-t6XGVYdYUmi0fv/hRllmoXwqqxjfFaAxN05OoPu0LkF4ZWwgQmVja2VydCAoRS1N
-YWlsICsgSmFiYmVyKSA8YWJlQG5vb25lLm9yZz6JAjYEEwEIACAFAkpaax4CGwME
-CwkIBwUVCgkICwUWAgMBAAIeAQIXgAAKCRAv+c1ZYSYWtX8lD/9n+IWUZKsZjKfP
-+ylhvzMI3s0l4WSOIyCdiW+0O4XFP7LUczppQo78X5G/AWRP1T0McQrSFMEwT2Gm
-oNdJlChlNqH+9RiV5E8KGZ9aLsuALjuHj3lkoO25Sl18RyOoUhwEFUk9dFHb3l8I
-Mqg+NjnHG2Vm4j1HPuPPp5qrppW8iPt+oq+yLXGZGgKzITSmkNyrgkzIP/dsgsyu
-r2pPnEnQ9o72SYrJnrsPtrRbLnk6+VzON5VcUpxoGu80/r59g4vLxHqrQqFi1rUy
-5B616EN2iduZF6w24V3x9v8aX+x6zgnnMLJEd5V5KwOMwul6VYUCpxDE/Vctt5zt
-ZL5eKv+81NyonNRlsMi1c4UGzN5NkcblAF7SrDhDGOnjFTNZVG3QtYoGTOpryute
-+ETlqQ+NNdiAvsEoVb5IQEKI71KAHWvg16dZsHqFauwFmOz67+GYuipXIPZH/b/T
-IQ9h/yeISM8Tm59ymT0ZscuDe4FLdii4rXa43fEPUmCShcmwY0w6NNjLtRlXgJ4y
-LWqLUTf94l9M/FVbd8CQ/6cw5TwzrzyK88/rY5CnoL4zy2yZWfn9Jl/zZBqPOIxn
-ZPNQtr60phOpZY2kHuCr8EriE8KbTFj0R/GjP+CjJw0qNhKYxJjRbxwaqtMUcvkw
-lQIURcJomjGNU2VJlgEykiBdii43M7QqQXhlbCBCZWNrZXJ0IChTeW1saW5rKSA8
-eHRhcmFuQHN5bWxpbmsuY2g+iQI2BBMBCAAgBQJKWmtKAhsDBAsJCAcFFQoJCAsF
-FgIDAQACHgECF4AACgkQL/nNWWEmFrWA0Q/9FIZvkqymKMGX3w3kfaKXfG3D9oe3
-6tBcwhy1PIbTGWpI2XvgoxyimgH5kgjqRq5jSO/uIps6nWUHIK09cB83jkhocliU
-kvYjRJ4AcAKjH44GKFzder01JDAln3kv3Mw0M+NKo/h4JO2zUmizNwRgMkHqhx8q
-oWqBfZVe+1hH6GRF9wVEaiblIgeA1DWI2MFrYlsgHyIyZE+Ir6ZVITcouv0eTEVv
-NecxRDkaA/G44O9U/3sFGG7wgON4Ad1tdJqr9TPsJQMFm2iCrCj5uEau94gVeyz4
-FMiCjtQNYzG1AvPF+C7iVc/Ob0uutvkIFYTu5zMkMi6B4zDX3LO9Vk7KBUnZgHMr
-og+AhXABqlDgwnqqnJOTpJlBKe8ibJQGE4A0IgqM6MtLumDmT7kRwEuHQW4ax7j+
-E5+sYTNqwjpyu20KatRq1OyrsArfVUTLTeAUwB+gy1Dnb62ClCB+1g9L+Cb9ZE/n
-xxfMM7DMy2gFa6wjFdTlYkIxiZC9iLYMUxKlIXmaySIV98mH7fQ9Ojk0Q2RqCnrH
-pbBQi89nwNXrq+T637WWkSbfvtV68S1jydgL+i5A2J7PkztvXKFkTF40kgtyVCsF
-KaoVfjeCDdgVGFKtC7NR25NJu1wikqAYZM/eKvPoFTkjf7A2btFKLckXkM6eASMm
-7nx2k2WQ6iTUM+u0E0F4ZWwgU3RlZmFuIEJlY2tlcnSJAjYEEwEIACAFAkpaa2sC
-GwMECwkIBwUVCgkICwUWAgMBAAIeAQIXgAAKCRAv+c1ZYSYWtawCD/9CdOQvdt9X
-yqKXhOODBVOnHyr1BEteuU41g7YVmH4xrgNOPvjtxzPF4EPMBk/r3IfoaesnSaNS
-g/b+OfS6LHmT+bQMU+a8X2R6kickUbJerlOS4eaIpMGPN7ldHhKo9OcbPysGtLaR
-s+MIh2CORwz64i4ySSEYpKQZISeVrX4cdI8ZxKDbotszD371DXD28S14Eom2uy/d
-4c6J771/xCq3+RH2QfHxFbKK7FBfAUoYlkfIAzSMUP3EuN/vr9hVJ2g5yM+zYN5y
-zdCYbeDoBCIlu2VFavTCfY7zenQVSukNdNOE3iIdUAhuijnf5L6KC15ymnOU4dHi
-qbkGG2ujFvXjzFqmIlflnFZ/G8O+s8C+5D9qQve0XweOSd46Nd2hzG7ZCDLd18Oy
-wdkVk3Nk3QNc2vSfQRyXavYyb6cDD/33Bjkef3y1sAAgH58tUFQXCedc0gRP3UYT
-o9yyvwQoBx+QHw3gYGaGJvx3NMA+gQq3ufbr6JUn/P7j9Z09eXQZ0HUTE22+Xxd5
-rORcGPRyknAXy4kgiQAc8QhwPqVSVlbGnDz+rWryF+HwD1X5neYHwz0qOCukuAMV
-ezq6BNJvuYRrLqCOzu18LD9rqiYeNxyUnH/UFFefQdW2SPJKBNtChVAZd8lJdaHv
-mGyvPi85mey1j1Dzn/mF3Dwjtl0GTO7K2rQpQXhlbCBCZWNrZXJ0IChGU0ZFIEZl
-bGxvdykgPGFiZUBmc2ZlLm9yZz6JAjYEEwEIACAFAksejdsCGwMECwkIBwUVCgkI
-CwUWAgMBAAIeAQIXgAAKCRAv+c1ZYSYWtSuGD/0StaDkNfg2jl5k04MuyMuXnLc3
-EXr/T13Kt5XfwDwE8LoVyTo7N7utylPFvMFsWXo7QzniKOCm2A4IjXfncExiGh4a
-h3ONgp66nJT8a8PMPl4YBFaLymNdGA1FkQOZPGUPu+/BJ5Nko42qcr3bTFnr5yU8
-fW50ZJ9Dt2hZZD+z43dDGqSB5VESPuYMLabI9kFfixWpor8Hp/cdRty+6qT8T3L4
-gCzOBhKWY8M//x5rY5SkF182GcOW2AzO1bSnJpNB+Rxp1vj5d05irLl35YZ/B8J6
-oPK+edQGGSYQk3oeZhPyiK67itYust2c9dIgJo1/yqh8nqDNYCtTGr5FJntIwviU
-Oh8BIwD0WPxJs+4icE71Sq+4zqx8bYLaKspu0jSw4ScAkCR6od3kA1K/LKkRI//m
-q288TfarYfrcVgythAjKH9y8RmbgpQK2/dtoAUq+SNtyFDma29JKkuKH5w6o6zFN
-h8INj8tb1L0HC1MVUCqH5Irb9wY9hQuDP9KAaCAhrl4/ckCNUFeTx4mmkVUlfUIR
-1AZ7eGWCRVbjY3vc8UOV/hmsibaSeoPlKriyv++9erHlzZefDILCiZrY5k+vmL5V
-udjKJeNmVmXbnBp4pA0fvOrOsOxt2tMvNwnzrkYAas/OqibdAA2qUyZYgIdK6bCG
-1615bmvpbj8HluZHC7kEDQRKWmvxEBAAiXrRACaF49/act1wqPlsD3syaedMZyvx
-70C259lyo/LYK64lniXDPQnvcJwnMPQrcGjemUBerT1cDoF+FHLMuyPC6rOmeijN
-H//0F0iI8CHulOy1NhtTQfVbLhScIA0o/jZi54caqex/fshyQaoVssLIEZ0PyREF
-w0Fj5c65r6UNEC8ih1aeM1HBOFMgcUdhkKYc7y8K15du9SIqL4rMqBuedE3dKwli
-Weh62GigeojHfBWe9Oeil+MMRyFkIGNPqE7JqFGXlbbEn0qHf9aFo85/W7RCW0L6
-fRMAgQrTat5pkHw2oeY+0XJza/VoptT26FyTldEt/3huPOF3gKwaxKsplFvYik5E
-88G7Rt5FwMf9DJ7xrAMKYFctqyju6Fps+niP+i6Z8mHUmoVdVhLI5JWdFJBhAOxx
-47Pxjy6q0eimK5nHlNpOU+Wm/Wd9I8TflQtbGWi2rqf8TOWTD07VE0WPl+8iHJDQ
-zltRgPqZwD1goXH8WGsc5J/rhokSspCUXMNlcew094l/ZUK+mvvx1aSN7P/gWN8a
-ehthoplXmj6dKyrYObsArN2mjVjov4pi16+GYt5G1kdkFUd9Y/i3CnMxuEasXBbX
-0DaSXZHt7SFh8Q+hWok6Y5DgEt5IMCOKRYyMxIVdto6RckekkGom8oszr6aw6NbX
-YenIau+CO2sAAwYP+gP4bCrqTgIdwgKssjTfRbmpNfzJfXGR4DH9fpQMO4AnCK5L
-r7ZHcehh0ZfybYvfliHTZldQr+iyZavn6bNJ4b+xrUwtzCX1FffBBjq1VogposKe
-y9ALejb/jqiX8nvg7qkuEu8af7E5ufwzh/1/3BZ4x4RVKWVyTexkJTMiTxCH8WzA
-qYhItIG1XnGnbnejN587XOgbGq5j1CIP1ZZh3/bivuONzkebPMPduTu+kofzx8ZW
-ETAcRTDx4AMY4/88Z8k0bGpc2e/4o8Ie0/EGczKPEPHTp3b/nrS6UH2oopuo9bFa
-YKyo8aJ9Z/bTY19Nk8UGDfDqaixVj77lZp51W1Lzmkk+fhwgCOM6CGyradML0Mql
-ugZ11lmqcWcUniIeQAO1Ex0uxTAMhY3HMCYzB4LYfLjnA4YxZyDLm6tpRP/dkMEB
-njViweBzCJ1/heIhloYt6HeIMl2Y0CbVKRYXgjfVjnuSidz2LEjsZor+r5MFlT8q
-c+Z3BB7f46I0agjbEz1Fy4MLCr/f5X9v7lh+klByYWu2AnfN8ryO5rFSLtOxy6cT
-e5y0++yRkft/f/62NrVj4pK/SMIVNaF+T66lHVIXRuRo98ueUNfdaba8SLenwgF1
-kIITHaFO7NoJ/bugHJFZD+sdEV4fO0Wngk/IrGr1pDxH2xqH8pGa91hx1A26iQIf
-BBgBCAAJBQJKWmvxAhsMAAoJEC/5zVlhJha1LFQP/3AfrEA9AayOOXw1prdX1pr7
-zGcSYecM8aPFpkvK8Q2dmJwqR/xAc1vTzW+dquOVG/cFJBftQCDQFgpDQp+Z8t4E
-r2q4px3q0A3gH8Mz1BLZ/OVeU8xU0IRbk6+d9v0n45/S04T/uK46RpDFD4YEVf54
-8tums1+EDaEbbhzEXGBDAjKCarxwJO+i4BR/Kk+9uTNHwMMhekrnQfcWvEgoczvy
-wjIG9EoWVNS0KKFQiYKczV4sdLNQfhOC3iq6JZfipq4i/BEFTSRBISJyyfQPc53g
-m8+qenRNLaidHgjbPAz4AQpwvqG4FbO5F6NdA/6iIfoD0ONbv2CIh7/3B87vvR6S
-8LUYbBcds6hRRN0SVprzh2ywzUrEWbJWdXQ4bmNOnGvyB+F7XT1r0+7mW2IwcMZl
-e4bCX5ODGl4b/YmM3RWCpz/m5FEkaO5EtEW59vv5t5KSRcYjNaetXkJAKHbSFWAJ
-5E0Z/KdI5+2xekisjJqcFCQQkHEae1fjLV14Iqvh4/TL5uRcouCgCTHlsKa9yPn3
-lMHEYKYXprf3hJLYVKA9+KseL2UNRTWR3tlWfNel1+FQ21ZH27bBsVvX4kH79mOA
-o0XZWyYdIOq6Fe+CvZ2PNvDppmaJ1nyetJy21XIweqpYOi+XSSfnywcxqkLiZEFJ
-SHZav7AdNoVLuHc4/dlyuQINBFShPUQBEADMkReQVHSCPmi5Yv7gyOE+VoNSrVfF
-VpbpnFyK+g7/IyAeOV1f91QFUP0RU22CrHFbQaaI4h52y28K/+/9oNoD8U51eDix
-0l5gRjO5Dpis6YSRTAduH9JU9lSJI8ay/0XFahrAZUQaT4WDYrlmRlBuIZ2OjXau
-CpyM4vvgkVE4Njogegnf8Yzjj+V4mT4EWAKcxPGLQ6cL+ASO0bSJDyyt7w8cjvUV
-uFZOST32iE/aamFZPcZZMZ3ZVrZ2qXyuFapEruRsnhAd9a0CGgJ0u5Tex3JxyiNs
-U0Y8JcpzLGeI8J3MQdqnH9pJwHOovJVD6faD3J9fy22B/5zAMH+5ZZv/HxTT3+B9
-8j67jz6E+Q9bRb5i73Loj9hQAY9GuGb6idoTNDLtdVcuonocPqk+FlZEWLfSn5Pk
-nNJ+AAesl1Zh81PdX11KAWqaEKZmazJB/WgD18L8VBCzUPSMrt19pUJ186beAnDz
-HymnS70ZcPppajz+xg2aUBHIuvmNlTAuvwTq4b4R/+W729+7D2dJhTgr82rGbL55
-VQllAYEX5w0/RheU2EZpjgdfl8VCGyGdKD188cIypHQIYA2ZjsvElI/NHJv0BTBV
-PZIgJ6JPPDr7QfY8vzg/EZ6nleLNrdlIHWefOzLL3YWdbv3X9E7Ckl3tzjvl97Mb
-UoYHOZesi5fXKQARAQABiQREBBgBCAAPBQJUoT1EAhsCBQkLRzUAAikJEC/5zVlh
-Jha1wV0gBBkBCAAGBQJUoT1EAAoJEGvmY8daNcl1a8UQAIAXNuGj/NPay0nvHNMl
-eXZuHRQ3C+4ckA5NC1zvPNFR1KZWFA2uFe20Wy9JiC/OS20/kOIYjH8N4nwJkgN8
-PCxeoPwihErttA0MAk0y06RDVoUChfe0w3ekE5VxkT71+XAo4PQpK7wR47tVZeaT
-mMBoX4SFH4g8O5hbc0PazRmVVIWejXcRUYfdbmnv3iCZ8qoskVoZVSS1b4jpVLWi
-YRrWn4TfZB5apHgzmfWG21/Ce/7yQWP22sSU5/o9+HZzYYmhz7DE4DXIxPLz4+2P
-tngKcLOTacxJaB4xbniYl3VmUj3afDWZ3G2XdyfbBAGbOPypNeVkmP1COoWvLLvi
-kuYclF1kdANN7Gi7XBpwUY225luwzmVI8tcjzK/7ErutDKCzC203F9LCwp3jmBxv
-kmndOUMha4R1EuU+8EzIXMXY8jPFH3tH3lJ9qTA1koiYtRxlB2E/EZmPzYB9Kj+S
-e2G7aJ6qemBRHR8KRCDfRxpjN28NMc57j27VRfxCYKdlSujZTs+nn7/jgL3EZ3AK
-JHSJoIgrzaqqr34Siw/0DcAsoJTwuWbknQPgeSv03q2A81JLKEXukTXKCO9DmbBi
-AFyXqQm6NM5MuPSycq5jpM/MWN0Nc/OM3fpvn0NsdOpBpugTzVGQ1H/nQBgAkbAT
-d/cqxybvui/FKnIsc69TVlfjk+0P/0gIHN3Fa1NwNsj+Ui6q8mzrtT5jCa8+b6eh
-r3JlX84Gj6+u7JXTt+LFQWH270xZjo95QHgf9p0/uWPaiW2g6dVB7TGsdCOOL+au
-8ilebcq1B6L6HtgUo65TwcDjdX1lVi33xHXfMbJP6VVq7Lu5P6kqCL0myF5YR/s9
-uIol6+5SGbfGBG+9IXs3Np9D711VNDDojQRWH1eTdsoau21DNa4666g5W3q+yARc
-RaIeKuTTdj1xSctSeDklHaWKyBZzzRDd5Q459GOKf9n3ODjfkAbmuYpuA1Izg3EK
-6miBewL2vhg+6X1RtJ4oVzcI98W+91I+0jDepZ6TSDNrim8bCIYCAfRpzqWi67AH
-JkYvSQ/FPsNAxh9B44q7pD4EFqnVG/Ncl+hemKy5hx0NRD9hgTyhaUjYCkxlfi9v
-jxH0WmaYEQ1VJO6+Nk4kzwo7HDzV7Egdppfat3lz6uU/phu1ck5ye9NsqM35jJ7U
-g7IFdBvkunLucWGUB/k0iTa8K/3HtK0U4W93oSkDI6VBpEN2gkIDtJpl72N4XsO3
-SKevxGFH8eGE5W5B/C4s2kevE6AzYfBy6Ptr9FYFyxwm6EvwKZTmGY/D+qABpFwK
-m0uqlgXaVCF5zZkbb8OZxp/cjb2C2q+F9n8k2ASOxtrR+5f1CzBH+IoBVDHXacGD
-+XwhySae
-=CO5C
------END PGP PUBLIC KEY BLOCK-----

debian/watch

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

etc/distributions.conf

@@ -1,60 +0,0 @@
-# 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
-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
-
-testing      = debian
-oldoldstable = debian dont-test
-oldstable    = debian
-stable       = debian
-unstable     = debian
-
-# 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     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     pygrub
-bionic       = ubuntu     pygrub
-cosmic       = ubuntu     pygrub
-disco        = ubuntu     pygrub
-
-devel        = ubuntu     pygrub dont-test

etc/mirrors.conf

@@ -1,13 +0,0 @@
-# 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:
 #
-#        https://xen-tools.org/
+#        http://xen-tools.org/
 #
 ##
 
@@ -52,16 +52,8 @@
 # LVM volume group here instead
 #
 ##
-# lvm = vg0
+# lvm = skx-vg
 
-#
-##
-#
-# If you have ZFS available and wish to use it then you may specify a
-# ZFS pool name here instead
-#
-##
-# zpool = xenpool0
 
 #
 ##
@@ -115,13 +107,13 @@ install-method = debootstrap
 # (This allows you to install from a .tar.bz file, rather than a plain
 # tar file, use cdebootstrap, etc.)
 #
-# install-method = copy:
+# install-method=copy:
 # copy-cmd = /bin/cp -a $src/* $dest
 #
-# install-method = debootstrap:
-# debootstrap-cmd = /usr/sbin/debootstrap
+# install-method=debootstrap:
+# debootstrap-cmd=/usr/sbin/debootstrap
 #
-# install-method = tar:
+# install-method=tar:
 # tar-cmd  = /bin/tar --numeric-owner -xvf $src
 #
 #
@@ -133,20 +125,29 @@ install-method = debootstrap
 #  Disk and Sizing options.
 ##
 #
-size   = 4G       # Root disk, 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     = 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)
+size   = 4Gb      # Disk image size.
+memory = 128Mb    # Memory size
+swap   = 128Mb    # Swap size
+# noswap = 1      # Don't use swap at all for the new system.
+fs     = ext3     # use the EXT3 filesystem for the disk image.
+dist   = etch     # Default distribution to install.
+image  = sparse   # Specify sparse vs. full disk images.
 
 #
-#  See the README for currently supported and tested distributions. You can
-# either find it in the root directory of the unpacked source or, on Debian
-# and Ubuntu based systems, in /usr/share/doc/xen-tools/README.gz
+#  Currently supported and tested distributions include:
+#
+# via Debootstrap:
+#
+#  Debian:
+#   sid, sarge, etch, lenny.
+#
+#  Ubuntu:
+#   edgy, feisty, dapper.
+#
+# via Rinse:
+#   centos-4, centos-5.
+#   fedora-core-4, fedora-core-5, fedora-core-6, fedora-core-7
+#
 #
 
 
@@ -159,30 +160,14 @@ image  = sparse   # Specify sparse vs. full disk images (file based images only)
 # Uncomment and adjust these network settings if you wish to give your
 # new instances static IP addresses.
 #
-# gateway    = 192.168.1.1
-# netmask    = 255.255.255.0
-# broadcast  = 192.168.1.255
+# gateway   = 192.168.1.1
+# netmask   = 255.255.255.0
+# broadcast = 192.168.1.255
 #
 # Uncomment this if you wish the images to use DHCP
 #
 # dhcp = 1
 
-#
-# Uncomment and adjust this setting if you wish to give your new
-# instances a specific nameserver.
-#
-# By default, nameserver is not set, and Dom0's /etc/resolv.conf will
-# be copied to guest.
-#
-# nameserver = 192.168.1.1
-#
-
-#
-# Setup bridge name for host vif. Useful if you use bridged networking
-# for guests.
-#
-# bridge = xendmz
-#
 
 ##
 # Misc options
@@ -196,41 +181,10 @@ image  = sparse   # Specify sparse vs. full disk images (file based images only)
 #
 
 #
-# The default cachedir is, /var/cache/apt/archives/, however if it
-# does not exist it will default to /var/cache/xen-tools/archives/
-# Uncomment the line below to set it to something else.
-#
-# cachedir = /var/cache/xen-tools/archives/
-#
-
-#
-# Uncomment the following line if you wish not to generate a new root
-# password for the new guest.
-#
-# genpass = 0
-#
-
-#
-# You can also change the password length by uncommenting and
-# changing the line below
-#
-# genpass_len = 8
-#
-
-#
-# You can yet change the hashing method to encrypt the generated
-# password by changing the line below.
-# Valid values : md5, sha256 and sha512.
-#
-# hash_method = sha256
-#
-
-#
-# Uncomment the following line if you wish to interactively setup a
-# new root password for images.
+# Uncomment the following line if you wish to interactively setup
+# a new root password for images.
 #
 # passwd = 1
-#
 
 #
 # If you'd like all accounts on your host system which are not present
@@ -242,15 +196,8 @@ image  = sparse   # Specify sparse vs. full disk images (file based images only)
 #
 # Default kernel and ramdisk to use for the virtual servers
 #
-kernel = /boot/vmlinuz-`uname -r`
-initrd = /boot/initrd.img-`uname -r`
-
-#
-# Uncomment the following line if you wish to use pygrub by default
-# for all distributions.
-#
-# pygrub = 1
-#
+kernel      = /boot/vmlinuz-`uname -r`
+initrd      = /boot/initrd.img-`uname -r`
 
 #
 #  The architecture to use when using debootstrap, rinse, or rpmstrap.
@@ -258,28 +205,40 @@ initrd = /boot/initrd.img-`uname -r`
 #  This is most useful on 64 bit host machines, for other systems it
 # doesn't need to be used.
 #
-# arch = [i386|amd64]
+# arch=[i386|amd64]
 #
 
 #
-# Use the mirror configured on the DomU as default mirror
+# The default mirror for debootstrap to install Debian-derived distributions
 #
-# mirror = `xt-guess-suite-and-mirror --mirror`
+mirror = http://ftp.us.debian.org/debian/
 
-# If this is defined it will be used by debootstrap, and configured as the
-# proxy for the guest
 #
-# apt_proxy =
+# 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:
+#
+# mirror_sid=http://ftp.us.debian.org/debian
+# mirror_sarge=http://ftp.us.debian.org/debian
+# mirror_etch=http://ftp.us.debian.org/debian
+# mirror_dapper=http://archive.ubuntu.com/ubuntu
+# mirror_edgy=http://archive.ubuntu.com/ubuntu
+# mirror_feisty=http://archive.ubuntu.com/ubuntu
+# mirror_gutsy=http://archive.ubuntu.com/ubuntu
+
 
 #
 #  Filesystem options for the different filesystems we support.
 #
-ext4_options     = noatime,nodiratime,errors=remount-ro
-ext3_options     = noatime,nodiratime,errors=remount-ro
-ext2_options     = noatime,nodiratime,errors=remount-ro
-xfs_options      = defaults
-reiserfs_options = defaults
-btrfs_options    = defaults
+ext3_options   = noatime,nodiratime,errors=remount-ro
+ext2_options   = noatime,nodiratime,errors=remount-ro
+xfs_options    = defaults
+reiser_options = defaults
 
 #
 #  Uncomment if you wish newly created images to boot once they've been
@@ -289,17 +248,17 @@ btrfs_options    = defaults
 
 
 #
-#  If you're using the lenny or later version of the Xen guest kernel you will
-# need to make sure that you use 'hvc0' for the guest serial device,
-# and 'xvdX' instead of 'sdX' for disk devices.
+#  If you're using a newer version of the Xen guest kernel you will
+# need to make sure that you use 'xvc0' for the guest serial device,
+# and 'xvdX' instead of 'sdX' for serial devices.
 #
 #  You may specify the things to use here:
 #
-# serial_device = hvc0 #default
-# serial_device = tty1
+# serial_device = tty1 #default
+# serial_device = xvc0
 #
-# disk_device = xvda #default
-# disk_device = sda
+# disk_device = sda  #default
+# disk_device = xvda
 #
 
 
@@ -315,20 +274,3 @@ btrfs_options    = defaults
 # output    = /etc/xen
 # extension = .cfg
 #
-
-#
-#  Here you can control weather your dom0's /etc/hosts file should be
-# appended with the new guest, and also if your dom0's /etc/hosts file
-# should be copied to the new guest.
-#
-#  Change the following options to 1 to set them
-# nohosts - don't touch the dom0's /etc/hosts file
-# copyhosts - copy the dom0's /etc/hosts to the guest
-#
-#  by default new guests ARE added to the dom0's /etc/hosts file
-# nohosts = 0 # default
-#
-#  by default the dom0's /etc/hosts IS NOT copied
-# copyhosts = 0 # default
-#
-

etc/xm-nfs.tmpl

@@ -17,11 +17,6 @@
   }
 }
 memory  = '{$memory}'
-{ if ( $maxmem )
-  {
-    $OUT .= "maxmem      = '$maxmem'\n";
-  }
-}
 
 
 # Name

etc/xm.tmpl

@@ -6,79 +6,35 @@
 #
 #  Kernel + memory size
 #
-{ if ( ( $kernel ) && ( !defined($pygrub)) )
+{ if ( $kernel )
   {
-    $OUT .= "kernel      = '$kernel'\n";
-    $OUT .= "extra       = 'elevator=noop'";
+    $OUT.= "kernel      = '$kernel'";
   }
 }
-{ if ( ( $initrd ) && ( !defined($pygrub)) )
+{ if ( $initrd )
   {
     $OUT.= "ramdisk     = '$initrd'";
   }
 }
-{
-  if ( $pygrub )
-  {
-    $OUT .= "bootloader = 'pygrub'\n";
-  }
-}
-vcpus       = '{$vcpus}'
 memory      = '{$memory}'
-{ if ( $maxmem )
-  {
-    $OUT .= "maxmem      = '$maxmem'\n";
-  }
-}
 
 #
 #  Disk device(s).
 #
-{
-  if ( !defined($image_vbd ) )
+{ 
+  for ( my $i = 0; $i <= $#PARTITIONS; $i++ )
   {
-    for ( my $i = $#PARTITIONS; $i >= 0 ; $i-- )
-    {
       if ( $PARTITIONS[$i]{'mountpoint'} eq '/' )
       {
           $OUT .= "root        = '/dev/$device" . ($i + 1) . " ro'\n";
       }
-    }
-    $OUT .= "disk        = [\n";
-    for ( my $i = $#PARTITIONS; $i >= 0 ; $i-- )
-    {
-       if ( $PARTITIONS[$i]{'mountpoint'} eq '/' )
-       {
-           $OUT .= "                  '$PARTITIONS[$i]{'imagetype'}$PARTITIONS[$i]{'image'},$device" . ( $i + 1 ) .",w',\n";
-       }
-    }
-    for ( my $i = $#PARTITIONS; $i >= 0 ; $i-- )
-    {
-       if ( $PARTITIONS[$i]{'mountpoint'} ne '/' )
-       {
-           $OUT .= "                  '$PARTITIONS[$i]{'imagetype'}$PARTITIONS[$i]{'image'},$device" . ( $i + 1 ) .",w',\n";
-       }
-    }
-    $OUT .= "              ]\n";
   }
-}
-
-#
-#  Physical volumes
-#
-{
-    if ( $image_vbd )
-    {
-        $OUT .= "root        = '/dev/$device" . "2 ro'\n";
-        $OUT .= "disk        = [\n";
-        $OUT .= "                  '$image_vbd," . $device . "2,w',\n";
-
-        if ( $swap_vbd )
-        {
-            $OUT .= "                  '$swap_vbd," . $device . "1,w',\n";
-        }
-        $OUT .= "              ]\n";
-    }
+  $OUT .= "disk        = [\n";
+  for ( my $i = 0; $i <= $#PARTITIONS; $i++ )
+  {
+      $OUT .= "                  '$PARTITIONS[$i]{'imagetype'}$PARTITIONS[$i]{'image'},$device" . ( $i + 1 ) .",w',\n";
+  }
+  $OUT .= "              ]\n";
 }
 
 #
@@ -96,26 +52,12 @@ name        = '{$hostname}'
     # Setup the mac address, if present.
     my $m = '';
     if ( $mac )
-    {
+    { 
       $m = "mac=$mac"
     }
-    my $br = '';
-    if ( $bridge )
-    {
-      if ( $mac )
-      {
-        $br = ",bridge=$bridge"
-      }
-      else
-      {
-        $br = "bridge=$bridge"
-      }
-    }
-    $OUT .= "vif         = [ '";
-    $OUT .= "$m";
-    $OUT .= "$br";
-    $OUT .= "' ]";
-  }
+
+    $OUT .= "vif         = [ '$m' ]";
+  }    
   else
   {
     #
@@ -123,33 +65,12 @@ name        = '{$hostname}'
     #
     my $m = '';
     if ( $mac )
-    {
+    { 
       $m = ",mac=$mac"
     }
 
-    my $vn = '';
-    if ( $vifname )
-    {
-      $vn = ",vifname=$vifname";
-    }
-
-    my $br = '';
-    if ( $bridge )
-    {
-      $br = ",bridge=$bridge"
-    }
-
-    my $vl = '';
-    if ( $vlan )
-    {
-      $vl = ".$vlan"
-    }
-
-    $OUT .= "vif         = [ 'ip=$ips";
-    $OUT .= "$m";
-    $OUT .= "$vn";
-    $OUT .= "$br";
-    $OUT .= "' ]";
+    $OUT .= "vif         = [ 'ip=$ip1"; 
+    $OUT .= "$m' ]";
   }
 }
 

examples/release-testing

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

@@ -19,7 +19,7 @@ hooks/
    * The installation will have a running installation of OpenSSH
 
   The subdirectories in this hooks/ directory will be installed
- to the directory /usr/share/xen-tools/
+ to the directory /usr/lib/xen-tools/
 
 Steve
 --

hooks/artful/01-disable-daemons

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

hooks/artful/05-shadowconfig-on

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

hooks/artful/15-disable-hwclock

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

hooks/artful/20-setup-apt

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

hooks/artful/25-generate-locale

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

hooks/artful/30-disable-gettys

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

hooks/artful/35-setup-users

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

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

@@ -1,128 +0,0 @@
-#!/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
-
-    #
-    # 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}]
-      gateway4: ${gateway} 
-      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

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

hooks/artful/60-copy-host-files

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

hooks/artful/65-copy-user-files

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

hooks/artful/70-install-ssh

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

hooks/artful/75-fixup-securetty

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

hooks/artful/80-install-kernel-ubuntu

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

hooks/artful/80-install-modules

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

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

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

hooks/artful/82-install-grub-legacy

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

hooks/artful/90-make-fstab

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

hooks/artful/99-clean-image

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

hooks/artful/99-enable-daemons

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

hooks/centos-4/10-disable-tls

@@ -1 +0,0 @@
-../common/10-disable-tls

hooks/centos-4/10-disable-tls

@@ -0,0 +1,49 @@
+#!/bin/sh
+#
+#  This script disables TLS on the new image.
+#
+# Steve
+# --
+# http://www.steve.org.uk/
+
+
+
+prefix=$1
+
+
+#
+#  Source our common functions
+#
+if [ -e /usr/lib/xen-tools/common.sh ]; then
+    . /usr/lib/xen-tools/common.sh
+else
+    . ./hooks/common.sh
+fi
+
+
+#
+# Log our start
+#
+logMessage Script $0 starting
+
+
+#
+# Don't touch TLS on 64 bit platforms.
+#
+if [ "`uname -m`" = "x86_64" ]; then
+    logMessage "Ignoring TLS since we're a 64 bit host."
+    exit
+fi
+
+
+#
+# Disable TLS and create an empty directory in its place
+# 
+mv ${prefix}/lib/tls ${prefix}/lib/tls.disabled
+mkdir ${prefix}/lib/tls
+
+
+#
+#  Log our finish
+#
+logMessage Script $0 finished

hooks/centos-4/15-setup-arch

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

hooks/centos-4/20-setup-yum

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

hooks/centos-4/20-setup-yum

@@ -0,0 +1,51 @@
+#!/bin/sh
+#
+#  This script sets up the Yum for CentOS4.
+#
+# Steve
+# --
+# http://www.steve.org.uk/
+
+
+prefix=$1
+
+
+#
+#  Source our common functions
+#
+if [ -e /usr/lib/xen-tools/common.sh ]; then
+    . /usr/lib/xen-tools/common.sh
+else
+    . ./hooks/common.sh
+fi
+
+
+#
+# Log our start
+#
+logMessage Script $0 starting
+
+
+#
+#  DNS is probably required to run "yum update".
+#
+cp /etc/resolv.conf ${prefix}/etc
+
+#
+# Update yum
+#
+if [ ! -d ${prefix}/proc ]; then
+    mkdir -p ${prefix}/proc
+fi
+mount -o bind /proc ${prefix}/proc
+chroot ${prefix} /usr/bin/yum  update
+umount ${prefix}/proc
+
+#
+#  Log our finish
+#
+logMessage Script $0 finished
+
+
+
+

hooks/centos-4/30-disable-gettys

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

hooks/centos-4/30-disable-gettys

@@ -0,0 +1,58 @@
+#!/bin/sh
+#
+#  This script comments out all virtual terminals which aren't on the
+# first console - that must remain so that 'xm console ...' works
+# correctly.
+#
+# Steve
+# --
+# http://www.steve.org.uk/
+
+
+prefix=$1
+
+
+#
+#  Source our common functions
+#
+if [ -e /usr/lib/xen-tools/common.sh ]; then
+    . /usr/lib/xen-tools/common.sh
+else
+    . ./hooks/common.sh
+fi
+
+
+#
+# Log our start
+#
+logMessage Script $0 starting
+
+
+#
+# Do the transformation.
+#
+sed -i -e 's/^\([2-6].*:respawn*\)/#\1/' -e 's/^T/#\t/' ${prefix}/etc/inittab
+
+
+#
+#  Are we using an alternative serial device?
+#
+if [ ! -z "${serial_device}" ]; then
+
+    serial_device=`basename ${serial_device}`
+
+    # Let the user know.
+    logMessage "Replacing default serial device (tty1) with ${serial_device}"
+
+    # replace existing device.
+    sed -i -e s/tty1/${serial_device}/ ${prefix}/etc/inittab
+
+    # make sure that it is allowed to login.
+    echo $serial_device >> ${prefix}/etc/securetty
+fi
+
+
+#
+#  Log our finish
+#
+logMessage Script $0 finished

hooks/centos-4/35-setup-users

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

hooks/centos-4/35-setup-users

@@ -0,0 +1,181 @@
+#!/usr/bin/perl -w
+#
+#  This script attempts to copy all user accounts from the host to
+# the guest.  It does this by copying all user accounts which are not
+# already present.
+#
+#  NOTE:  Unless '--accounts' was specified upon the 'xen-create-image'
+# command line we don't do this.
+#
+# Steve
+# --
+# http://www.steve.org.uk/
+
+
+use strict;
+use Env;
+
+
+my $prefix = shift;
+
+die "Prefix must be given"       unless defined( $prefix );
+die "Prefix must be a directory" unless ( -d $prefix );
+
+
+#
+#  Exit unless the 'accounts' variable is set.
+#
+exit unless ( $ENV{'accounts'} );
+
+#
+#  Make sure we have $prefix/etc
+#
+die "Prefix is missing /etc : $prefix" unless ( -d $prefix . "/etc" );
+
+
+#
+#  Read all accounts from the installed /etc/passwd on the guest.
+#
+my %present;
+if ( -e $prefix . "/etc/passwd" )
+{
+    %present = readAccounts( $prefix . "/etc/passwd" );
+}
+
+
+#
+#  Now read the accounts on the host.
+#
+my %host = readAccounts( "/etc/passwd" );
+
+
+#
+#  For each account not present on new installation then add it
+#
+foreach my $account ( sort keys( %host ) )
+{
+    if ( ! $present{ $account } )
+    {
+        print "Adding: $account\n";
+        addAccount( $account );
+
+        #
+        #  Find any groups the user is member of on the host
+        # and add them on the guest system
+        #
+        addGroups( $account );
+    }
+}
+
+
+
+#
+#  Read the accounts which are already present on the guest image.
+#
+sub readAccounts
+{
+    my ( $file ) = ( @_ );
+
+
+    my %found;
+
+    open( EXISTING, "<", $file );
+    foreach my $line ( <EXISTING> )
+    {
+        #
+        #  Record the userid + username
+        #
+        if ( $line =~ /^([^:]+):([^:]+):([^:]+)/ )
+        {
+            my $user = $1;
+            my $pass = $2;
+            my $uid  = $3;
+
+            $found{$user} = 1;
+        }
+    }
+    close( EXISTING );
+
+    return( %found );
+}
+
+
+
+
+#
+#  Add the passwd + shadow accounts for the given user.
+#
+sub addAccount
+{
+    my ( $user ) = ( @_ );
+
+    #
+    #  passwd file.
+    #
+    open( PASSWD, "<", "/etc/passwd" );
+    foreach my $line ( <PASSWD> )
+    {
+        chomp( $line );
+        if ( $line =~ /^\Q$user\E:/ )
+        {
+            #
+            #  Add the line
+            #
+            open( OUTY, ">>", $prefix . "/etc/passwd" );
+            print OUTY $line . "\n";
+            close( OUTY );
+        }
+    }
+    close( PASSWD );
+
+
+    #
+    #  shadow file.
+    #
+    open( SHADOW, "<", "/etc/shadow" ) or die "Failed to open : $!";
+    foreach my $line ( <SHADOW> )
+    {
+        chomp( $line );
+        if ( $line =~ /^\Q$user\E:/ )
+        {
+            #
+            #  Add the line
+            #
+            open( OUTY, ">>", $prefix . "/etc/shadow" );
+            print OUTY $line . "\n";
+            close( OUTY );
+        }
+    }
+    close( SHADOW );
+}
+
+
+
+#
+#  Find the groups a user is member of on the host, and add them to
+# those groups on the new guest.
+#
+sub addGroups
+{
+    my( $username ) = ( @_ );
+
+    #
+    #  Get the groups.
+    #
+    my $groups = `groups $username`;
+    # split off the usernmame.
+    if ( $groups =~ /^([^:]+):(.*)/ )
+    {
+        $groups = $2;
+        print "User: $username is member of the groups: $groups\n";
+    }
+
+    foreach my $g ( split( / /, $groups ) )
+    {
+        # Make sure the group exists.
+        system( "chroot $prefix /usr/sbin/addgroup $g" );
+
+        # add the user to it.
+        system( "chroot $prefix /usr/sbin/adduser $username $g" );
+    }
+}

hooks/centos-4/40-setup-networking

@@ -1 +0,0 @@
-../common/40-setup-networking-rpm

hooks/centos-4/40-setup-networking

@@ -0,0 +1,98 @@
+#!/bin/sh
+#
+#  This script sets up the networking files for the new image.
+#
+# Steve
+# --
+# http://www.steve.org.uk/
+
+
+prefix=$1
+
+
+#
+#  Source our common functions
+#
+if [ -e /usr/lib/xen-tools/common.sh ]; then
+    . /usr/lib/xen-tools/common.sh
+else
+    . ./hooks/common.sh
+fi
+
+
+#
+# Log our start
+#
+logMessage Script $0 starting
+
+
+#
+#  Make sure we have an /etc/sysconfig/network-scripts directory.
+#
+mkdir -p ${prefix}/etc/sysconfig/network-scripts/
+
+
+#
+#  Test for static vs. DHCP
+#
+if [ -z "${dhcp}" ]; then
+    
+    #
+    #  Setup the initial interface
+    #
+    cat <<E_O_STATIC >${prefix}/etc/sysconfig/network-scripts/ifcfg-eth0
+DEVICE=eth0
+ONBOOT=yes
+BOOTPROTO=static
+IPADDR=${ip1}
+NETMASK=${netmask}
+GATEWAY=${gateway}
+E_O_STATIC
+
+     #
+     #  Now setup any other ones.
+     #
+     interface=1
+     count=2
+
+     while [ "${count}" -le "${ip_count}" ]; do
+    
+         value=\$ip${count}
+         value=`eval echo $value`
+
+         logMessage Adding etho:${interface}
+
+         cat <<E_O_STATIC >${prefix}/etc/sysconfig/network-scripts/ifcfg-eth0:${interface}
+DEVICE=eth0:${interface}
+ONBOOT=yes
+BOOTPROTO=static
+IPADDR=${value}
+NETMASK=${netmask}
+E_O_STATIC
+         count=`expr $count + 1`
+         interface=`expr $interface + 1`
+     done
+
+else
+    cat <<E_O_DHCP >${prefix}/etc/sysconfig/network-scripts/ifcfg-eth0
+DEVICE=eth0
+BOOTPROTO=dhcp
+ONBOOT=yes
+E_O_DHCP
+fi
+
+
+#
+#  Don't forget to setup the default route.
+#
+cat <<EOF >${prefix}/etc/sysconfig/network
+NETWORKING=yes
+GATEWAY=${gateway}
+HOSTNAME=${hostname}
+EOF
+
+
+#
+#  Log our finish
+#
+logMessage Script $0 finished

hooks/centos-4/50-setup-hostname

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

hooks/centos-4/50-setup-hostname

@@ -0,0 +1,118 @@
+#!/bin/sh
+#
+#  This script places the new systems hostname into a couple of files within
+# the new image.
+#
+# Steve
+# --
+# http://www.steve.org.uk/
+
+
+
+prefix=$1
+
+
+#
+#  Source our common functions
+#
+if [ -e /usr/lib/xen-tools/common.sh ]; then
+    . /usr/lib/xen-tools/common.sh
+else
+    . ./hooks/common.sh
+fi
+
+
+#
+# Log our start
+#
+logMessage Script $0 starting
+
+
+#
+#  Setup the mailname + hostname files.
+#
+echo ${hostname} > ${prefix}/etc/hostname
+echo ${hostname} > ${prefix}/etc/mailname
+
+
+#
+#  Fixup the /etc/hosts file upon the new image for
+# machines with static IPs
+#
+if [ -z "${dhcp}" ]; then
+
+    # Non-IPv6 stuff.
+    grep -v '\(::\|IPv6\)' /etc/hosts > ${prefix}/etc/hosts
+
+    # New entry.
+    echo "${ip1}    ${hostname}" >> ${prefix}/etc/hosts
+    echo " " >> ${prefix}/etc/hosts
+
+    # IPv6 stuff.
+    grep '\(::\|IPv6\)' /etc/hosts >> ${prefix}/etc/hosts
+
+else
+
+    #
+    #  Stub /etc/hosts for DHCP clients.
+    #
+    cat >> ${prefix}/etc/hosts <<EOF
+127.0.0.1       localhost
+
+# The following lines are desirable for IPv6 capable hosts
+::1     ip6-localhost ip6-loopback
+fe00::0 ip6-localnet
+ff00::0 ip6-mcastprefix
+ff02::1 ip6-allnodes
+ff02::2 ip6-allrouters
+ff02::3 ip6-allhosts
+
+EOF
+
+
+fi
+
+
+#
+#  Allow the host system to know the IP address of our new guest.
+#
+if [ -z "${dhcp}" ]; then
+
+    if ( grep ${hostname} /etc/hosts > /dev/null ) ; then
+
+        logMessage Host already has IP address for the host ${hostname}.
+
+    else
+
+        #
+        #  Short host name.
+        #
+        name=`echo ${hostname} | awk -F. '{print $1}'`
+
+        logMessage Adding ${hostname} and ${name} to /etc/hosts on the host
+
+        echo "${ip1}   ${hostname}  ${name}" >> /etc/hosts
+
+
+        #
+        #  If we've updated the /etc/hosts file on the host machine
+        # and there is an installation of dnsmasq installed then
+        # reload it.
+        #
+        #  This will let the local LAN clients lookup the new address.
+        #
+        if [ -x /usr/sbin/dnsmasq ] ; then
+            if [ -e /var/run/dnsmasq.pid ]; then
+
+                logMessage Allowing DNSMasq to restart.
+                kill -HUP `cat /var/run/dnsmasq.pid`
+            fi
+        fi
+    fi
+fi
+
+
+#
+#  Log our finish
+#
+logMessage Script $0 finished

hooks/centos-4/55-create-dev

@@ -1 +0,0 @@
-../common/55-create-dev

hooks/centos-4/55-create-dev

@@ -0,0 +1,53 @@
+#!/bin/sh
+#
+#  This script ensures that the new guest images have a nicely
+# populated /dev directory.
+#
+# Steve
+# --
+# http://www.steve.org.uk/
+
+
+prefix=$1
+
+
+
+#
+#  Source our common functions
+#
+if [ -e /usr/lib/xen-tools/common.sh ]; then
+    . /usr/lib/xen-tools/common.sh
+else
+    . ./hooks/common.sh
+fi
+
+
+#
+# Log our start
+#
+logMessage Script $0 starting
+
+
+
+#
+# Early termination if we have a couple of common devices present
+# should speed up installs which use --copy/--tar
+#
+if ( test `ls -1 ${prefix}/dev | wc -l` -gt 10 ); then
+    logMessage "Terminating because there appear to be files in /dev already"
+    exit
+fi
+
+
+#
+#  Make the device nodes.
+#
+chroot ${prefix} /bin/sh -c 'cd /dev && ./MAKEDEV console'
+chroot ${prefix} /bin/sh -c 'cd /dev && ./MAKEDEV null'
+chroot ${prefix} /bin/sh -c 'cd /dev && ./MAKEDEV zero'
+
+
+#
+#  Log our finish
+#
+logMessage Script $0 finished

hooks/centos-4/60-copy-host-files

@@ -0,0 +1,58 @@
+#!/bin/sh
+#
+#  Copy files from a 'skel' directory, if present, into the
+# new images
+#
+
+
+prefix=$1
+
+
+#
+#  Source our common functions
+#
+if [ -e /usr/lib/xen-tools/common.sh ]; then
+    . /usr/lib/xen-tools/common.sh
+else
+    . ./hooks/common.sh
+fi
+
+
+#
+# Log our start
+#
+logMessage Script $0 starting
+
+
+#
+# Copy "required" files from our host.
+#
+# NONE DONE
+
+#
+# If the host has sudo then copy the configuration file, and install
+# the package
+#
+if [ -e /etc/sudoers ]; then
+
+  logMessage Installing SUDO too.
+
+  #
+  #  Copy file and fixup permissions.
+  #
+  cp /etc/sudoers ${prefix}/etc
+  chown root:root ${prefix}/etc/sudoers
+  chmod 440       ${prefix}/etc/sudoers
+
+  #
+  #  Install sudo
+  #
+  installCentOS4Package ${prefix} sudo
+
+fi
+
+
+#
+#  Log our finish
+#
+logMessage Script $0 finished

hooks/centos-4/65-copy-user-files

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

hooks/centos-4/65-copy-user-files

@@ -0,0 +1,49 @@
+#!/bin/sh
+#
+#  Copy files from a 'skel' directory, if present, into the
+# new images
+#
+
+
+prefix=$1
+
+
+#
+#  Source our common functions
+#
+if [ -e /usr/lib/xen-tools/common.sh ]; then
+    . /usr/lib/xen-tools/common.sh
+else
+    . ./hooks/common.sh
+fi
+
+
+#
+# Log our start
+#
+logMessage Script $0 starting
+
+
+#
+#  Copy everything from the skel directory into the new instance
+# if that directory exists.
+#
+if [ -d /etc/xen-tools/skel ]; then
+
+    logMessage Copying files from /etc/xen-tools/skel
+
+    (cd /etc/xen-tools/skel; tar -cf - . ) | (cd ${prefix}/; tar -xpf -)
+
+    logMessage Finished
+
+else
+
+    logMessage skel directory, /etc/xen-tools/skell, not present ignoring.
+
+fi
+
+
+#
+#  Log our finish
+#
+logMessage Script $0 finished

hooks/centos-4/70-install-ssh

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

hooks/centos-4/70-install-ssh

@@ -0,0 +1,42 @@
+#!/bin/sh
+#
+#  This script installs OpenSSH upon the new system.
+#
+# Steve
+# --
+# http://www.steve.org.uk/
+
+
+prefix=$1
+
+
+#
+#  Source our common functions
+#
+if [ -e /usr/lib/xen-tools/common.sh ]; then
+    . /usr/lib/xen-tools/common.sh
+else
+    . ./hooks/common.sh
+fi
+
+
+#
+# Log our start
+#
+logMessage Script $0 starting
+
+#
+# Install the OpenSSH server.
+#
+if [ ! -d ${prefix}/proc ]; then
+    mkdir -p ${prefix}/proc
+fi
+mount -o bind /proc ${prefix}/proc
+chroot ${prefix} /usr/bin/yum  -y install openssh-server passwd
+umount ${prefix}/proc
+
+
+#
+#  Log our finish
+#
+logMessage Script $0 finished

hooks/centos-4/75-fixup-securetty

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

hooks/centos-4/75-fixup-securetty

@@ -0,0 +1,62 @@
+#!/bin/sh
+#
+#  This script ensures /etc/securetty upon the new guests has the new
+# Xen console devices in it
+#
+# Steve
+# --
+# http://www.steve.org.uk/
+
+
+prefix=$1
+
+
+#
+#  Source our common functions
+#
+if [ -e /usr/lib/xen-tools/common.sh ]; then
+    . /usr/lib/xen-tools/common.sh
+else
+    . ./hooks/common.sh
+fi
+
+
+#
+# Log our start
+#
+logMessage Script $0 starting
+
+#
+# If the file doesn't exist exit early.
+#
+if [ ! -e ${prefix}/etc/securetty ]; then
+    logMesage /etc/securetty not found.
+    exit
+fi
+
+
+#
+#  Do both the devices.
+#
+for i in xvc0 hvc0 ; do
+
+    #
+    #  Only append if not presnt.
+    #
+    if ( grep $i ${prefix}/etc/securetty > /dev/null ) ; then
+
+        logMessage Host already has $i entry
+
+    else
+        
+        echo $i >> ${prefix}/etc/securetty
+    fi
+
+done
+
+
+#
+# Log our finish
+#
+logMessage Script $0 finished.
+

hooks/centos-4/80-install-modules

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

hooks/centos-4/80-install-modules

@@ -0,0 +1,41 @@
+#!/bin/sh
+#
+#  Install modules from the host system into the new image.
+#
+# Steve
+# --
+# http://www.steve.org.uk/
+
+
+prefix=$1
+
+
+
+#
+#  Source our common functions
+#
+if [ -e /usr/lib/xen-tools/common.sh ]; then
+    . /usr/lib/xen-tools/common.sh
+else
+    . ./hooks/common.sh
+fi
+
+
+#
+# Log our start
+#
+logMessage Script $0 starting
+
+
+#
+#  Copy the modules from the host to the new system - we should only
+# really copy the *correct* modules, but we don't know what they are.
+#
+mkdir -p ${prefix}/lib/modules
+cp -au /lib/modules/*/ ${prefix}/lib/modules
+
+
+#
+#  Log our finish
+#
+logMessage Script $0 finished