Release as 4.6

Reformat older entries slightly to make them all identically
formatted.

.gitignore

@@ -5,8 +5,8 @@
 .*
 # but we _wan't_ those dot-files
 !.gitignore
-!.hgignore
 !.mailmap
+!.travis.yml
 
 # ChangeLog is generated during make
 /ChangeLog
@@ -29,3 +29,6 @@
 
 # backups created by "make update-version"
 *.bak
+
+# Devel::Cover cache
+cover_db/

.hgignore

@@ -1,5 +0,0 @@
-(^|/)CVS($|/)
-(^|/)\.hg($|/)
-(^|/)\.hgtags($|/)
-ChangeLog
-~$

.travis.yml

@@ -0,0 +1,26 @@
+language: perl
+perl:
+  - "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

@@ -34,9 +34,15 @@ Contributions
   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)
 
@@ -65,6 +71,9 @@ Contributions
    - Improved binary detection and good suggestions.
    - Better portability for non-bash shells.
 
+  Daniel Lintott <daniel [at] uk.co.serverb>
+   - Bugfix for Jessie and newer installations
+
   Jorge Armando Medina <jmedina [at] com.e-compugraf>
    - Fix for backward compatibility with xvc0 serial consoles
 
@@ -97,6 +106,9 @@ Contributions
    - CentOS 6 support
    - CentOS 5 fixes
 
+  Patryk Ściborek <patryk [at] com.sciborek>
+   - Ubuntu-related bugfix
+
   Radu Spineanu <radu [at] org.debian>
    - Supplied many small tweaks, bugfixes, and suggestions.
    - Radu is also one of the former Debian package maintainers.
@@ -116,5 +128,12 @@ Contributions
   Ward Vandewege <ward [at] be.pong>
    - Made several updates for Ubuntu support.
 
+  Santiago Vila <sanvila [at] es.unex>
+   - Found and fixed a bunch of typos and formatting issues.
+
+  Joan <aseques [at] com.gmail>
+   - Bugfix for password interaction
+   - maxmem option
+
   xstasi on Launchpad
    - Proper upstart handling in the chroot

BUGS

@@ -1,27 +0,0 @@
-
-Reporting Bugs
---------------
-
-  To report a bug please use the xen-tools-discuss mailing list:
-
-        http://xen-tools.org/software/xen-tools/lists.html
-
-  If you're capable of fixing it yourself a patch is appreciated,
- and a test case would be a useful bonus.
-
-
-Known Bugs
-----------
-
-  The Debian bug tracker contains a list of all currently
- open issues 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
--- 

BUGS.markdown

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

KNOWN_BUGS

@@ -1,46 +0,0 @@
-KNOWN BUGS in xen-tools
-
-Bugs to fix before a 4.3 release
---------------------------------
-
-* xen-delete-image doesn't remove all logical volumes if --partitions is used.
-
-   See the link below for details how to reproduce. Reproducable at
-   least with --lvm. Thanks to Antoine Benkemoun for reporting.
-
-   http://xen-tools.org/pipermail/xen-tools-discuss/2010-May/000757.html
-
-* xen-delete-image ignores extension setting
-
-* partitions were mounted in config file order, not in mountpoint order.
-  That implies that if you specified :
-	/boot
-	/
-  in that order, / was mounted _over_ /boot, and you would not _see_ /boot.
-  Xen-Tools would then install boot on your / partition, and your boot device
-  was just empty and unbootable.
-
-  Workaround for 4.2 is to write your partition file such as mounts overlap
-  correctly when mounted in specified order.
-
-  Current (unreleased) fix is to sort by mountpoint length.
-
-  Fix would be to reproduce what mount does with mount -a.
-
-* xen-create-image doesn't unmount the tempdir properly if /proc wasn't mounted inside
-
-* xen-create-image says on startup summary that the Debian mirror is
-  used even if Ubuntu is going to be installed (and works)
-
-* xen-list-images does not honour --extension
-
-* --extension='' (i.e. empty string) no more works
-
-
-Bugs to fix later
------------------
-
-t/xen-tools.t can't really test Xen::Tools as the latter requires a
-local Xen installation. For proper testing, a dummy set of Xen
-configuration files and configurable paths to them in Xen::Tools would
-be necessary.

KNOWN_BUGS.markdown

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

LICENSE

@@ -3,7 +3,7 @@ xen-tools
 ---------
 
 Copyright (c) 2005-2009: Steve Kemp.  All rights reserved.
-Copyright (c) 2010-2012: The Xen-Tools Development Team, currently consisting of:
+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>

Makefile

@@ -12,19 +12,18 @@
 #
 #  Only used to build distribution tarballs.
 #
-TMP        ?= /tmp
-DIST_PREFIX = ${TMP}
-VERSION     = 4.3rc1
+TMPDIR     ?= /tmp
+DIST_PREFIX = ${TMPDIR}
+VERSION     = 4.6
 DEBVERSION  = $(shell echo $(VERSION)|sed 's/\(rc\|pre\|beta\|alpha\)/~\1/')
 BASE        = xen-tools
-VCS         = $(shell if git ls-files > /dev/null; then echo git; \
-                    elif hg st  > /dev/null; then echo hg; \
-                    else                          echo cannot-determine-used-vcs; fi)
+VCS         = git
 
 #
 #  Installation prefix, useful for the Debian package.
 #
-prefix=
+DESTDIR=
+prefix=${DESTDIR}
 
 
 nop:
@@ -35,7 +34,9 @@ nop:
 	@echo " diff          = See local changes."
 	@echo " install       = Install the software"
 	@echo " manpages      = Make manpages beneath man/"
-	@echo " release       = Make a release tarball"
+	@echo " tarball       = Make a release tarball"
+	@echo " orig-tar-gz   = Make a tarball suitably named for Debian"
+	@echo " release       = Make a release tarball and sign it"
 	@echo " uninstall     = Remove the software"
 	@echo " update        = Update from the source repository."
 	@echo " "
@@ -68,8 +69,10 @@ clean:
 	@if [ -e build-stamp ]; then rm -f build-stamp ; fi
 	@if [ -e configure-stamp ]; then rm -f configure-stamp ; fi
 	@if [ -d debian/xen-tools ]; then rm -rf ./debian/xen-tools; fi
+	@if [ -d cover_db ]; then rm -rf ./cover_db; fi
 	@if [ -e $(BASE)-$(VERSION).tar.gz ]; then rm $(BASE)-$(VERSION).tar.gz ; fi
 	@if [ -e $(BASE)-$(VERSION).tar.gz.asc ]; then rm $(BASE)-$(VERSION).tar.gz.asc ; fi
+	cd t; $(MAKE) clean
 
 
 #
@@ -92,10 +95,10 @@ diff:
 fixup-perms:
 	for i in hooks/*/*-*; do chmod 755 $$i; done
 	chmod 755 hooks/common.sh
-	chmod 644 etc/xen-tools.conf
+	chmod 644 etc/*.conf
 	chmod 644 etc/xm.tmpl
 	chmod 644 etc/xm-nfs.tmpl
-	chmod 644 misc/xen-tools misc/README
+	chmod 644 misc/*
 
 #
 #  Install files to /etc/
@@ -106,12 +109,14 @@ install-etc:
 	-mkdir -p ${prefix}/etc/xen-tools/skel/
 	-mkdir -p ${prefix}/etc/xen-tools/role.d/
 	-mkdir -p ${prefix}/etc/xen-tools/partitions.d/
-	cp etc/xen-tools.conf ${prefix}/etc/xen-tools/
+	cp etc/*.conf         ${prefix}/etc/xen-tools/
 	cp etc/xm.tmpl        ${prefix}/etc/xen-tools/
 	cp etc/xm-nfs.tmpl    ${prefix}/etc/xen-tools/
 	cp partitions/*-*     ${prefix}/etc/xen-tools/partitions.d/
-	-mkdir -p             ${prefix}/etc/bash_completion.d
-	cp misc/xen-tools     ${prefix}/etc/bash_completion.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
 
 
 #
@@ -145,60 +150,71 @@ 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/lib/xen-tools/*.d; do if [ -L "$$i" ]; then rm -vf "$$i"; fi; done
-	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/centos-6.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/centos-6/*-* ${prefix}/usr/lib/xen-tools/centos-6.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
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-9.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-10.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-11.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-12.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-13.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-14.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-15.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-16.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-17.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 etch.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d lenny.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d squeeze.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d wheezy.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d sid.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d testing.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d stable.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/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/
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s edgy.d feisty.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s edgy.d gutsy.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s edgy.d hardy.d
-	mkdir -p ${prefix}/usr/lib/xen-tools/intrepid.d/
-	cp -R hooks/intrepid/*-* ${prefix}/usr/lib/xen-tools/intrepid.d/
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s intrepid.d jaunty.d
-	mkdir -p ${prefix}/usr/lib/xen-tools/karmic.d/
-	cp -R hooks/karmic/*-* ${prefix}/usr/lib/xen-tools/karmic.d/
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d lucid.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d maverick.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d natty.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d oneiric.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d precise.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d quantal.d
-	cp hooks/common.sh ${prefix}/usr/lib/xen-tools
-	cp -r hooks/common ${prefix}/usr/lib/xen-tools
+	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 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
+	cp hooks/common.sh ${prefix}/usr/share/xen-tools
+	cp -r hooks/common ${prefix}/usr/share/xen-tools
 
 
 #
@@ -206,7 +222,6 @@ 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
 
 #
@@ -235,40 +250,39 @@ manpages:
 #
 #  Make a new release tarball, and make a GPG signature.
 #
-release: tidy fixup-perms update-version update-modules clean changelog
+release: orig-tar-gz
+	gpg --armour --detach-sign ../$(BASE)-$(VERSION).tar.gz
+	git tag -s -m "Release as $(VERSION)" "release-$(VERSION)"
+
+tarball: test tidy fixup-perms update-version update-modules clean changelog
 	rm -rf $(DIST_PREFIX)/$(BASE)-$(VERSION)
 	rm -f $(DIST_PREFIX)/$(BASE)-$(VERSION).tar.gz
 	cp -R . $(DIST_PREFIX)/$(BASE)-$(VERSION)
 	rm -rf $(DIST_PREFIX)/$(BASE)-$(VERSION)/debian
-	rm -rf $(DIST_PREFIX)/$(BASE)-$(VERSION)/.hg*
+	rm -rf $(DIST_PREFIX)/$(BASE)-$(VERSION)/cover_db
 	rm -rf $(DIST_PREFIX)/$(BASE)-$(VERSION)/.git*
 	cd $(DIST_PREFIX) && tar -cvf $(DIST_PREFIX)/$(BASE)-$(VERSION).tar $(BASE)-$(VERSION)/
-	gzip $(DIST_PREFIX)/$(BASE)-$(VERSION).tar
+	gzip -9nv $(DIST_PREFIX)/$(BASE)-$(VERSION).tar
 	mv $(DIST_PREFIX)/$(BASE)-$(VERSION).tar.gz ..
 	rm -rf $(DIST_PREFIX)/$(BASE)-$(VERSION)
-	gpg --armour --detach-sign ../$(BASE)-$(VERSION).tar.gz
 
 #
 #  Make a new orig.tar.gz for the Debian package
 #
-orig-tar-gz: release
+orig-tar-gz: tarball
 	cp -p ../$(BASE)-$(VERSION).tar.gz ../$(BASE)_$(DEBVERSION).orig.tar.gz
-	cp -p ../$(BASE)-$(VERSION).tar.gz.asc ../$(BASE)_$(DEBVERSION).orig.tar.gz.asc
 
 
 #
 #  Run the test suite.
 #
-test: update-modules
+test: non-author-test author-test
+
+non-author-test: update-modules
 	prove --shuffle t/
 
-
-#
-#  Run the test suite verbosely.
-#
-test-verbose:
-	prove --shuffle --verbose t/
-
+author-test:
+	prove xt/
 
 
 #
@@ -296,11 +310,15 @@ uninstall:
 	rm -f ${prefix}/usr/bin/xen-create-nfs
 	rm -f ${prefix}/usr/bin/xt-guess-suite-and-mirror
 	rm -f ${prefix}/etc/xen-tools/xen-tools.conf
+	rm -f ${prefix}/etc/xen-tools/distributions.conf
+	rm -f ${prefix}/etc/xen-tools/mirrors.conf
 	rm -f ${prefix}/etc/xen-tools/xm.tmpl
 	-rm -rf ${prefix}/etc/xen-tools/skel
 	-rmdir ${prefix}/etc/xen-tools/
 	-rm -f ${prefix}/etc/bash_completion.d/xen-tools
+	# Maybe needed to remove older releases of xen-tools
 	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

NEWS

@@ -1,54 +0,0 @@
-xen-tools 4.3rc1 (released 08 Jun 2012)
-=======================================
-
-New Features and Major Changes
-------------------------------
-
-* Massive code deduplication in hooks directory
-
-New Options
------------
-
-    --dontformat (xen-create-image)
-    --finalrole  (xen-create-image)
-    --apt_proxy  (xen-create-image)
-
-Newly Supported Distribution Releases
--------------------------------------
-
-* Ubuntu 11.10 Oneiric
-* Ubuntu 12.04 Precise
-* Ubuntu 12.10 Quantal
-* CentOS 6
-
-
-xen-tools 4.2.1 (released 17 Mar 2011)
-======================================
-
-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 http://wiki.debian.org/DebianGeoMirror for
-  details.
-* New helper program xt-guess-suite-and-mirror, used to find the
-  default mirror and suite.

NEWS.markdown

@@ -0,0 +1,298 @@
+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 are 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 suported by
+  debootstrap, see Debian bug report #787117)
+* Ubuntu 12.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 http://wiki.debian.org/DebianGeoMirror for
+  details.
+* New helper program `xt-guess-suite-and-mirror`, used to find the
+  default mirror and suite.

README

@@ -1,173 +0,0 @@
-xen-tools
----------
-
-Homepage:
-    http://www.xen-tools.org/software/xen-tools
-
-Git Repository:
-    http://gitorious.org/xen-tools
-
-Mailing Lists:
-    http://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 guests configured
- to be accessible over the network via OpenSSH.
-
-  xen-tools currently has scripts to install most releases of Debian
- (starting with 3.1 "Sarge") and Ubuntu (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, i.e.:
-
-	Debian:
-	  * Sarge 3.1 (i386 and DomU only)
-	  * Etch 4.0 (Dom0 no more tested)
-	  * Lenny 5.0
-	  * Squeeze 6.0
-	  * Wheezy 7.0
-	  * Sid (works at least at the moment of writing :-)
-
-	Ubuntu (only DomUs tested):
-	  * Dapper Drake 6.06
-	  * Edgy Eft 6.10
-	  * Feisty Fawn 7.04
-	  * Gutsy Gibbon 7.10
-	  * Hardy Heron 8.04 (see [1])
-	  * Interpid Ibex 8.10
-	  * Jaunty Jackaplope 9.04
-	  * Karmic Koala 9.10
-	  * Lucid Lynx 10.04
-	  * Maverick Meerkat 10.10
-	  * Natty Narwhal 11.04
-	  * Oneiric Ocelot 11.10
-	  * Precise Pangolin 12.04
-	  * Quantal Quetzal 12.10 (preliminary support as it's not yet available)
-
-	CentOS (only DomUs tested, pygrub support incomplete):
-	  * CentOS 5
-	  * CentOS 6
-
-  [1] There is an issue with debootstrap on hardy not installing ksyslogd
-      This can be fixed by chrooting into the newly installed system
-      and removing the startup scripts. See:
-      http://www.linux-vserver.org/Installing_Ubuntu_8.04_Hardy_as_guest
-
-  Xen-Tools are available prepackaged in Debian 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
-        * 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.
-        * 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" package. This is currently not 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 package which is available from:
-
-          http://xen-tools.org/software/xen-shell/
-
-
-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.
-
-
--- 
-The Xen-Tools Developer Team

README.markdown

@@ -0,0 +1,224 @@
+xen-tools
+=========
+
+[![Travis CI Build Status](https://api.travis-ci.org/xen-tools/xen-tools.svg)](https://travis-ci.org/xen-tools/xen-tools)
+
+* [Homepage](http://www.xen-tools.org/software/xen-tools)
+* Git Repositories:
+  * [at GitLab](http://gitlab.com/xen-tools/xen-tools)
+  * [at GitHub](http://github.com/xen-tools/xen-tools)
+  * [at Gitorious](http://gitorious.org/xen-tools) (_outdated_, no more updated, for historical reference only)
+* [Mailing Lists](http://www.xen-tools.org/software/xen-tools/lists.html)
+
+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](http://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)
+* Etch 4.0 (Dom0 no more tested)
+* Lenny 5.0 (Dom0 no more tested)
+* Squeeze 6.0 (Dom0 no more tested)
+* Wheezy 7
+* Jessie 8
+* Stretch 9 (under development)
+* Sid (always under development; works at least at the moment of writing :-)
+
+### Ubuntu
+
+(only DomUs tested)
+
+* Dapper Drake 6.06 (needs editing of `/usr/share/debootstrap/scripts/dapper` since at least debootstrap version 1.0.37, see [#659360][1])
+* Edgy Eft 6.10 (needs editing of `/usr/share/debootstrap/scripts/edgy` since at least debootstrap version 1.0.37, see [#659360][1])
+* Feisty Fawn 7.04
+* Gutsy Gibbon 7.10
+* Hardy Heron 8.04 (see [Installing Ubuntu 8.04 as DomU][2])
+* Interpid Ibex 8.10
+* Jaunty Jackaplope 9.04
+* Karmic Koala 9.10
+* Lucid Lynx 10.04
+* Maverick Meerkat 10.10
+* Natty Narwhal 11.04
+* Oneiric Ocelot 11.10
+* Precise Pangolin 12.04
+* 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 (under development, not yet suported by
+  debootstrap, see [#787117][3], but adding a symbolic link from
+  `/usr/share/debootstrap/scripts/wily` to `gutsy` suffices.)
+
+[1]: http://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."
+
+[3]: https://bugs.debian.org/787117
+    "debootstrap: missing wily"
+
+### 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](http://packages.debian.org/debootstrap)
+* Perl and the following Perl modules
+  * [Config::IniFiles](http://metacpan.org/release/Config-IniFiles)
+	([Debian Package libconfig-inifiles-perl](http://packages.debian.org/libconfig-inifiles-perl))
+  * [Text::Template](http://metacpan.org/release/Text-Template)
+	([Debian Package libtext-template-perl](http://packages.debian.org/libtext-template-perl))
+  * [Data::Validate::Domain](http://metacpan.org/release/Data-Validate-Domain)
+	([Debian Package libdata-validate-domain-perl](http://packages.debian.org/libdata-validate-domain-perl))
+  * [Data::Validate::IP](http://metacpan.org/release/Data-Validate-IP)
+	([Debian Package libdata-validate-ip-perl](http://packages.debian.org/libdata-validate-ip-perl))
+  * [Data::Validate::URI](http://metacpan.org/release/Data-Validate-URI)
+	([Debian Package libdata-validate-uri-perl](http://packages.debian.org/libdata-validate-uri-perl))
+  * [File::Slurp](http://metacpan.org/release/File-Slurp)
+	([Debian Package libfile-slurp-perl](http://packages.debian.org/libfile-slurp-perl))
+  * [File::Which](http://metacpan.org/release/File-Which)
+	([Debian Package libfile-which-perl](http://packages.debian.org/libfile-which-perl))
+  * 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](http://packages.debian.org/rinse) package. This is currently
+not fully supported.
+
+If you wish to create new Xen instances which may be controlled by
+users via a login shell you can have a look at the (currently
+unmaintained) [xen-shell](http://xen-tools.org/software/xen-shell/)
+project.
+
+
+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).
+
+-- 
+The Xen-Tools Developer Team

SUPPORT

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

@@ -0,0 +1,41 @@
+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.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](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.
+
+There's also the IRC channel `##xen` (the double hashmark is not a
+ typo) on the [Freenode](http://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

@@ -1,209 +0,0 @@
-TODO
-====
-
-See KNOWN_BUGS for real bugs.
-
-Bugs to fix and features to add for 4.3
----------------------------------------
-
-Refactor TLS disabling. Seems to be happen twice, once in 20-setup-apt
-and once in 10-disable-tls.
-
-Bugs to fix and features to add for 5.0
----------------------------------------
-
-* xen-create-image man page overhaul:
-
-- ambiguous option list with regards to parameters
-- Set Fail in more situations where the script has clearly failed
-  i.e.: lvm exists
-
-* 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.
-
-* Documentation overhaul
-
-   Better explain what roles /should be/ used for, and that roles
-   are examples, and shouldn't cover every single scenario. They
-   are also easy to write.
-
-* Think again about disk_device checks :
-
-   Newer Xen provides "xvda", older provided "sda". The current check for
-   valid values of disk_device (used for root device in domU /etc/fstab)
-   does only allow those values.
-   This forbids any deployment of LVM/RAID _inside_ domU, which cannot
-   be created by xen-tools anyway. So the current check is fine with the
-   current possibilities of xen-tools, but could become a limitation.
-   - Is it possible/wanted to "query" xend for default device names ?
-   - Is it possible to create /dev/mapper devices with xend conf ?
-   - Can we just avoid to ask for this value and not specify the device
-   in /etc/fstab (and use /dev/root, /dev/by-uuid, or anything ?)
-
-* xen-create-image --dist=... / sources.list generation should be more fine-grained
-
-   xen-tools should offer the possibility to enable/disable
-   security/volatile/backports as well as
-   contrib/non-free/universe/restricted/multiverse for each of them
-   not only based on defaults plus the Dom0's sources.list
-
-   One idea is to allow parameters like
-
-   --dist="lenny:main,contrib,non-free;security;volatile:main"
-
-   and maybe (if the default will be to include security) to also
-   allow
-
-   --dist="lenny;no-security"
-
-   The second idea (by Mathieu Parent) is to have an
-   /etc/xen-tools/sources.list.d/ which then contains files like
-   lenny.list, lenny-server.list, karmic.list, etc. which defaults to
-   $dist.list, but can be also select with --sources-list=lenny-server
-   (which looks for ./lenny-server.list, ./lenny-server,
-   /etc/xen-tools/sources.list.d/lenny-server.list and
-   /etc/xen-tools/sources.list.d/lenny-server in that order).
-
-   Third variant is to use /etc/xen-tools/sources.lists/ instead of
-   /etc/xen-tools/sources.list.d/ because that directory is no
-   runparts-like directory.
-
-* LVM snapshot support as an install source.
-
-* Clean up mounts on Ctrl-C, causes error while installing otherwise:
-
-   Removing /dev/vg0/acromantula-domu1-disk - since we're forcing the
-   install Can't remove open logical volume "acromantula-domu1-disk"
-   this should be a matter of unmounting the mounted volume from /tmp.
-
-* 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.
-
-* pv-grub support
-
-   This is a ways away and will probably start with a xen-pv-grub
-   package.
-
-* Move the hooks directory to /etc/xen-tools/ to officially allow
-   added and modified hooks.
-
-* Clean up the hooks directory
-
-   We still have a link farm for hooks and a meta link farm for distro
-   releases created on "make install". It probably would be better if
-   we would just have one directory per distro (like with debian) but
-   without the need to created symlinks on "make install"
-
-   Currently CentOS's 25-setup-kernel creates an fstab and
-   90-make-fstab does again. It works, but that cries for debugging
-   hell.
-
-   centos-5/25-setup-kernel centos-6/25-setup-kernel still differ and
-   I'm not sure if that's necessary respectively what's the common
-   denominator.
-
-   80-install-kernel is not yet merged into one hook script.
-
-   Common oneliners for code deduplication in the hooks/ directory:
-
-   $ find -L . -not -xtype l -not -type d -not -path '*/common/*' | sort -t / -k3
-   $ fdupes -r1 . | sort -t / -k3
-   $ find . -type f | sim_text -ipTt 50 | tac | column -t
-
-
-* Create users, add ssh pubkeys to .ssh/authorized_keys
-
-   Still have to think of a good way of doing this. It would be nice
-   To specify a directory of public keys, parsing the hostnames
-   parsing the usernames from the ssh comment line
-
-* 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
-
-* Refactor the code for less variants of calling cp, rm, mv, etc.
-
-   E.g. always use either cp() from File::Copy or /bin/cp, but not
-   both. To allow verbose copying, I (Axel) would prefer /bin/cp over
-   cp();
-
-* Parse numerical parameters transparently for the user
-
-   The user shouldn't have to know weather he should specify size
-   as <size>G or <size>Gb or <size>. This should be parsed without
-   user interaction and rely on a common format.
-
-* xen-update-image should mount /dev/pts before running apt-get
-
-* xen-update-image should have options for using ...
-
-   ... aptitude instead of apt-get
-
-   ... dist-upgrade instead of upgrade
-
-* Support cpu_weight and other features from
-  http://wiki.xensource.com/xenwiki/CreditScheduler
-
-* Code Deduplication / Refactor the code for less code duplication
-
-   bin/x* currently contain the same or similar code like e.g. in the
-   function readConfigurationFile. This needs to be cleaned up.
-
-* Use Perl::Critic
-
-Stuff from Steve's TODO list / Generic TODOs
---------------------------------------------
-
-* Write more test cases.
-
-* xen-delete-image should unallocate any used IP addresses.
-
-Axel's Break-Backwards-Compatibility Wishlist
----------------------------------------------
-
-* Make empty extension the default
-
-   This would ease tab completion and CLI parameter reusage with "xm
-   create" and friends.
-
-* Check if we can reduce MAKEDEV invocations in hooks/common/55-create-dev
-
-   MAKEDEV std is called in any case. First comment says "Early
-   termination if we have a couple of common devices present should
-   speed up installs which use --copy/--tar" and then "We still need
-   to make sure the basic devices are present" and calls MAKEDEV more
-   often than otherwise.
-
-   Additionally the 55-create-dev for CentOS/Fedora just created
-   console, zero and null. zero and null are part of "MAKEDEV std",
-   perhaps can we reduce it to that. console is part of "MAKEDEV
-   generic".
-
-   Additionally the devices hda, sda and tty1 may not necessary in any
-   case, but instead hvc0 should be created for sure in many
-   cases. Nothing cares about $serial_device there either.
-
-   Current MAKEDEV implementation support more than one device as
-   parameter. That could reduce the MAKEDEV calls from currently six
-   to two.

TODO.markdown

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

bin/xen-create-nfs

@@ -1,5 +1,7 @@
 #!/usr/bin/perl -w
 
+=encoding utf8
+
 =head1 NAME
 
 xen-create-nfs - Create a Xen configuration file for an NFS-root guest.
@@ -36,8 +38,6 @@ 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,11 +55,8 @@ Read the manual for this script.
 =item B<--version>
 Show the version number and exit.
 
-
 =back
 
-=cut
-
 
 =head1 DESCRIPTION
 
@@ -71,8 +68,6 @@ 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
 
@@ -81,16 +76,12 @@ Show the version number and exit.
 
     http://www.debian-administration.org/articles/505
 
-=cut
-
 
 =head1 AUTHORS
 
  Steve Kemp, http://www.steve.org.uk/
  Stéphane Jourdois
 
-=cut
-
 
 =head1 LICENSE
 
@@ -102,7 +93,6 @@ 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
 
 
@@ -112,7 +102,7 @@ use Env;
 use Getopt::Long;
 use Pod::Usage;
 use Text::Template;
-
+use Xen::Tools::Common;
 
 
 #
@@ -131,7 +121,7 @@ $CONFIG{ 'template' } = '/etc/xen-tools/xm-nfs.tmpl';
 #
 # Release number.
 #
-my $RELEASE = '4.3rc1';
+my $RELEASE = '4.6';
 
 
 # store version number away.
@@ -141,7 +131,7 @@ $CONFIG{ 'xen_tools_version' } = $RELEASE;
 #
 #  Read the global configuration file.
 #
-readConfigurationFile("/etc/xen-tools/xen-tools.conf");
+readConfigurationFile("/etc/xen-tools/xen-tools.conf", \%CONFIG);
 
 
 #
@@ -170,7 +160,7 @@ if ( -e "/etc/xen/$CONFIG{'hostname'}.cfg" )
 #
 if ( $CONFIG{ 'admins' } )
 {
-    setupAdminUsers();
+    setupAdminUsers(\%CONFIG);
 }
 
 #
@@ -186,88 +176,6 @@ 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.
@@ -324,13 +232,7 @@ sub parseCommandLineArguments
 
     if ($VERSION)
     {
-        my $REVISION = '$Revision: 1.13 $';
-        if ( $REVISION =~ /1.([0-9.]+) / )
-        {
-            $REVISION = $1;
-        }
-
-        logprint("xen-create-nfs release $RELEASE - CVS: $REVISION\n");
+        logprint("xen-create-nfs release $RELEASE\n");
         exit;
     }
 }
@@ -409,82 +311,6 @@ sub testArguments
 
 
 
-=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.

bin/xen-delete-image

@@ -1,5 +1,7 @@
 #!/usr/bin/perl -w
 
+=encoding utf8
+
 =head1 NAME
 
 xen-delete-image - Delete previously created Xen instances.
@@ -8,6 +10,10 @@ 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.
@@ -23,9 +29,7 @@ xen-delete-image - Delete previously created Xen instances.
    --hostname Specify the image name to delete.
 
   Testing options:
-   --test     Don't complain if we're not invoked by root.
-
-=cut
+   --test      Don't complain if we're not invoked by root.
 
 
 =head1 OPTIONS
@@ -51,16 +55,14 @@ Specify the LVM volume group where images were previously saved.
 Read the manual for this script.
 
 =item B<--test>
-Do not complain, or exit, if the script is not executed by the root user.
+Do not complain, or exit, if the script is not executed by the root
+user. (Only works in conjunction with --dir.)
 
 =item B<--version>
 Show the version number and exit.
 
-
 =back
 
-=cut
-
 
 =head1 DESCRIPTION
 
@@ -74,8 +76,6 @@ 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
 
@@ -91,8 +91,6 @@ Show the version number and exit.
   (The matching Xen configuration files beneath /etc/xen will also be
  removed.)
 
-=cut
-
 
 =head1 LVM EXAMPLE
 
@@ -109,8 +107,6 @@ Show the version number and exit.
 
   The Xen configuration files will also be removed from beneath /etc/xen.
 
-=cut
-
 
 =head1 EVMS EXAMPLE
 
@@ -127,8 +123,6 @@ Show the version number and exit.
 
   The Xen configuration files will also be removed.
 
-=cut
-
 
 =head1 AUTHORS
 
@@ -136,12 +130,10 @@ Show the version number and exit.
  Axel Beckert, http://noone.org/abe/
  Stéphane Jourdois
 
-=cut
-
 
 =head1 LICENSE
 
-Copyright (c) 2005-2009 by Steve Kemp, (c) 2010 by The Xen-Tools
+Copyright (c) 2005-2009 by Steve Kemp, (c) 2010-2013 by The Xen-Tools
 Development Team. All rights reserved.
 
 This module is free software;
@@ -149,7 +141,6 @@ 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
 
 
@@ -158,6 +149,7 @@ use English;
 use Getopt::Long;
 use Pod::Usage;
 use File::Path;
+use Xen::Tools::Common;
 
 
 #
@@ -171,16 +163,26 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.3rc1';
+my $RELEASE = '4.6';
 
 
+#
+# Find xen toolstack command
+#
+$CONFIG{ 'xm' } = findXenToolstack();
+
+#
+#  Default values
+#
+$CONFIG{ 'extension' } = '.cfg';
+
 
 #
 # Read the global configuration file if it exists.
 #
 if ( -e "/etc/xen-tools/xen-tools.conf" )
 {
-    readConfigurationFile("/etc/xen-tools/xen-tools.conf");
+    readConfigurationFile("/etc/xen-tools/xen-tools.conf", \%CONFIG);
 }
 
 
@@ -216,27 +218,21 @@ E_O_ROOT
 
 #
 #  Loop over the supplied arguments, and attempt to delete each
-# image.
+# image. Check both, bare parameters as well as --hostname options.
 #
-while ( my $name = shift )
-{
-    if ( !xenRunning($name) )
-    {
-        deleteXenImage($name);
-    }
-    else
-    {
-        print "Skipping xen guest '$name' - it appears to be running.\n";
-    }
+
+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;
 }
 
-#
-#  Also delete any which were specified using the --hostname flag
-#
-my $hosts = $CONFIG{ 'hostname' };
-foreach my $name (@$hosts)
+foreach my $name (@ARGV, @hosts)
 {
-    if ( !xenRunning($name) )
+    my %PER_HOST_CONFIG = %CONFIG;
+    $PER_HOST_CONFIG{ 'hostname' } = $name;
+    unless ( xenRunning($name, \%PER_HOST_CONFIG) )
     {
         deleteXenImage($name);
     }
@@ -253,81 +249,6 @@ 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
 
@@ -350,9 +271,11 @@ sub parseCommandLineArguments
                 "dry-run",     \$CONFIG{ 'dry-run' },
                 "lvm=s",       \$CONFIG{ 'lvm' },
                 "evms=s",      \$CONFIG{ 'evms' },
+                "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
@@ -364,14 +287,7 @@ sub parseCommandLineArguments
 
     if ($VERSION)
     {
-        my $REVISION = '$Revision: 1.41 $';
-
-        if ( $REVISION =~ /1.([0-9.]+) / )
-        {
-            $REVISION = $1;
-        }
-
-        print "xen-delete-image release $RELEASE - CVS: $REVISION\n";
+        print "xen-delete-image release $RELEASE\n";
         exit;
 
     }
@@ -393,10 +309,10 @@ sub checkArguments
     #
     #  When testing we only care about loopback images, not disk images.
     #
-    if ( $CONFIG{ 'test' } )
+    if ( $CONFIG{ 'test' } and ( $CONFIG{ 'lvm' } or $CONFIG{ 'evms' } ))
     {
-        $CONFIG{ 'lvm' }  = undef;
-        $CONFIG{ 'evms' } = undef;
+        print "Error: --test only works with --dir.\n";
+        exit 1;
     }
 
     #
@@ -418,39 +334,12 @@ sub checkArguments
         print " --dir\n";
         print " --evms\n";
         print " --lvm\n";
-        exit;
+        exit 2;
     }
 }
 
 
 
-=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
@@ -472,17 +361,17 @@ sub deleteXenImage
     #
     #  Delete the Xen auto-start file if it exists.
     #
-    if ( -e "/etc/xen/auto/$hostname.cfg" )
+    if ( -e "/etc/xen/auto/$hostname".$CONFIG{ 'extension' } )
     {
-        push( @delete, "/etc/xen/auto/$hostname.cfg" );
+        push( @delete, "/etc/xen/auto/$hostname".$CONFIG{ 'extension' } );
     }
 
     #
     #  Delete the Xen configuration file if it exists.
     #
-    if ( -e "/etc/xen/$hostname.cfg" )
+    if ( -e "/etc/xen/$hostname".$CONFIG{ 'extension' } )
     {
-        push( @delete, "/etc/xen/$hostname.cfg" );
+        push( @delete, "/etc/xen/$hostname".$CONFIG{ 'extension' } );
     }
 
     #
@@ -505,7 +394,8 @@ sub deleteXenImage
         }
     }
 
-
+    my %PER_HOST_CONFIG = %CONFIG;
+    $PER_HOST_CONFIG{ 'hostname' } = $hostname;
     if ( defined( $CONFIG{ 'dir' } ) )
     {
         my $prefix = $CONFIG{ 'dir' } . "/domains/";
@@ -539,7 +429,7 @@ sub deleteXenImage
                 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");
+                runCommand("lvremove /dev/$CONFIG{'lvm'}/$hostname-swap --force", \%PER_HOST_CONFIG);
             }
         }
 
@@ -549,7 +439,7 @@ sub deleteXenImage
                 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");
+                runCommand("lvremove /dev/$CONFIG{'lvm'}/$hostname-disk --force", \%PER_HOST_CONFIG);
             }
         }
 
@@ -571,8 +461,8 @@ sub deleteXenImage
                 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");
-                runCommand("echo Delete : $CONFIG{'evms'}/$hostname-swap | evms");
+                runCommand("echo Delete : /dev/evms/$hostname-swap | evms", \%PER_HOST_CONFIG);
+                runCommand("echo Delete : $CONFIG{'evms'}/$hostname-swap | evms", \%PER_HOST_CONFIG);
             }
         }
 
@@ -583,8 +473,8 @@ sub deleteXenImage
                 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");
-                runCommand("echo Delete : $CONFIG{'evms'}/$hostname-disk | evms");
+                runCommand("echo Delete : /dev/evms/$hostname-disk | evms", \%PER_HOST_CONFIG);
+                runCommand("echo Delete : $CONFIG{'evms'}/$hostname-disk | evms", \%PER_HOST_CONFIG);
             }
         }
 
@@ -597,66 +487,3 @@ sub deleteXenImage
         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,5 +1,7 @@
 #!/usr/bin/perl -w
 
+=encoding utf8
+
 =head1 NAME
 
 xen-list-images - List all the created and configured Xen images.
@@ -8,6 +10,10 @@ 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.
@@ -16,6 +22,7 @@ xen-list-images - List all the created and configured Xen images.
   Testing options:
    --test     Specify an alternate Xen configuration directory.
 
+
 =head1 OPTIONS
 
 =over 8
@@ -48,26 +55,22 @@ 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, http://www.steve.org.uk/
  Stéphane Jourdois
 
-=cut
 
 =head1 LICENSE
 
-Copyright (c) 2005-2009 by Steve Kemp, (c) 2010 by The Xen-Tools
+Copyright (c) 2005-2009 by Steve Kemp, (c) 2010-2013 by The Xen-Tools
 Development Team. All rights reserved.
 
 This module is free software;
@@ -83,6 +86,7 @@ use English;
 use File::Temp qw/ tempdir /;
 use Getopt::Long;
 use Pod::Usage;
+use Xen::Tools::Common;
 
 
 #
@@ -94,21 +98,22 @@ use Pod::Usage;
 my %CONFIG;
 
 #
-#  Default prefix
+#  Default values
 #
 $CONFIG{ 'prefix' } = "/etc/xen";
+$CONFIG{ 'extension' } = '.cfg';
 
 #
 # Release number.
 #
-my $RELEASE = '4.3rc1';
+my $RELEASE = '4.6';
 
 
 
 #
 #  Read the global configuration file if it exists.
 #
-readConfigurationFile("/etc/xen-tools/xen-tools.conf");
+readConfigurationFile("/etc/xen-tools/xen-tools.conf", \%CONFIG);
 
 
 #
@@ -144,83 +149,6 @@ 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.
@@ -238,6 +166,7 @@ sub parseCommandLineArguments
     #  Parse options.
     #
     GetOptions( "test=s", \$CONFIG{ 'prefix' },
+                "extension:s", \$CONFIG{ 'extension' },
                 "help", \$HELP,
                 "manual", \$MANUAL,
                 "version", \$VERSION );
@@ -248,13 +177,7 @@ sub parseCommandLineArguments
 
     if ($VERSION)
     {
-        my $REVISION = '$Revision: 1.30 $';
-        if ( $REVISION =~ /1.([0-9.]+) / )
-        {
-            $REVISION = $1;
-        }
-
-        print "xen-list-images release $RELEASE - CVS: $REVISION\n";
+        print "xen-list-images release $RELEASE\n";
         exit;
     }
 }
@@ -274,9 +197,12 @@ sub findXenInstances
 {
     my @found;
 
-    foreach my $file ( sort( glob( $CONFIG{ 'prefix' } . "/*.cfg" ) ) )
+    foreach my $file ( sort( glob( $CONFIG{ 'prefix' } . "/*" . $CONFIG{ 'extension' } ) ) )
     {
-        push @found, $file if ( -e $file );
+        push @found, $file if (
+            -f $file and
+            $file !~ m(~$|\.dpkg-[a-z]+$|\.sxp$|/xl\.conf$)
+            );
     }
 
     return (@found);
@@ -323,7 +249,7 @@ sub displayInstance
         {
             $name = $1;
         }
-        if ( $line =~ /.*memory[^0-9]*([0-9]+)/i )
+        if ( $line =~ /^\s*memory[^0-9]*([0-9]+)/i )
         {
             $mem = $1;
         }
@@ -338,9 +264,10 @@ sub displayInstance
     }
 
     print "Name: $name\n";
-    print "Memory: $mem\n";
+    print "Memory: $mem MB\n";
     print "IP: " . $ip . $mac . "\n" if length($ip);
     print "DHCP" . $mac . "\n" if $dhcp;
+    print "Config: $file\n";
 }
 
 

bin/xen-resize-guest

@@ -1,5 +1,7 @@
 #!/usr/bin/perl -w
 
+=encoding utf8
+
 =head1 NAME
 
 xen-resize-guest - Resize a loopback or LVM based xen guest.
@@ -20,8 +22,6 @@ 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,8 +53,6 @@ Show the version number and exit.
 
 =back
 
-=cut
-
 
 =head1 DESCRIPTION
 
@@ -74,15 +72,12 @@ 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
 
  Steve Kemp, http://www.steve.org.uk/
  Axel Beckert, http://noone.org/abe/
 
-=cut
-
 
 =head1 LICENSE
 
@@ -94,7 +89,6 @@ 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
 
 
@@ -104,6 +98,7 @@ use Env;
 use Getopt::Long;
 use Pod::Usage;
 use Text::Template;
+use Xen::Tools::Common;
 
 
 
@@ -116,14 +111,19 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.3rc1';
+my $RELEASE = '4.6';
 
 
+#
+# Find xen toolstack command
+#
+$CONFIG{ 'xm' } = findXenToolstack();
+
 
 #
 #  Read the global configuration file.
 #
-readConfigurationFile("/etc/xen-tools/xen-tools.conf");
+readConfigurationFile("/etc/xen-tools/xen-tools.conf", \%CONFIG);
 
 
 #
@@ -289,84 +289,6 @@ exit 0;
 
 
 
-=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' - $!";
-
-    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.
@@ -482,7 +404,7 @@ EOF
     #
     #  Make sure the guest isn't running
     #
-    if ( xenRunning( $CONFIG{ 'hostname' } ) )
+    if ( xenRunning( $CONFIG{ 'hostname' }, \%CONFIG ) )
     {
         print "The guest $CONFIG{'hostname'} appears to be running!\n";
         exit 1;
@@ -523,31 +445,3 @@ EOF
         $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,5 +1,7 @@
 #!/usr/bin/perl -w
 
+=encoding utf8
+
 =head1 NAME
 
 xen-update-image - Update the software installed upon offline Xen images.
@@ -18,9 +20,6 @@ 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
 
@@ -46,8 +45,6 @@ Show the version number and exit.
 
 =back
 
-=cut
-
 
 =head1 DESCRIPTION
 
@@ -65,8 +62,6 @@ Show the version number and exit.
  corruption otherwise it will allow you to update your image without
  booting it.
 
-=cut
-
 
 =head1 EXAMPLES
 
@@ -77,8 +72,6 @@ Show the version number and exit.
 
      xen-update-images --dir=/home/xen test.my.flat x11.my.flat
 
-=cut
-
 
 =head1 AUTHORS
 
@@ -86,7 +79,6 @@ Show the version number and exit.
  Axel Beckert, http://noone.org/abe/
  Stéphane Jourdois
 
-=cut
 
 =head1 LICENSE
 
@@ -107,6 +99,7 @@ use File::Temp qw/ tempdir /;
 use File::Copy qw/ mv cp /;
 use Getopt::Long;
 use Pod::Usage;
+use Xen::Tools::Common;
 
 
 #
@@ -120,7 +113,13 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.3rc1';
+my $RELEASE = '4.6';
+
+
+#
+# Find xen toolstack command
+#
+$CONFIG{ 'xm' } = findXenToolstack();
 
 
 #
@@ -128,7 +127,7 @@ my $RELEASE = '4.3rc1';
 #
 if ( -e "/etc/xen-tools/xen-tools.conf" )
 {
-    readConfigurationFile("/etc/xen-tools/xen-tools.conf");
+    readConfigurationFile("/etc/xen-tools/xen-tools.conf", \%CONFIG);
 }
 
 
@@ -168,7 +167,7 @@ E_O_ROOT
 #
 while ( my $name = shift )
 {
-    if ( !xenRunning($name) )
+    if ( !xenRunning($name, \%CONFIG) )
     {
         updateXenImage($name);
     }
@@ -303,7 +302,7 @@ sub updateXenImage
         #  Now upgrade
         #
         system(
-            "DEBIAN_FRONTEND=noninteractive  chroot $tmp /usr/bin/apt-get upgrade --yes --force-yes"
+            "DEBIAN_FRONTEND=noninteractive  chroot $tmp /usr/bin/apt-get upgrade --yes"
         );
 
         #
@@ -331,110 +330,6 @@ 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.
@@ -463,13 +358,7 @@ sub parseCommandLineArguments
 
     if ($VERSION)
     {
-        my $REVISION = '$Revision: 1.29 $';
-
-        if ( $REVISION =~ /1.([0-9.]+) / )
-        {
-            $REVISION = $1;
-        }
-        print "xen-update-image release $RELEASE - CVS: $REVISION\n";
+        print "xen-update-image release $RELEASE\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,7 +39,6 @@ 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
 
@@ -53,8 +52,6 @@ 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
 
@@ -75,9 +72,6 @@ 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
@@ -102,7 +96,6 @@ 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
 
@@ -110,7 +103,6 @@ xt-create-config - Create a Xen configuration file for a new guest
  Axel Beckert, http://noone.org/abe/
  Stéphane Jourdois
 
-=cut
 
 =head1 LICENSE
 
@@ -156,7 +148,7 @@ $CONFIG{ 'extension' } = '.cfg';
 #
 # Release number.
 #
-my $RELEASE = '4.3rc1';
+my $RELEASE = '4.6';
 
 
 
@@ -177,7 +169,7 @@ checkArguments();
 #
 if ( $ENV{ 'admins' } )
 {
-    setupAdminUsers();
+    setupAdminUsers(\%CONFIG);
 }
 
 
@@ -215,7 +207,7 @@ sub parseCommandLineArguments
     #
     GetOptions( "admins=s",    \$ENV{ 'admins' },
                 "output=s",    \$CONFIG{ 'output' },
-                "extension=s", \$CONFIG{ 'extension' },
+                "extension:s", \$CONFIG{ 'extension' },
                 "template=s",  \$CONFIG{ 'template' },
                 "verbose",     \$CONFIG{ 'verbose' },
                 "help",        \$HELP,
@@ -229,13 +221,7 @@ sub parseCommandLineArguments
 
     if ($VERSION)
     {
-        my $REVISION = '$Revision: 1.47 $';
-        if ( $REVISION =~ /1.([0-9.]+) / )
-        {
-            $REVISION = $1;
-        }
-
-        print "xt-create-xen-config release $RELEASE - CVS: $REVISION\n";
+        print "xt-create-xen-config release $RELEASE\n";
         exit;
     }
 }
@@ -375,7 +361,7 @@ sub createXenConfig
     #
     #  The memory size:  Convert Gb -> Mb.
     #
-    if ( $ENV{ 'memory' } =~ /^(\d+)Gb.*$/i )
+    if ( $ENV{ 'memory' } =~ /^(\d+)Gb?.*$/i )
     {
         $ENV{ 'memory' } = $1 * 1024;
     }
@@ -383,11 +369,23 @@ sub createXenConfig
     #
     #  Remove any trailing Mb.
     #
-    if ( $ENV{ 'memory' } =~ /^(\d+)Mb.*$/i )
-    {
-        $ENV{ 'memory' } = $1;
-    }
+    $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;
+    }
 
     #
     # Images as presented to Xen - either loopback images, or LVM partitions.
@@ -404,13 +402,13 @@ sub createXenConfig
         $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
         {
@@ -470,80 +468,3 @@ sub createXenConfig
     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,7 +25,6 @@ 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
 
@@ -41,8 +40,6 @@ 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
 
@@ -54,10 +51,17 @@ 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/lib/xen-tools/foo.d'.  Each executable will
+ executed from '/usr/share/xen-tools/foo.d'.  Each executable will
  be loaded and executed in sorted order.
 
-=cut
+  The systems administrator can optionally provide site-specific
+ revisions of those same hooks by placing them in the directory
+ '/etc/xen-tools/hooks.d/' in which case a script with the same name
+ as the one in the 'foo.d' directory above will take precedence. In
+ this way certain hooks can be prevented from running, expanded with
+ site-specific features which won't get overwritten on upgrades, or
+ patched with critical bug-fixes before the upstream OS distribution
+ provider reacts.
 
 
 =head1 AUTHORS
@@ -66,8 +70,6 @@ xt-customize-image - Customize a freshly installed copy of GNU/Linux
  Axel Beckert, http://noone.org/abe/
  Stéphane Jourdois
 
-=cut
-
 
 =head1 LICENSE
 
@@ -98,7 +100,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.3rc1';
+my $RELEASE = '4.6';
 
 
 
@@ -159,13 +161,7 @@ sub parseCommandLineArguments
 
     if ($VERSION)
     {
-        my $REVISION = '$Revision: 1.33 $';
-        if ( $REVISION =~ /1.([0-9.]+) / )
-        {
-            $REVISION = $1;
-        }
-
-        print "xt-customize-image release $RELEASE - CVS: $REVISION\n";
+        print "xt-customize-image release $RELEASE\n";
         exit;
     }
 }
@@ -221,7 +217,7 @@ sub checkArguments
     #  If there are no scripts then we clearly cannot
     # customise it!
     #
-    my $dir = "/usr/lib/xen-tools/" . $CONFIG{ 'dist' } . ".d";
+    my $dir = "/usr/share/xen-tools/" . $CONFIG{ 'dist' } . ".d";
 
     if ( !-d $dir )
     {
@@ -263,7 +259,8 @@ sub runDistributionHooks
     #
     #  Hook directory.
     #
-    my $hooks = "/usr/lib/xen-tools/" . $CONFIG{ 'dist' } . ".d/";
+    my $hooks = "/usr/share/xen-tools/" . $CONFIG{ 'dist' } . ".d/";
+    my $hooks_local = "/etc/xen-tools/hooks.d/";
 
     #
     #  Installation prefix
@@ -308,10 +305,20 @@ sub runDistributionHooks
                 $name = $2;
             }
 
+            #
+            # Run a local version of the hook instead of the system one,
+            # if the local one exists and is executable.
+            #
+            my $file_local = $hooks_local . $name;
+            if ( ( -x $file_local ) && ( -f $file_local ) )
+            {
+              $file = $file_local
+            }
+
             #
             # Complete command we're going to execute.
             #
-            my $cmd = $hooks . $name . " $CONFIG{'location'}";
+            my $cmd = $file . " $CONFIG{'location'}";
 
             #
             #  Run the command.  This has different prolog and epilog

bin/xt-guess-suite-and-mirror

@@ -1,12 +1,12 @@
 #!/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.
 
-=cut
-
 =head1 SYNOPSIS
 
   --suite       Show suite
@@ -20,7 +20,6 @@ mirror for DomUs on Debian and Ubuntu Dom0s.
    --manual     Show the manual for this script.
    --version    Show the version number and exit.
 
-=cut
 
 =head1 DESCRIPTION
 
@@ -28,14 +27,12 @@ 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.
 
-=cut
 
 =head1 AUTHORS
 
  Axel Beckert, http://noone.org/abe/
  Stéphane Jourdois
 
-=cut
 
 =head1 LICENSE
 
@@ -55,9 +52,9 @@ full text of the license.
 # Fallback to Debian or Ubuntu in case we can't find anything
 my $fallback = 'Debian';
 
-# Which mirrors to use if everything else fails (cdn.debian.net uses
-# GeoIP, see http://wiki.debian.org/DebianGeoMirror)
-my %fallback_mirror = ( Debian => 'http://cdn.debian.net/debian/',
+# Which mirrors to use if everything else fails (httpredir.debian.org
+# redirects to a working mirror nearby)
+my %fallback_mirror = ( Debian => 'http://httpredir.debian.org/debian/',
                         Ubuntu => 'http://archive.ubuntu.com/ubuntu/' );
 
 # Which suite to use if everything else fails. For Debian "stable"
@@ -74,6 +71,7 @@ my @sources_list_files = ( '/etc/apt/sources.list',
 use File::Slurp;
 use Getopt::Long;
 use Pod::Usage;
+use File::Which;
 
 use strict;
 
@@ -81,7 +79,7 @@ use strict;
 #
 # Release number.
 #
-my $RELEASE = '4.3rc1';
+my $RELEASE = '4.6';
 
 # Init
 my $mirror = '';
@@ -153,10 +151,8 @@ all_sources_list_files: foreach my $sources_list_file (@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`;
-chomp($lsb_release);
-
-if (!$found and $lsb_release and -x $lsb_release) {
+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') {

bin/xt-install-image

@@ -1,11 +1,11 @@
 #!/usr/bin/perl -w
 
+=encoding utf8
+
 =head1 NAME
 
 xt-install-image - Install a fresh copy of GNU/Linux into a directory
 
-=cut
-
 =head1 SYNOPSIS
 
   xt-install-image [options]
@@ -28,6 +28,7 @@ xt-install-image - Install a fresh copy of GNU/Linux into a directory
                     configuration file.
    --mirror         The mirror to use when installing with 'debootstrap'.
    --apt_proxy      The proxy to use when installing with 'debootstrap'.
+   --keyring        The keyring to use when installing with 'debootstrap'.
 
   Installation Options:
    --install-method  Specify the installation method to use.
@@ -39,8 +40,6 @@ xt-install-image - Install a fresh copy of GNU/Linux into a directory
   All other options from xen-create-image will be passed as environmental
  variables.
 
-=cut
-
 
 =head1 NOTES
 
@@ -50,8 +49,6 @@ xt-install-image - Install a fresh copy of GNU/Linux into a directory
  configuration, etc.
 
 
-=cut
-
 =head1 INSTALLATION METHODS
 
   There are several available methods of installation, depending upon the
@@ -78,8 +75,6 @@ Untar a .tar file into the new installation location.  This tarfile is assumed t
 
 =back
 
-=cut
-
 
 =head1 AUTHORS
 
@@ -88,7 +83,6 @@ Untar a .tar file into the new installation location.  This tarfile is assumed t
  Dmitry Nedospasov, http://nedos.net/
  Stéphane Jourdois
 
-=cut
 
 =head1 LICENSE
 
@@ -108,6 +102,7 @@ use Env;
 use File::Copy;
 use Getopt::Long;
 use Pod::Usage;
+use Xen::Tools::Common;
 
 
 #
@@ -118,7 +113,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.3rc1';
+my $RELEASE = '4.6';
 
 
 #
@@ -132,13 +127,19 @@ my $RELEASE = '4.3rc1';
 #  needDirectory Defined if we need an install-source directory specified.
 #
 #
+my $debootstrap_cmd;
 my %dispatch = (
                  "copy" => { sub           => \&do_copy,
                              needBinary    => "/bin/cp",
                              needDirectory => 1,
                            },
                  "debootstrap" => { sub        => \&do_debootstrap,
-                                    needBinary => "/usr/sbin/debootstrap",
+                                    needBinary => ["/usr/sbin/debootstrap", "/usr/bin/cdebootstrap", "/usr/bin/cdebootstrap-static"],
+                                    var        => \$debootstrap_cmd,
+                                  },
+                 "cdebootstrap" => { sub        => \&do_debootstrap,
+                                     needBinary => ["/usr/sbin/cdebootstrap", "/usr/bin/cdebootstrap-static"],
+                                     var        => \$debootstrap_cmd,
                                   },
                  "rinse" => { sub        => \&do_rinse,
                               needBinary => "/usr/sbin/rinse",
@@ -156,7 +157,7 @@ my %dispatch = (
 #
 #  Read the global configuration file.
 #
-readConfigurationFile("/etc/xen-tools/xen-tools.conf");
+readConfigurationFile("/etc/xen-tools/xen-tools.conf", \%CONFIG);
 
 
 #
@@ -179,7 +180,7 @@ if ( $CONFIG{ 'config' } )
     }
 
     # Read the file, if it exists.
-    readConfigurationFile($path) if ( -e $path );
+    readConfigurationFile($path, \%CONFIG) if ( -e $path );
 }
 
 
@@ -209,13 +210,35 @@ if ( defined( $CONFIG{ 'install-method' } ) &&
         #
 
         # Do we need to test for a binary.
-        if ( ( $installer->{ 'needBinary' } ) &&
-             ( !-x $installer->{ 'needBinary' } ) )
-        {
-            print
-              "The following required binary for the installation was not found\n";
-            print "\t" . $installer->{ 'needBinary' } . "\n";
-            exit 1;
+        if ( $installer->{ 'needBinary' } ) {
+            if ( 'ARRAY' eq ref $installer->{ 'needBinary' } ) {
+                unless (ref $installer->{ 'var' }) {
+                    die "Assertion: If dispatch->->needBinary is an array ref, dispatch->->var must exist";
+                }
+
+                foreach my $binary (@{$installer->{ 'needBinary' }}) {
+                    if (-x $binary) {
+                        ${$installer->{ 'var' }} = $binary;
+                        last;
+                    }
+                }
+
+                unless ( ${$installer->{ 'var' }}  ) {
+                    print
+                        "One of the following binaries are required for the installation, but none was found\n";
+                    print "\t" . join(', ', @{$installer->{ 'needBinary' }}) . "\n";
+                    exit 1;
+                }
+            }
+            else
+            {
+                if ( !-x $installer->{ 'needBinary' } ) {
+                    print
+                        "The following required binary for the installation was not found\n";
+                    print "\t" . $installer->{ 'needBinary' } . "\n";
+                    exit 1;
+                }
+            }
         }
 
         # Do we need a directory specified as the installation source?
@@ -280,87 +303,6 @@ else
 
 
 
-=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.
@@ -396,6 +338,7 @@ sub parseCommandLineArguments
         "cachedir=s", \$CONFIG{ 'cachedir' },
         "config=s", \$CONFIG{ 'config' },
         "mirror=s", \$CONFIG{ 'mirror' },
+        "keyring=s", \$CONFIG{ 'keyring' },
         "apt_proxy=s", \$CONFIG{ 'apt_proxy' },
 
         # Help.
@@ -411,13 +354,7 @@ sub parseCommandLineArguments
 
     if ($VERSION)
     {
-        my $REVISION = '$Revision: 1.65 $';
-        if ( $REVISION =~ /1.([0-9.]+) / )
-        {
-            $REVISION = $1;
-        }
-
-        print "xt-install-image release $RELEASE - CVS: $REVISION\n";
+        print "xt-install-image release $RELEASE\n";
         exit;
     }
 }
@@ -473,7 +410,7 @@ sub checkArguments
     #  If there are no scripts then we clearly cannot
     # customise it!
     #
-    my $dir = "/usr/lib/xen-tools/" . $CONFIG{ 'dist' } . ".d";
+    my $dir = "/usr/share/xen-tools/" . $CONFIG{ 'dist' } . ".d";
 
     if ( !-d $dir )
     {
@@ -553,53 +490,6 @@ EOT
 
 
 
-=begin doc
-
-  A utility method to run a system command.  We will capture the return
- value and exit if the command fails.
-
-  When running verbosely we will also display any command output.
-
-=end doc
-
-=cut
-
-sub runCommand
-{
-    my ($cmd) = (@_);
-
-    #
-    #  Command start.
-    #
-    $CONFIG{ 'verbose' } && print "Executing : $cmd\n";
-
-    #
-    #  Copy stderr to stdout, so we can see it, and make sure we log it.
-    #
-    $cmd .= " 2>&1 | tee --append /var/log/xen-tools/$CONFIG{'hostname'}.log";
-
-    #
-    #  Run it.
-    #
-    my $output = `$cmd`;
-
-    if ( $? != 0 )
-    {
-        print "Running command '$cmd' failed.\n";
-        print "Aborting\n";
-        exit 127;
-    }
-
-    #
-    #  Command finished.
-    #
-    $CONFIG{ 'verbose' } && print "Finished : $cmd\n";
-
-    return ($output);
-}
-
-
-
 =begin doc
 
   This function will copy all the .deb files from one directory
@@ -685,7 +575,7 @@ sub do_copy
     #
     #  Run the copy command.
     #
-    runCommand($cmd);
+    runCommand($cmd, \%CONFIG);
 }
 
 
@@ -705,21 +595,9 @@ sub do_debootstrap
     #  The command is a little configurable - mostly to allow you
     # to use cdebootstrap.
     #
-    my $cmd = $CONFIG{ 'debootstrap-cmd' };
+    my $cmd = $CONFIG{ 'debootstrap-cmd' } || $debootstrap_cmd;
+    print "Using $cmd as debootstrap command\n";
     my $cachedir = $CONFIG{ 'cachedir' };
-    if ( !$cmd )
-    {
-        if (-x '/usr/sbin/debootstrap') {
-            $cmd = '/usr/sbin/debootstrap';
-        } elsif (-x '/usr/sbin/cdebootstrap') {
-            $cmd = '/usr/sbin/cdebootstrap';
-        } else {
-            print STDERR "Found neither debootstrap nor cdebootstrap and no --debootstrap-cmd given\n";
-            exit 1;
-        }
-        print "Using $cmd as debootstrap command\n";
-    }
-
 
     #
     #  Cache from host -> new installation if we've got caching
@@ -736,7 +614,7 @@ sub do_debootstrap
             }
             $cachedir = $xtcache;
         }
-        runCommand("mkdir -p $CONFIG{'location'}/var/cache/apt/archives");
+        runCommand("mkdir -p $CONFIG{'location'}/var/cache/apt/archives", \%CONFIG);
         copyDebFiles( "$cachedir",
                       "$CONFIG{'location'}/var/cache/apt/archives" );
         print("Done\n");
@@ -759,6 +637,14 @@ sub do_debootstrap
         $EXTRA .= " --arch $CONFIG{'arch'}";
     }
 
+    #
+    #  Propogate the --keyring argument
+    #
+    if ( $CONFIG{ 'keyring' } )
+    {
+        $EXTRA .= " --keyring=$CONFIG{'keyring'}";
+    }
+
     #
     #  Setup http_proxy so that debootstrap pulls files through the apt-proxy
     #
@@ -777,7 +663,7 @@ sub do_debootstrap
     #
     #  Run the command.
     #
-    runCommand($command);
+    runCommand($command, \%CONFIG);
 
 
     #
@@ -848,7 +734,7 @@ sub do_rinse
         $command .= " --verbose";
     }
 
-    runCommand($command);
+    runCommand($command, \%CONFIG);
 }
 
 
@@ -891,7 +777,7 @@ sub do_rpmstrap
     #  The command we're going to run.
     #
     my $command = "rpmstrap $EXTRA $CONFIG{'dist'} $CONFIG{'location'} $mirror";
-    runCommand($command);
+    runCommand($command, \%CONFIG);
 }
 
 
@@ -925,5 +811,5 @@ sub do_tar
     #
     #  Run a command to copy an installed system into the new root.
     #
-    runCommand("cd $CONFIG{'location'} && $cmd");
+    runCommand("cd $CONFIG{'location'} && $cmd", \%CONFIG);
 }

debian/NEWS

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

debian/README.source

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

debian/changelog

@@ -1,3 +1,279 @@
+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 12.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 are 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 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

debian/compat

@@ -1 +1 @@
-7
+9

debian/control

@@ -2,17 +2,54 @@ Source: xen-tools
 Section: utils
 Priority: extra
 Maintainer: Axel Beckert <abe@debian.org>
-Build-Depends: debhelper (>= 7.0.0), libtest-pod-perl, libtext-template-perl, libfile-slurp-perl, devscripts
-Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 9~),
+               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: 3.9.6
 Homepage: http://xen-tools.org/software/xen-tools
-Vcs-Browser: http://gitorious.org/xen-tools/xen-tools
-Vcs-Git: git://gitorious.org/xen-tools/xen-tools.git
+Vcs-Browser: https://gitlab.com/xen-tools/xen-tools
+Vcs-Git: https://gitlab.com/xen-tools/xen-tools.git
+Testsuite: autopkgtest
 
 Package: xen-tools
 Architecture: all
-Depends: debootstrap | cdebootstrap, perl-modules, libtext-template-perl, libconfig-inifiles-perl, libfile-slurp-perl, ${misc:Depends}, openssh-client
-Recommends: xen-hypervisor-amd64 | xen-hypervisor-i386 | xen-hypervisor-i386-pae, rinse (>= 1.9.1-1), libexpect-perl, xen-utils
-Suggests: reiserfsprogs, xfsprogs, cfengine2, btrfs-tools
+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,
+            libexpect-perl,
+            lvm2,
+            rinse (>= 1.9.1-1),
+            ubuntu-archive-keyring,
+            xen-hypervisor,
+            xen-utils
+Suggests: btrfs-tools,
+          cfengine2,
+          reiserfsprogs,
+          xfsprogs
 Description: Tools to manage Xen virtual servers
  This package contains tools to manage Debian based Xen virtual servers.
  .
@@ -25,7 +62,9 @@ Description: Tools to manage Xen virtual servers
    * Debian 4.0 Etch
    * Debian 5.0 Lenny
    * Debian 6.0 Squeeze
-   * Debian 7.0 Wheezy
+   * Debian 7 Wheezy
+   * Debian 8 Jessie
+   * Debian 9 Stretch (under development)
    * Debian Sid (Unstable)
    * Ubuntu 6.06 Dapper Drake (LTS)
    * Ubuntu 6.10 Edgy Eft
@@ -40,5 +79,12 @@ Description: Tools to manage Xen virtual servers
    * 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 (under development)
    * CentOS 5
    * CentOS 6

debian/copyright

@@ -4,7 +4,7 @@ Tue, 20 Dec 2005 02:21:05 +0200.
 It was downloaded from http://xen-tools.org/software/xen-tools/
 
 Copyright 2005-2009: Steve Kemp <steve@steve.org.uk>
-Copyright 2010-2012: The Xen-Tools Development Team, currently consisting of:
+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>

debian/dirs

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

debian/docs

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

debian/examples

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

debian/gbp.conf

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

debian/lintian-overrides

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

debian/rules

@@ -2,56 +2,10 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+%:
+	dh $@
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	touch configure-stamp
+override_dh_auto_test:
+	make non-author-test
 
-
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: 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_prep
-
-	dh_auto_test
-	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
+override_dh_auto_build:

debian/source/format

@@ -1 +1 @@
-1.0
+3.0 (quilt)

debian/tests/adequate

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

debian/tests/control

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

debian/tests/functionality

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

debian/triggers

@@ -0,0 +1 @@
+activate update-initramfs

etc/distributions.conf

@@ -0,0 +1,44 @@
+# xen-tools configuration file for distibution meta data
+#
+# Syntax:
+#
+# codename = distribution and further keywords
+#
+# Known distributions: debian, ubuntu
+# Known keywords: eol, pygrub
+#
+sarge        = debian eol
+etch         = debian eol
+lenny        = debian eol
+squeeze      = debian
+wheezy       = debian
+jessie       = debian
+stretch      = debian
+sid          = debian
+
+testing      = debian
+oldoldstable = debian
+oldstable    = debian
+stable       = debian
+unstable     = debian
+
+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
+quantal      = ubuntu eol pygrub
+raring       = ubuntu eol pygrub
+saucy        = ubuntu eol pygrub
+trusty       = ubuntu     pygrub
+utopic       = ubuntu eol pygrub
+vivid        = ubuntu     pygrub
+wily         = ubuntu     pygrub

etc/mirrors.conf

@@ -0,0 +1,13 @@
+# xen-tools default mirror configuration file
+
+debian =         http://httpredir.debian.org/debian
+debian_archive = http://httpredir.debian.org/debian-archive/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

@@ -125,13 +125,15 @@ install-method = debootstrap
 #  Disk and Sizing options.
 ##
 #
-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   = `xt-guess-suite-and-mirror --suite` # Default distribution to install.
-image  = sparse   # Specify sparse vs. full disk images.
+size   = 4G       # Root disk, suffix (G, M, k) required
+memory = 128M     # Suffix (G, M, k) required
+#maxmem = 256M     # Suffix (G, M, k) optional
+swap   = 128M     # Suffix (G, M, k) required
+# noswap = 1      # Don't use swap at all for new systems.
+fs     = ext3     # 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)
 
 #
 #  See the README for currently supported and tested distributions. You can
@@ -235,6 +237,13 @@ image  = sparse   # Specify sparse vs. full disk images.
 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
+#
+
 #
 #  The architecture to use when using debootstrap, rinse, or rpmstrap.
 #
@@ -245,42 +254,9 @@ initrd = /boot/initrd.img-`uname -r`
 #
 
 #
-# The default mirror for debootstrap to install Debian-derived distributions
+# Use the mirror configured on the DomU as default mirror
 #
-mirror = `xt-guess-suite-and-mirror --mirror`
-
-#
-# A mirror suitable for use when installing the Dapper release of Ubuntu.
-#
-# mirror = http://gb.archive.ubuntu.com/ubuntu/
-
-#
-#  If you like you could use per-distribution mirrors, which will
-# be more useful if you're working in an environment where you want
-# to regularly use multiple distributions. The following are the
-# default values used (for Debian the GeoIP feature is used, see
-# http://wiki.debian.org/DebianGeoMirror):
-#
-# mirror_sarge = http://archive.debian.org/debian
-# mirror_etch = http://archive.debian.org/debian
-# mirror_lenny = http://archive.debian.org/debian
-# mirror_squeeze = http://cdn.debian.net/debian
-# mirror_wheezy = http://cdn.debian.net/debian
-# mirror_sid = http://cdn.debian.net/debian
-# mirror_dapper = http://old-releases.ubuntu.com/ubuntu
-# mirror_edgy = http://old-releases.ubuntu.com/ubuntu
-# mirror_feisty = http://old-releases.ubuntu.com/ubuntu
-# mirror_gutsy = http://old-releases.ubuntu.com/ubuntu
-# mirror_hardy = http://archive.ubuntu.com/ubuntu
-# mirror_intrepid = http://old-releases.ubuntu.com/ubuntu
-# mirror_jaunty = http://old-releases.ubuntu.com/ubuntu
-# mirror_karmic = http://old-releases.ubuntu.com/ubuntu
-# mirror_lucid = http://archive.ubuntu.com/ubuntu
-# mirror_maverick = http://old-releases.ubuntu.com/ubuntu
-# mirror_natty = http://archive.ubuntu.com/ubuntu
-# mirror_oneiric = http://archive.ubuntu.com/ubuntu
-# mirror_precise = http://archive.ubuntu.com/ubuntu
-# mirror_quantal = http://archive.ubuntu.com/ubuntu
+# mirror = `xt-guess-suite-and-mirror --mirror`
 
 # If this is defined it will be used by debootstrap, and configured as the
 # proxy for the guest
@@ -290,6 +266,7 @@ mirror = `xt-guess-suite-and-mirror --mirror`
 #
 #  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

etc/xm-nfs.tmpl

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

etc/xm.tmpl

@@ -8,7 +8,8 @@
 #
 { if ( ( $kernel ) && ( !defined($pygrub)) )
   {
-    $OUT.= "kernel      = '$kernel'";
+    $OUT .= "kernel      = '$kernel'\n";
+    $OUT .= "extra       = 'elevator=noop'";
   }
 }
 { if ( ( $initrd ) && ( !defined($pygrub)) )
@@ -20,8 +21,8 @@
   if ( $pygrub )
   {
     my $pygrub_bin = '';
-    foreach my $pygrub_path (reverse glob('/usr/lib/xen-*/bin/pygrub
-                                           /usr/lib/xen-default/bin/pygrub
+    foreach my $pygrub_path (reverse glob('/usr/lib/xen-default/bin/pygrub
+                                           /usr/lib/xen-*/bin/pygrub
                                            /usr/*bin/pygrub')) {
       if (-x $pygrub_path) {
         $pygrub_bin = $pygrub_path;
@@ -36,6 +37,11 @@
 }
 vcpus       = '{$vcpus}'
 memory      = '{$memory}'
+{ if ( $maxmem )
+  {
+    $OUT .= "maxmem      = '$maxmem'\n";
+  }
+}
 
 #
 #  Disk device(s).
@@ -145,6 +151,12 @@ name        = '{$hostname}'
       $br = ",bridge=$bridge"
     }
 
+    my $vl = '';
+    if ( $vlan )
+    {
+      $vl = ".$vlan"
+    }
+
     $OUT .= "vif         = [ 'ip=$ips";
     $OUT .= "$m";
     $OUT .= "$vn";

examples/release-testing

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# Skip dapper and edgy due to bug #659360 in debootstrap
+for dist in $(awk '!/^#|^$/ {print $1}' /etc/xen-tools/distributions.conf | egrep -v '^(dapper|edgy)$'); do
+    xen-create-image --dist $dist --force --verbose "$@" || break
+done 2>&1 | tee xen-tools-release-testing.log

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/lib/xen-tools/
+ to the directory /usr/share/xen-tools/
 
 Steve
 --

hooks/centos-5/25-setup-kernel

@@ -8,8 +8,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi
@@ -41,7 +41,7 @@ EOF
 for i in `seq 1 $NUMPARTITIONS`; do
   echo -n "/dev/xvde$i " >> ${prefix}/etc/fstab
   eval part=\$PARTITION$i
-  if [ ! -z "`echo $part | grep swap`" ]; then
+  if [ -n "`echo $part | grep swap`" ]; then
      echo "none swap ws 0 0" >> ${prefix}/etc/fstab
   else
      echo $part | awk -F: '{print $4,$3,$5,0,1}' >> ${prefix}/etc/fstab
@@ -66,7 +66,7 @@ cat > ${prefix}/boot/grub/menu.lst << EOF
 default=0
 timeout=5
 title CentOS ($KERNELVERSION)
-kernel        /boot/vmlinuz-$KERNELVERSION xen_pv_hvm=enable
+kernel        /boot/vmlinuz-$KERNELVERSION xen_pv_hvm=enable elevator=noop
 initrd        /boot/initrd-$KERNELVERSION.img
 EOF
 

hooks/centos-6/15-setup-arch

@@ -1 +1 @@
-../common/15-disable-hwclock
+../common/15-setup-arch

hooks/centos-6/25-setup-kernel

@@ -8,8 +8,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi
@@ -41,7 +41,7 @@ EOF
 for i in `seq 1 $NUMPARTITIONS`; do
   echo -n "/dev/sda$i " >> ${prefix}/etc/fstab
   eval part=\$PARTITION$i
-  if [ ! -z "`echo $part | grep swap`" ]; then
+  if [ -n "`echo $part | grep swap`" ]; then
      echo "none swap ws 0 0" >> ${prefix}/etc/fstab
   else
      echo $part | awk -F: '{print $4,$3,$5,0,1}' >> ${prefix}/etc/fstab
@@ -66,7 +66,7 @@ cat > ${prefix}/boot/grub/menu.lst << EOF
 default=0
 timeout=5
 title CentOS ($KERNELVERSION)
-kernel        /boot/vmlinuz-$KERNELVERSION
+kernel        /boot/vmlinuz-$KERNELVERSION elevator=noop
 initrd        /boot/initramfs-$KERNELVERSION.img
 EOF
 

hooks/common.sh

@@ -24,7 +24,7 @@ logMessage ()
 {
     message="$*"
 
-    if [ ! -z "${verbose}" ]; then
+    if [ -n "${verbose}" ]; then
         echo $message
     fi
 }
@@ -47,7 +47,7 @@ assert ()
         shift
     fi
 
-    if [ ! $* ] ; then
+    if [ ! "$*" ] ; then
         echo "assert failed: $0:$lineno [$*]"
         exit
     fi
@@ -55,14 +55,12 @@ assert ()
 
 
 #
-#  Install a number of Debian packages via apt-get.
+#  Install a number of Debian packages via apt-get including Recommends.
 #
 #  We take special care so that daemons shouldn't start after installation
 # which they might otherwise do.
 #
-#  NOTE:  Function not renamed with trailing "s" for compatability reasons.
-#
-installDebianPackage ()
+installDebianPackageAndRecommends ()
 {
     prefix=$1
     shift
@@ -98,7 +96,7 @@ installDebianPackage ()
     #
     # Install the packages
     #
-    DEBIAN_FRONTEND=noninteractive chroot ${prefix} /usr/bin/apt-get --yes --force-yes install "$@"
+    DEBIAN_FRONTEND=noninteractive chroot ${prefix} /usr/bin/apt-get --yes install "$@"
 
     #
     #  Remove the policy-rc.d script.
@@ -112,6 +110,158 @@ installDebianPackage ()
 
 }
 
+#
+#  Install a number of Debian packages via apt-get, but without Recommends
+#
+#  We take special care so that daemons shouldn't start after installation
+# which they might otherwise do.
+#
+#  NOTE:  Function not renamed with trailing "s" for compatibility reasons.
+#
+installDebianPackage ()
+{
+    prefix=$1
+    shift
+
+    installDebianPackageAndRecommends ${prefix} -o APT::Install-Recommends=false "$@"
+}
+
+#
+#  Generate a Debian-/Ubuntu-compliant menu.lst for legacy GRUB
+#
+generateDebianGrubMenuLst ()
+{
+    prefix="$1"
+    DOMU_ISSUE="$2"
+    DOMU_KERNEL="$3"
+    DOMU_RAMDISK="$4"
+
+    #
+    # Log our options
+    #
+    logMessage "Generating a legacy GRUB menu.lst into prefix ${prefix}"
+
+    #
+    #  We require at least 3 parameters
+    #
+    assert "$LINENO" "${prefix}"
+    assert "$LINENO" "${DOMU_ISSUE}"
+    assert "$LINENO" "${DOMU_KERNEL}"
+
+    #
+    # Prefix must be a directory, kernel a file
+    #
+    assert "$LINENO" -d ${prefix}
+    assert "$LINENO" -f "${prefix}/boot/${DOMU_KERNEL}"
+
+    #
+    # Generate a menu.lst for pygrub
+    #
+
+    mkdir -p ${prefix}/boot/grub
+    cat << E_O_MENU > ${prefix}/boot/grub/menu.lst
+default         0
+timeout         2
+
+### BEGIN AUTOMAGIC KERNELS LIST
+## lines between the AUTOMAGIC KERNELS LIST markers will be modified
+## by the debian update-grub script except for the default options below
+
+## DO NOT UNCOMMENT THEM, Just edit them to your needs
+
+## ## Start Default Options ##
+## default kernel options
+## default kernel options for automagic boot options
+## If you want special options for specific kernels use kopt_x_y_z
+## where x.y.z is kernel version. Minor versions can be omitted.
+## e.g. kopt=root=/dev/hda1 ro
+##      kopt_2_6_8=root=/dev/hdc1 ro
+##      kopt_2_6_8_2_686=root=/dev/hdc2 ro
+# kopt=root=/dev/xvda2 ro elevator=noop
+
+## default grub root device
+## e.g. groot=(hd0,0)
+# groot=(hd0,0)
+
+## should update-grub create alternative automagic boot options
+## e.g. alternative=true
+##      alternative=false
+# alternative=true
+
+## should update-grub lock alternative automagic boot options
+## e.g. lockalternative=true
+##      lockalternative=false
+# lockalternative=false
+
+## additional options to use with the default boot option, but not with the
+## alternatives
+## e.g. defoptions=vga=791 resume=/dev/hda5
+# defoptions=
+
+## should update-grub lock old automagic boot options
+## e.g. lockold=false
+##      lockold=true
+# lockold=false
+
+## altoption boot targets option
+## multiple altoptions lines are allowed
+## e.g. altoptions=(extra menu suffix) extra boot options
+##      altoptions=(single-user) single
+# altoptions=(single-user mode) single
+
+## controls how many kernels should be put into the menu.lst
+## only counts the first occurence of a kernel, not the
+## alternative kernel options
+## e.g. howmany=all
+##      howmany=7
+# howmany=all
+
+## should update-grub create memtest86 boot option
+## e.g. memtest86=true
+##      memtest86=false
+# memtest86=false
+
+## should update-grub adjust the value of the default booted system
+## can be true or false
+# updatedefaultentry=false
+
+## should update-grub add savedefault to the default options
+## can be true or false
+# savedefault=false
+
+## ## End Default Options ##
+
+### END DEBIAN AUTOMAGIC KERNELS LIST
+
+# Entries statically generated bu xen-tools upon installation. Maybe
+# removed manually if the entries above (generated by update-grub)
+# seem to work fine.
+
+title           $DOMU_ISSUE
+root            (hd0,0)
+kernel          /boot/$DOMU_KERNEL root=/dev/xvda2 ro elevator=noop
+initrd          /boot/$DOMU_RAMDISK
+
+title           $DOMU_ISSUE (Single-User)
+root            (hd0,0)
+kernel          /boot/$DOMU_KERNEL root=/dev/xvda2 ro single elevator=noop
+initrd          /boot/$DOMU_RAMDISK
+
+title           $DOMU_ISSUE (Default Kernel)
+root            (hd0,0)
+kernel          /vmlinuz root=/dev/xvda2 ro elevator=noop
+initrd          /initrd.img
+
+title           $DOMU_ISSUE (Default Kernel, Single-User)
+root            (hd0,0)
+kernel          /vmlinuz root=/dev/xvda2 ro single elevator=noop
+initrd          /initrd.img
+
+E_O_MENU
+
+
+}
+
 
 
 #
@@ -124,12 +274,14 @@ disableStartStopDaemon ()
    for starter in start-stop-daemon initctl; do
       local daemonfile="${prefix}/sbin/${starter}"
 
-      mv "${daemonfile}" "${daemonfile}.REAL"
-      echo '#!/bin/sh' > "${daemonfile}"
-      echo "echo \"Warning: Fake ${starter} called, doing nothing\"" >> "${daemonfile}"
+      if [ -e "${daemonfile}" ]; then
+         mv "${daemonfile}" "${daemonfile}.REAL"
+         echo '#!/bin/sh' > "${daemonfile}"
+         echo "echo \"Warning: Fake ${starter} called, doing nothing\"" >> "${daemonfile}"
 
-      chmod 755 "${daemonfile}"
-      logMessage "${starter} disabled / made a stub."
+         chmod 755 "${daemonfile}"
+         logMessage "${starter} disabled / made a stub."
+      fi
    done
 }
 
@@ -170,7 +322,7 @@ removeDebianPackage ()
     #
     # Log our options
     #
-    logMessage "Purging Debian package ${package} from prefix ${prefix}"
+    logMessage "Purging Debian package $@ from prefix ${prefix}"
 
     #
     #  We require a prefix
@@ -191,9 +343,9 @@ removeDebianPackage ()
 
 
 #
-#  Install a CentOS4 package via yum
+#  Install a RPM package via yum
 #
-installCentOS4Package ()
+installRPMPackage ()
 {
     prefix=$1
     package=$2
@@ -201,7 +353,7 @@ installCentOS4Package ()
     #
     # Log our options
     #
-    logMessage "Installing CentOS4 ${package} to prefix ${prefix}"
+    logMessage "Installing RPM ${package} to prefix ${prefix}"
 
     #
     #  We require a package + prefix
@@ -220,6 +372,15 @@ installCentOS4Package ()
     chroot ${prefix} /usr/bin/yum -y install ${package}
 }
 
+# Backwards Compatibility Function
+installCentOS4Package () ( installRPMPackage "$@" )
+
+
+#
+#  Functions to test if we're on a redhatesk or debianesk system
+#
+isDeb() ( [ -x $1/usr/bin/apt-get -a -x $1/usr/bin/dpkg ] )
+isYum() ( [ -x $1/usr/bin/yum ] )
 
 
 #
@@ -230,11 +391,11 @@ installPackage ()
         prefix=$1
         package=$2
 
-        if [ -x ${prefix}/usr/bin/apt-get ] ; then
+        if isDeb ; then
                 installDebianPackage "$@"
 
-        elif [ -x ${prefix}/usr/bin/yum ] ; then
-                installCentOS4Package "$@"
+        elif isYum ; then
+                installRPMPackage "$@"
 
         else
                 logMessage "Unable to install package ${package}; no package manager found"
@@ -261,4 +422,3 @@ installGentooPackage ()
     logMessage "NOTE: Not doing anything - this is a stub - FIXME"
 
 }
-

hooks/common/01-disable-daemons

@@ -14,8 +14,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/common/05-shadowconfig-on

@@ -13,8 +13,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/common/10-disable-tls

@@ -14,8 +14,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/common/15-disable-hwclock

@@ -13,8 +13,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/common/15-setup-arch

@@ -6,8 +6,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/common/20-setup-apt

@@ -14,8 +14,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi
@@ -70,18 +70,14 @@ chroot ${prefix} /usr/bin/apt-get update
 
 
 #
-#  Now fixup TLS on non-64bit systems after dapper.
+#  Now fixup TLS on non-64bit systems after dapper. For dapper this is
+#  already fixed in 10-disable-tls.
 #
-if [ "$dist" != 'dapper' ]; then
-    if [ "`uname -m`" = "x86_64" ]; then
+if [ "$arch" = 'i386' -a "$dist" != 'dapper' ]; then
 
-        logMessage "Ignoring TLS since we're a 64 bit host."
+    logMessage "Installing libc6-xen"
+    installDebianPackage ${prefix} libc6-xen
 
-    else
-
-        logMessage "Installing libc6-xen"
-        installDebianPackage ${prefix} libc6-xen
-    fi
 fi
 
 

hooks/common/20-setup-yum

@@ -13,8 +13,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi
@@ -33,7 +33,7 @@ if [ ! -d ${prefix}/proc ]; then
     mkdir -p ${prefix}/proc
 fi
 mount -o bind /proc ${prefix}/proc
-chroot ${prefix} /usr/bin/yum update
+chroot ${prefix} /usr/bin/yum update -y
 umount ${prefix}/proc
 
 

hooks/common/25-generate-locale

@@ -13,8 +13,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/common/30-disable-gettys

@@ -12,8 +12,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi
@@ -49,7 +49,7 @@ rm -f ${prefix}/etc/event.d/tty[!1]
 #
 #  Are we using an alternative serial device?
 #
-if [ ! -z "${serial_device}" ]; then
+if [ -n "${serial_device}" ]; then
 
     serial_device=`basename ${serial_device}`
 

hooks/common/40-setup-networking-deb

@@ -13,8 +13,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi
@@ -71,8 +71,8 @@ setupStaticNetworking ()
     #  if $p2p is set then add a "pointopoint" setting.
     #
     point='';
-    if [ ! -z "${p2p}" ]; then
-        point="pointopoint ${p2p}"
+    if [ -n "${p2p}" ]; then
+        point=" pointopoint ${p2p}"
     else
         point=''
     fi
@@ -81,10 +81,17 @@ setupStaticNetworking ()
     # broadcast address?
     #
     bcast='';
-    if [ ! -z "${broadcast}" ]; then
+    if [ -n "${broadcast}" ]; then
       bcast=" broadcast ${broadcast}"
     fi
 
+    #
+    # gateway address?
+    #
+    if [ -n "${gateway}" ]; then
+      gateway=" gateway ${gateway}"
+    fi
+
     #
     # We have a static IP address
     #
@@ -100,10 +107,10 @@ iface lo inet loopback
 auto eth0
 iface eth0 inet static
  address ${ip1}
- gateway ${gateway}
+${gateway}
  netmask ${netmask}
- ${bcast}
- ${point}
+${bcast}
+${point}
  # post-up  ethtool -K eth0 tx off
 
 #

hooks/common/40-setup-networking-rpm

@@ -13,8 +13,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/common/50-setup-hostname-deb

@@ -15,8 +15,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/common/50-setup-hostname-rpm

@@ -15,8 +15,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/common/55-create-dev

@@ -14,8 +14,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/common/60-copy-host-files

@@ -11,8 +11,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/common/65-copy-user-files

@@ -11,8 +11,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/common/70-install-ssh-deb

@@ -15,8 +15,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi
@@ -38,9 +38,9 @@ mkdir -p ${prefix}/etc/ssh
 #
 if [ ! -f ${prefix}/etc/ssh/ssh_host_rsa_key ]; then
 if ssh-keygen -t rsa -N "" -f ${prefix}/etc/ssh/ssh_host_rsa_key -C "root@${hostname}"; then
-    logMessage "successfully generetaged Host RSA"
+    logMessage "successfully generated RSA host key"
 else
-    logMessage "failed to generate Host RSA Key"
+    logMessage "failed to generate RSA host key"
 fi
 fi
 
@@ -49,9 +49,9 @@ fi
 #
 if [ ! -f ${prefix}/etc/ssh/ssh_host_dsa_key ]; then
 if ssh-keygen -t dsa -N "" -f ${prefix}/etc/ssh/ssh_host_dsa_key -C "root@${hostname}"; then
-    logMessage "successfully generetaged Host DSA"
+    logMessage "successfully generated DSA host key"
 else
-    logMessage "failed to generate Host DSA Key"
+    logMessage "failed to generate DSA host key"
 fi
 fi
 

hooks/common/70-install-ssh-rpm

@@ -13,8 +13,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/common/75-fixup-securetty

@@ -14,8 +14,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/common/80-install-modules-deb

@@ -19,8 +19,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi
@@ -73,11 +73,6 @@ else
     cp -au /lib/modules/$(uname -r) ${prefix}/lib/modules
 fi
 
-#
-#  Install the module-init-tools package.
-#
-installDebianPackage ${prefix} module-init-tools
-
 fi # if pygrub
 
 #

hooks/common/80-install-modules-rpm

@@ -19,8 +19,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

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

@@ -0,0 +1,44 @@
+#!/bin/sh
+#
+#  Ensure that either modules-init-tools or kmod is setup.
+#
+#  This is required in most setups.  But even if it isn't required it
+# can't really do anything bad; just waste a bit of space.
+#
+
+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
+
+
+#
+# Log our start
+#
+logMessage Script $0 starting
+
+#
+#  Install either kmod or module-init-tools package.
+#
+if chroot ${prefix} /usr/bin/apt-cache show module-init-tools >/dev/null 2>/dev/null; then
+    if chroot ${prefix} /usr/bin/apt-cache show module-init-tools | fgrep -qi transitional; then
+        installDebianPackage ${prefix} kmod
+    else
+        installDebianPackage ${prefix} module-init-tools
+    fi
+else
+    installDebianPackage ${prefix} kmod
+fi
+
+#
+#  Log our finish
+#
+logMessage Script $0 finished

hooks/common/82-install-grub-legacy

@@ -0,0 +1,52 @@
+#!/bin/sh
+#
+#  Ensure that either modules-init-tools or kmod is setup.
+#
+#  This is most likely required if you're using a custom kernel
+# for your Xen system.  But even if it isn't required it can't
+# really do anything bad; just waste a bit of space.
+
+
+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
+
+
+#
+# Log our start
+#
+logMessage Script $0 starting
+
+if [ ${pygrub} ]; then
+
+#
+#  Install the grub 0.9x package ("grub-legacy" on Debian, "grub" on Ubuntu)
+#
+if chroot ${prefix} /usr/bin/apt-cache show grub-legacy 2>/dev/null | egrep -qi 'GRand Unified Bootloader.*Legacy'; then
+    installDebianPackage ${prefix} grub-legacy
+else
+    installDebianPackage ${prefix} grub
+fi
+
+if [ ! -e ${prefix}/boot/grub/default ]; then
+    echo default > ${prefix}/boot/grub/default
+fi
+chroot ${prefix} /usr/sbin/update-grub
+
+else
+    logMessage "pygrub not set, skipping grub-legacy installation"
+fi # if pygrub
+
+#
+#  Log our finish
+#
+logMessage Script $0 finished

hooks/common/90-make-fstab

@@ -17,8 +17,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi
@@ -48,7 +48,7 @@ if [ "${ide}" ]; then
 elif [ "${scsi}" ]; then
     device=sda
 else
-    if [ ! -z "${disk_device}" ]; then
+    if [ -n "${disk_device}" ]; then
         device=`basename $disk_device`
     fi
 fi
@@ -100,6 +100,34 @@ for part in `seq 1 ${NUMPARTITIONS}`; do
 done
 
 
+logMessage Checking for filesystem tools to install
+
+#
+#  Install any required packages for the given root filesystem
+#
+if [ "$has_xfs" -eq 1 ]; then
+    installPackage ${prefix} xfsprogs
+fi
+if [ "$has_reiserfs" -eq 1 ]; then
+    if isAPT; then
+        installDebianPackage reiserfsprogs
+    elif isYum; then
+        installRPMPackage reiserfs-utils
+    else
+        logMessage "Unable to install reiserfs tools; no package manager recognized"
+    fi
+fi
+if [ "$has_btrfs" -eq 1 ]; then
+    if isAPT; then
+        installDebianPackage btrfs-tools
+    elif isYum; then
+        installRPMPackage btrfs-progs
+    else
+        logMessage "Unable to install btrfs tools; no package manager recognized"
+    fi
+fi
+
+
 #
 #  Log our finish
 #

hooks/common/91-install-fs-tools

@@ -1,45 +0,0 @@
-#!/bin/sh
-#
-#  Some root filesystems will require the installation of new packages
-#
-# 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 any required packages for the given root filesystem
-#
-if [ $has_xfs -eq 1 ]; then
-    installDebianPackage ${prefix} xfsprogs
-fi
-if [ $has_reiserfs -eq 1 ]; then
-    installDebianPackage ${prefix} reiserfsprogs
-fi
-if [ $has_btrfs -eq 1 ]; then
-    installDebianPackage ${prefix} btrfs-tools
-fi
-
-
-#
-#  Log our finish
-#
-logMessage Script $0 finished

hooks/common/99-clean-image-deb

@@ -13,8 +13,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/common/99-clean-image-rpm

@@ -12,8 +12,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/common/99-enable-daemons

@@ -14,8 +14,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

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

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

hooks/dapper/91-install-fs-tools

@@ -1 +0,0 @@
-../common/91-install-fs-tools

hooks/debian/20-setup-apt

@@ -14,8 +14,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi
@@ -90,30 +90,20 @@ fi
 #
 chroot ${prefix} /usr/bin/apt-get update
 
-
 #
-# For sid or etch systems we install libc6-xen
+# For all systems after Sarge we install libc6-xen on i386
 #
-# For sarge we don't have that option, so we disable TLS.
+# For Sarge we don't have that option, so we disable TLS the hard way.
 #
-if [ "`uname -m`" = "x86_64" ]; then
-
-    logMessage "Ignoring TLS since we're a 64 bit host."
-
-else
-
-    case "${dist}" in
-        *)
-            logMessage "Installing xen-aware libc6"
-    
-            installDebianPackage ${prefix} libc6-xen
-            ;;
-        sarge)
-            logMessage "Disabling TLS"
-            mv ${prefix}/lib/tls ${prefix}/lib/tls.disabled
-            mkdir ${prefix}/lib/tls
-            ;;
-    esac
+if [ "${arch}" = "i386" ]; then
+    if [ "${dist}" = 'sarge' ]; then
+        logMessage "Disabling TLS"
+        mv ${prefix}/lib/tls ${prefix}/lib/tls.disabled
+        mkdir ${prefix}/lib/tls
+    else
+        logMessage "Installing xen-aware libc6"
+        installDebianPackage ${prefix} libc6-xen
+    fi
 fi
 
 

hooks/debian/80-install-kernel

@@ -15,8 +15,8 @@ prefix=$1
 #  Source our common functions
 #
 
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi
@@ -29,7 +29,7 @@ if [ "${pygrub}" ]; then
 logMessage Script $0 starting
 
 #
-# Resolve the correct architecutre
+# Resolve the correct architecture
 #
 
 if [ "${arch}" = "i386" ]; then
@@ -61,6 +61,17 @@ fi
 KERNEL_XEN_PKG="linux-image-xen-$XEN_ARCH"
 KERNEL_PKG="linux-image-$XEN_ARCH"
 
+# Add "-pae" suffix for Debian releases after Squeeze. See
+# https://bugs.debian.org/742778 for details.
+if [ "${dist}" != "sarge"   -a \
+     "${dist}" != "etch"    -a \
+     "${dist}" != "lenny"   -a \
+     "${dist}" != "squeeze" -a \
+     "$XEN_ARCH" = "686" ]; then
+    KERNEL_XEN_PKG="$KERNEL_XEN_PKG-pae"
+    KERNEL_PKG="$KERNEL_PKG-pae"
+fi
+
 logMessage Attempting to install the $KERNEL_XEN_PKG kernel image
 if chroot ${prefix} /usr/bin/apt-cache show $KERNEL_XEN_PKG > /dev/null 2>&1; then
     logMessage Package $KERNEL_XEN_PKG is available - installing
@@ -83,7 +94,10 @@ else
     fi
 fi
 
-DOMU_KERNEL=$(basename $(ls -1 ${prefix}/boot/vmlinuz* | tail -n 1))
+# Check for "ls -v" support
+V=''; if ls -1 ${prefix}/boot/vmlinuz* > /dev/null 2>&1; then V=-v; fi
+
+DOMU_KERNEL=$(basename $(ls -1 ${V} ${prefix}/boot/vmlinuz* | tail -n 1))
 KERNEL_REV=$(echo $DOMU_KERNEL | sed "s/vmlinuz-//g")
 DOMU_RAMDISK="initrd.img-$KERNEL_REV"
 DOMU_ISSUE=$(sed -re "s/ *\\\.*//g" -e1q < ${prefix}/etc/issue)
@@ -103,28 +117,8 @@ fi
 # Generate a menu.lst for pygrub
 #
 
-mkdir -p ${prefix}/boot/grub
-cat << E_O_MENU > ${prefix}/boot/grub/menu.lst
-default         0
-timeout         2
+generateDebianGrubMenuLst "${prefix}" "$DOMU_ISSUE" "$DOMU_KERNEL" "$DOMU_RAMDISK"
 
-title           $DOMU_ISSUE
-root            (hd0,0)
-kernel          /boot/$DOMU_KERNEL root=/dev/xvda2 ro 
-initrd          /boot/$DOMU_RAMDISK
-
-title           $DOMU_ISSUE (Single-User)
-root            (hd0,0)
-kernel          /boot/$DOMU_KERNEL root=/dev/xvda2 ro single
-initrd          /boot/$DOMU_RAMDISK
-
-E_O_MENU
-
-#
-#  Install the module-init-tools package.
-#
-
-installDebianPackage ${prefix} module-init-tools
 
 else
     logMessage pygrub not set, skipping kernel install

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

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

hooks/debian/82-install-grub-legacy

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

hooks/debian/91-install-fs-tools

@@ -1 +0,0 @@
-../common/91-install-fs-tools

hooks/debian/95-configure-locales

@@ -12,8 +12,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/edgy/80-install-kernel

@@ -15,8 +15,8 @@ prefix=$1
 #  Source our common functions
 #
 
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi
@@ -27,7 +27,7 @@ fi
 
 logMessage Script $0 starting
 
-if [ ${pygrub} ]; then
+if [ "${pygrub}" ]; then
 
 #
 # Attempt to install a xen kernel, if that fails, then install a normal one
@@ -78,32 +78,12 @@ fi
 # Generate a menu.lst for pygrub
 #
 
-mkdir -p ${prefix}/boot/grub
-cat << E_O_MENU > ${prefix}/boot/grub/menu.lst
-default         0
-timeout         2
+generateDebianGrubMenuLst "${prefix}" "$DOMU_ISSUE" "$DOMU_KERNEL" "$DOMU_RAMDISK"
 
-title           $DOMU_ISSUE
-root            (hd0,0)
-kernel          /boot/$DOMU_KERNEL root=/dev/xvda2 ro 
-initrd          /boot/$DOMU_RAMDISK
-
-title           $DOMU_ISSUE (Single-User)
-root            (hd0,0)
-kernel          /boot/$DOMU_KERNEL root=/dev/xvda2 ro single
-initrd          /boot/$DOMU_RAMDISK
-
-E_O_MENU
-
-#
-#  Install the module-init-tools package.
-#
-
-installDebianPackage ${prefix} module-init-tools
 
 else
     logMessage pygrub not set, skipping kernel install
-fi
+fi # if pygrub
 
 #
 #  Log our finish

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

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

hooks/edgy/82-install-grub-legacy

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

hooks/edgy/91-install-fs-tools

@@ -1 +0,0 @@
-../common/91-install-fs-tools

hooks/gentoo/20-enable-su

@@ -12,8 +12,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

hooks/gentoo/40-setup-networking

@@ -12,8 +12,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi
@@ -61,7 +61,7 @@ setupStaticNetworking ()
     #  if $p2p is set then add a "pointopoint" setting.
     #
     point='';
-    if [ ! -z "${p2p}" ]; then
+    if [ -n "${p2p}" ]; then
         point="pointopoint ${p2p}"
     else
         point=''