t/xen-delete-image.t: Check xen-delete-image exit code

Also run xen-delete-image verbose and print output.

.gitignore

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

.hgignore

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

AUTHORS

@@ -24,6 +24,16 @@ Contributions
   Justin Azoff <JAzoff [at] edu.albany.uamail>
    - Added LVM support to xen-create-image.
 
+  Pieter Barrezeele <macbar [at] be.fab4>
+   - Several small but useful enhancements
+   - Bugfixes
+
+  Brian Bennett <bahamat [at] net.digitalelf>
+   - Made multiple times given --ip options work
+
+  Vagrant Cascadian <vagrant [at] org.debian>
+   - Less redundant SSH key generation
+
   Edd Dumbill <edd [at] com.usefulinc>
    - Contributed APT sources.list file for Ubuntu's Dapper release.
 
@@ -33,12 +43,18 @@ Contributions
   Stefan Fritsch  <sf [at] de.sfritsch>
    - Contributed the policy-rc.d fixups for common.sh
 
+  Raphaël Halimi <raphael.halimi [at] com.gmail>
+    - Contribute bashism fix
+
   Sven Hertge <sven [at] de.svenhartge>
    - Bugfix for Debian/Gentoo package installation.
 
   Joey Hess <joeyh [at] org.debian>
    - Provided sample code for module copying and several useful bug reports
 
+  John Hughes <john [at] com.fallenbit>
+   - Physical devices reordering for pygrub
+
   Kirk Ismay <captain [at] com.netidea>
    - Added hook for automatic CFEngine installation.
 
@@ -62,6 +78,9 @@ Contributions
   Nathan O'Sullivan <nathan [at] au.com.mammoth>
    - New features wrt. options and helper functions
 
+  Guillaume Pernot <gpernot [at] org.praksys>
+    - Fixed Sarge amd64 special case
+
   Walter Reiner <walter [at] at.wreiner>
    - Provided --image-dev + --swap-dev patch.
 
@@ -74,6 +93,10 @@ Contributions
   Felipe Scarel <fbscarel [at] com.gmail>
    - Bugfix for --no-swap + LVM
 
+  Johan Schurer <johannes.schurer [at] com.alcatel-lucent>
+   - CentOS 6 support
+   - CentOS 5 fixes
+
   Radu Spineanu <radu [at] org.debian>
    - Supplied many small tweaks, bugfixes, and suggestions.
    - Radu is also one of the former Debian package maintainers.
@@ -87,6 +110,11 @@ Contributions
   Gergely Tamas <dice [at] hu.kfki.mfa>
    - Added patch to make initrd setup optional.
 
+  Alex Tomlins <alex.tomlins [at] com.unboxedconsulting>
+   - apt_proxy support
+
   Ward Vandewege <ward [at] be.pong>
    - Made several updates for Ubuntu support.
 
+  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,13 +0,0 @@
-KNOWN BUGS in xen-tools
-
-Bugs to fix before a 4.2 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

KNOWN_BUGS.markdown

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

LICENSE

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

Makefile

@@ -14,17 +14,16 @@
 #
 TMP        ?= /tmp
 DIST_PREFIX = ${TMP}
-VERSION     = 4.2
+VERSION     = 4.4~dev
 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:
@@ -70,6 +69,7 @@ clean:
 	@if [ -d debian/xen-tools ]; then rm -rf ./debian/xen-tools; 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
 
 
 #
@@ -95,7 +95,7 @@ fixup-perms:
 	chmod 644 etc/xen-tools.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/
@@ -110,8 +110,10 @@ install-etc:
 	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}/etc/bash_completion.d/
+	cp misc/xen-tools.bash-completion ${prefix}/etc/bash_completion.d/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,50 +147,62 @@ 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/fedora-core-6.d/
-	cp -R hooks/centos-4/*-* ${prefix}/usr/lib/xen-tools/centos-4.d
-	cp -R hooks/centos-5/*-* ${prefix}/usr/lib/xen-tools/centos-5.d
-	cp -R hooks/fedora-core-6/*-* ${prefix}/usr/lib/xen-tools/fedora-core-6.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-4.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-5.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-7.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-8.d
-	-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
-	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
-	cp hooks/common.sh ${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 sid.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
+	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
+	cp hooks/common.sh ${prefix}/usr/share/xen-tools
+	cp -r hooks/common ${prefix}/usr/share/xen-tools
 
 
 #
@@ -230,20 +244,19 @@ release: tidy fixup-perms update-version update-modules clean changelog
 	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)/.git*
 	cd $(DIST_PREFIX) && tar -cvf $(DIST_PREFIX)/$(BASE)-$(VERSION).tar $(BASE)-$(VERSION)/
 	gzip $(DIST_PREFIX)/$(BASE)-$(VERSION).tar
-	mv $(DIST_PREFIX)/$(BASE)-$(VERSION).tar.gz .
+	mv $(DIST_PREFIX)/$(BASE)-$(VERSION).tar.gz ..
 	rm -rf $(DIST_PREFIX)/$(BASE)-$(VERSION)
-	gpg --armour --detach-sign $(BASE)-$(VERSION).tar.gz
+	gpg --armour --detach-sign ../$(BASE)-$(VERSION).tar.gz
 
 #
 #  Make a new orig.tar.gz for the Debian package
 #
 orig-tar-gz: release
-	mv $(BASE)-$(VERSION).tar.gz ../$(BASE)_$(DEBVERSION).orig.tar.gz
-	mv $(BASE)-$(VERSION).tar.gz.asc ../$(BASE)_$(DEBVERSION).orig.tar.gz.asc
+	cp -p ../$(BASE)-$(VERSION).tar.gz ../$(BASE)_$(DEBVERSION).orig.tar.gz
+	cp -p ../$(BASE)-$(VERSION).tar.gz.asc ../$(BASE)_$(DEBVERSION).orig.tar.gz.asc
 
 
 #
@@ -290,7 +303,9 @@ uninstall:
 	-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.markdown

@@ -0,0 +1,75 @@
+xen-tools 4.3.1 (released 30-Jun-2012)
+======================================
+
+Bugfix Release only
+
+
+xen-tools 4.3 (released 26-Jun-2012)
+====================================
+
+Bug Fixes
+---------
+
+* Fix several testuite failures depending on the build host's
+  installation.
+
+Other Changes
+-------------
+
+* Remove most Mercurial traces
+
+
+xen-tools 4.3rc1 (released 08 Jun 2012)
+=======================================
+
+New Features and Major Changes
+------------------------------
+
+* Massive code deduplication in hooks directory
+
+New Options
+-----------
+
+    --dontformat (xen-create-image)
+    --finalrole  (xen-create-image)
+    --apt_proxy  (xen-create-image)
+
+Newly Supported Distribution Releases
+-------------------------------------
+
+* Ubuntu 11.10 Oneiric
+* Ubuntu 12.04 Precise
+* Ubuntu 12.10 Quantal
+* CentOS 6
+
+
+xen-tools 4.2.1 (released 17 Mar 2011)
+======================================
+
+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,165 +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.
-
-  However, currently only Debian and Ubuntu releases are tested and
- known to work, i.e.:
-
-	Debian:
-	  * Sarge 3.1 (i386 only)
-	  * Etch 4.0
-	  * Lenny 5.0
-	  * Squeeze 6.0
-	  * Wheezy 7.0 (preliminary support as it's not yet available)
-	  * Sid (works at least at the moment of writing :-)
-
-	Ubuntu:
-	  * 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 (works at least at the moment of writing :-)
-	  * Natty Narwhal 11.04 (preliminary support as it's not yet available)
-
-  [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,179 @@
+xen-tools
+=========
+
+* [Homepage](http://www.xen-tools.org/software/xen-tools)
+* Git Repository:
+  * [at Gitorious](http://gitorious.org/xen-tools)
+  * [at GitHub](http://github.com/xtaran/xen-tools)
+* [Mailing Lists](http://www.xen-tools.org/software/xen-tools/lists.html)
+
+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
+* Squeeze 6.0
+* Wheezy 7.0
+* Jessie 8.0 (preliminary support as it's not yet available)
+* Sid (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 (preliminary support as it's not yet available)
+
+[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."
+
+### 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
+  * The Perl module [Text::Template](http://search.cpan.org/dist/Text-Template/)
+	([Debian Package libtext-template-perl](http://packages.debian.org/libtext-template-perl))
+  * The Perl module [Config::IniFiles](http://search.cpan.org/dist/Config-IniFiles/)
+	([Debian Package libconfig-inifiles-perl](http://packages.debian.org/libconfig-inifiles-perl))
+* 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 instal`.
+
+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

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,151 +0,0 @@
-TODO
-====
-
-See KNOWN_BUGS for real bugs.
-
-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.
-
-* 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
-
-   Currently we have one directory for Ubuntu and Fedora named after
-   the first supported release which is then duplicated for each
-   subsequent release.
-
-   I'm sure this won't scale forever. So to minimise code duplication
-   I'd like to have one common directory per distribution (e.g. called
-   ubuntu-common, fedora-common, debian-common, maybe even deb-common,
-   rpm-common or yum-common for dpkg/apt-, rpm/yum-based
-   distributions, etc.) with generic hooks valid for all or most of
-   the releases of one distribution and then one hook directory per
-   release (e.g. called ubuntu-10.04 or ubuntu-lucid or so) which has
-   symbolic links to everything which can be used unchanged from the
-   common directory and new files for everything which has to be
-   different or only there.
-
-* 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 code duplication
-
-   Like e.g. readConfigurationFile in xen-create-image and
-   xen-resize-image which are not completely identical.
-
-* 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
-
-* Use Perl::Critic
-
-Stuff from Steve's TODO list / Generic TODOs
---------------------------------------------
-
-* Write more test cases.
-
-* xen-delete-image should unallocate any used IP addresses.

TODO.markdown

@@ -0,0 +1,247 @@
+TODO
+====
+
+See KNOWN_BUGS.markdown for real bugs.
+
+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` 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
+
+* 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.
+
+* 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.
+
+* Replace findBinary() with File::Which
+
+* 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.
+
+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.
+
+* Maybe replace findBinary with File::Which
+
+* 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

bin/xen-create-nfs

@@ -112,7 +112,7 @@ use Env;
 use Getopt::Long;
 use Pod::Usage;
 use Text::Template;
-
+use Xen::Tools::Common;
 
 
 #
@@ -131,7 +131,7 @@ $CONFIG{ 'template' } = '/etc/xen-tools/xm-nfs.tmpl';
 #
 # Release number.
 #
-my $RELEASE = '4.2';
+my $RELEASE = '4.4~dev';
 
 
 # store version number away.
@@ -141,7 +141,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 +170,7 @@ if ( -e "/etc/xen/$CONFIG{'hostname'}.cfg" )
 #
 if ( $CONFIG{ 'admins' } )
 {
-    setupAdminUsers();
+    setupAdminUsers(\%CONFIG);
 }
 
 #
@@ -186,88 +186,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 +242,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;
     }
 }
@@ -380,87 +292,35 @@ sub testArguments
     die "Missing NFS root."   unless ( $CONFIG{ 'nfs_root' } );
 
 
+    # Shorthack to fix http://bugs.debian.org/648814 -- xen-create-nfs
+    # should better use xt-create-xen-config instead. Guess from where
+    # this code is borrowed for now...
+
+    if ( exists($CONFIG{ 'memory' }) and
+         defined($CONFIG{ 'memory' }) ) {
+
+        #
+        #  The memory size:  Convert Gb -> Mb.
+        #
+        if ( $CONFIG{ 'memory' } =~ /^(\d+)Gb.*$/i )
+        {
+            $CONFIG{ 'memory' } = $1 * 1024;
+        }
+
+        #
+        #  Remove any trailing Mb.
+        #
+        if ( $CONFIG{ 'memory' } =~ /^(\d+)Mb.*$/i )
+        {
+            $CONFIG{ 'memory' } = $1;
+        }
+
+    }
     # All OK.
 }
 
 
 
-=begin doc
-
-  This routine is designed to ensure that any users specified with
- the --admins flag are setup as administrators of the new instance.
-
-=end doc
-
-=cut
-
-sub setupAdminUsers
-{
-
-    #
-    #  If we're not root we can't modify users.
-    #
-    return if ( $EFFECTIVE_USER_ID != 0 );
-
-    #
-    #  If we don't have a sudoers file then we'll also ignore this.
-    #
-    return if ( !-e "/etc/sudoers" );
-
-    #
-    #  Find the path to the xen-login-shell
-    #
-    my $shell = undef;
-    $shell = "/usr/bin/xen-login-shell" if ( -x "/usr/bin/xen-login-shell" );
-    $shell = "/usr/local/bin/xen-login-shell"
-      if ( -x "/usr/bin/local/xen-login-shell" );
-
-    return if ( !defined($shell) );
-
-
-    #
-    #  For each user make sure they exist, and setup the
-    # login shell for them.
-    #
-    foreach my $user ( split( /,/, $ENV{ 'admins' } ) )
-    {
-
-        # Strip leading and trailing whitespace.
-        $user =~ s/^\s+//;
-        $user =~ s/\s+$//;
-
-        # Ignore root
-        next if ( $user =~ /^root$/i );
-
-        # Does the user exist?
-        if ( getpwnam($user) )
-        {
-
-            # Change shell.
-            $CONFIG{ 'verbose' } && print "Changing shell for $user: $shell\n";
-            system( "chsh", "-s", $shell, $user );
-        }
-        else
-        {
-
-            # Add a new user.
-            $CONFIG{ 'verbose' } && print "Adding new user: $user\n";
-            system( "useradd", "-s", $shell, $user );
-        }
-
-        #
-        #  Add the entry to /etc/sudoers.
-        #
-        open( SUDOERS, ">>", "/etc/sudoers" ) or
-          warn "Failed to add user to sudoers file : $user - $!";
-        print SUDOERS
-          "$user ALL = NOPASSWD: /usr/sbin/xm, /usr/bin/xen-create-image\n";
-        close(SUDOERS);
-
-    }
-}
-
-
 =begin doc
 
   Create the Xen configuration file for our new Xen guest.

bin/xen-delete-image

@@ -8,6 +8,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,7 +27,8 @@ 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.
+   --test      Don't complain if we're not invoked by root.
+   --no-xen-ok Don't complain if xen seems not installed or xend is not running
 
 =cut
 
@@ -141,7 +146,7 @@ Show the version number and exit.
 
 =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;
@@ -158,6 +163,7 @@ use English;
 use Getopt::Long;
 use Pod::Usage;
 use File::Path;
+use Xen::Tools::Common;
 
 
 #
@@ -171,16 +177,26 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.2';
+my $RELEASE = '4.4~dev';
 
 
+#
+# 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 +232,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;
+    if ( $CONFIG{ 'no_xen_ok' } or !xenRunning($name, \%PER_HOST_CONFIG) )
     {
         deleteXenImage($name);
     }
@@ -253,81 +263,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 +285,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",   \$CONFIG{ 'no_xen_ok' },
                 "help",        \$HELP,
                 "manual",      \$MANUAL,
                 "version",     \$VERSION
@@ -364,14 +301,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;
 
     }
@@ -424,33 +354,6 @@ sub checkArguments
 
 
 
-=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 +375,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 +408,8 @@ sub deleteXenImage
         }
     }
 
-
+    my %PER_HOST_CONFIG = %CONFIG;
+    $PER_HOST_CONFIG{ 'hostname' } = $hostname;
     if ( defined( $CONFIG{ 'dir' } ) )
     {
         my $prefix = $CONFIG{ 'dir' } . "/domains/";
@@ -539,7 +443,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 +453,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 +475,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 +487,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 +501,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

@@ -8,6 +8,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.
@@ -67,7 +71,7 @@ Show the version number and exit.
 
 =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 +87,7 @@ use English;
 use File::Temp qw/ tempdir /;
 use Getopt::Long;
 use Pod::Usage;
+use Xen::Tools::Common;
 
 
 #
@@ -94,21 +99,22 @@ use Pod::Usage;
 my %CONFIG;
 
 #
-#  Default prefix
+#  Default values
 #
 $CONFIG{ 'prefix' } = "/etc/xen";
+$CONFIG{ 'extension' } = '.cfg';
 
 #
 # Release number.
 #
-my $RELEASE = '4.2';
+my $RELEASE = '4.4~dev';
 
 
 
 #
 #  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 +150,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 +167,7 @@ sub parseCommandLineArguments
     #  Parse options.
     #
     GetOptions( "test=s", \$CONFIG{ 'prefix' },
+                "extension:s", \$CONFIG{ 'extension' },
                 "help", \$HELP,
                 "manual", \$MANUAL,
                 "version", \$VERSION );
@@ -248,13 +178,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 +198,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);
@@ -341,6 +268,7 @@ sub displayInstance
     print "Memory: $mem\n";
     print "IP: " . $ip . $mac . "\n" if length($ip);
     print "DHCP" . $mac . "\n" if $dhcp;
+    print "Config: $file\n";
 }
 
 

bin/xen-resize-guest

@@ -104,6 +104,7 @@ use Env;
 use Getopt::Long;
 use Pod::Usage;
 use Text::Template;
+use Xen::Tools::Common;
 
 
 
@@ -116,14 +117,19 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.2';
+my $RELEASE = '4.4~dev';
 
 
+#
+# 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 +295,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 +410,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 +451,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

@@ -107,6 +107,7 @@ use File::Temp qw/ tempdir /;
 use File::Copy qw/ mv cp /;
 use Getopt::Long;
 use Pod::Usage;
+use Xen::Tools::Common;
 
 
 #
@@ -120,7 +121,13 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.2';
+my $RELEASE = '4.4~dev';
+
+
+#
+# Find xen toolstack command
+#
+$CONFIG{ 'xm' } = findXenToolstack();
 
 
 #
@@ -128,7 +135,7 @@ my $RELEASE = '4.2';
 #
 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 +175,7 @@ E_O_ROOT
 #
 while ( my $name = shift )
 {
-    if ( !xenRunning($name) )
+    if ( !xenRunning($name, \%CONFIG) )
     {
         updateXenImage($name);
     }
@@ -331,110 +338,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 +366,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

@@ -114,7 +114,7 @@ xt-create-config - Create a Xen configuration file for a new guest
 
 =head1 LICENSE
 
-Copyright (c) 2005-2009 by Steve Kemp, (c) 2010 by The Xen-Tools
+Copyright (c) 2005-2009 by Steve Kemp, (c) 2010-2012 by The Xen-Tools
 Development Team. All rights reserved.
 
 This module is free software;
@@ -156,7 +156,7 @@ $CONFIG{ 'extension' } = '.cfg';
 #
 # Release number.
 #
-my $RELEASE = '4.2';
+my $RELEASE = '4.4~dev';
 
 
 
@@ -177,7 +177,7 @@ checkArguments();
 #
 if ( $ENV{ 'admins' } )
 {
-    setupAdminUsers();
+    setupAdminUsers(\%CONFIG);
 }
 
 
@@ -215,7 +215,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 +229,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 +369,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,7 +377,7 @@ sub createXenConfig
     #
     #  Remove any trailing Mb.
     #
-    if ( $ENV{ 'memory' } =~ /^(\d+)Mb*$/i )
+    if ( $ENV{ 'memory' } =~ /^(\d+)Mb?.*$/i )
     {
         $ENV{ 'memory' } = $1;
     }
@@ -404,13 +398,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 +464,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

@@ -54,7 +54,7 @@ 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
@@ -98,7 +98,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.2';
+my $RELEASE = '4.4~dev';
 
 
 
@@ -159,13 +159,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 +215,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 +257,7 @@ sub runDistributionHooks
     #
     #  Hook directory.
     #
-    my $hooks = "/usr/lib/xen-tools/" . $CONFIG{ 'dist' } . ".d/";
+    my $hooks = "/usr/share/xen-tools/" . $CONFIG{ 'dist' } . ".d/";
 
     #
     #  Installation prefix

bin/xt-guess-suite-and-mirror

@@ -39,7 +39,7 @@ xen-create-image(1) or the backticks feature in xen-tools.conf.
 
 =head1 LICENSE
 
-Copyright (C) 2010 by The Xen-Tools Development Team. All rights
+Copyright (C) 2010-2012 by The Xen-Tools Development Team. All rights
 reserved.
 
 This module is free software; you can redistribute it and/or modify it
@@ -55,9 +55,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 (http.debian.net
+# redirects to a working mirror nearby)
+my %fallback_mirror = ( Debian => 'http://http.debian.net/debian/',
                         Ubuntu => 'http://archive.ubuntu.com/ubuntu/' );
 
 # Which suite to use if everything else fails. For Debian "stable"
@@ -68,7 +68,8 @@ my %fallback_suite = ( Debian => 'stable',
                        Ubuntu => 'lucid' );
 
 # Where to look for the sources.list to parse
-my $sources_list_file = '/etc/apt/sources.list';
+my @sources_list_files = ( '/etc/apt/sources.list',
+                           glob('/etc/apt/sources.list.d/*.list'));
 
 use File::Slurp;
 use Getopt::Long;
@@ -80,7 +81,7 @@ use strict;
 #
 # Release number.
 #
-my $RELEASE = '4.2';
+my $RELEASE = '4.4~dev';
 
 # Init
 my $mirror = '';
@@ -108,47 +109,49 @@ if ($want_manual) {
     pod2usage( -verbose => 2 );
 }
 
-if (-r $sources_list_file) {
-    # sources.list exists, so it's something debianoid.
+all_sources_list_files: foreach my $sources_list_file (@sources_list_files) {
+    if (-r $sources_list_file) {
+        # sources.list file exists, so it's something debianoid.
 
-    # read sources.list and split it into lines
-    my @sources_list = read_file($sources_list_file);
+        # read sources.list and split it into lines
+        my @sources_list = read_file($sources_list_file);
 
-    # Find the first line which is a Debian or Ubuntu mirror but not
-    # an updates, backports, volatile or security mirror.
-    foreach my $sources_list_entry (@sources_list) {
-        # Normalize line
-        chomp($sources_list_entry);
-        $sources_list_entry =~ s/^\s*(.*?)\s*$/$1/;
+        # Find the first line which is a Debian or Ubuntu mirror but not
+        # an updates, backports, volatile or security mirror.
+        foreach my $sources_list_entry (@sources_list) {
+            # Normalize line
+            chomp($sources_list_entry);
+            $sources_list_entry =~ s/^\s*(.*?)\s*$/$1/;
 
-        # Skip definite non-entries
-        next if $sources_list_entry =~ /^\s*($|#)/;
+            # Skip definite non-entries
+            next if $sources_list_entry =~ /^\s*($|#)/;
 
-        # Split up into fields
-        my @source_components = split(/\s+/, $sources_list_entry);
+            # Split up into fields
+            my @source_components = split(/\s+/, $sources_list_entry);
 
-        # Minimum number of components is 4
-        next if $#source_components < 3;
+            # Minimum number of components is 4
+            next if $#source_components < 3;
 
-        # Don't use deb-src entries.
-        next if $source_components[0] eq 'deb-src';
+            # Don't use deb-src entries.
+            next if $source_components[0] eq 'deb-src';
 
-        # Skip updates, backports, volatile or security mirror.
-        next if $source_components[2] !~ /^[a-z]+$/;
+            # Skip updates, backports, volatile or security mirror.
+            next if $source_components[2] !~ /^[a-z]+$/;
 
-        if ($source_components[1] =~ m(/debian/?$|/ubuntu/?$)) {
-            # Seems a typical mirror. Let's use that one
+            if ($source_components[1] =~ m(/debian/?$|/ubuntu/?$)) {
+                # Seems a typical mirror. Let's use that one
 
-            $mirror = $source_components[1];
-            $suite = $source_components[2];
+                $mirror = $source_components[1];
+                $suite = $source_components[2];
 
-            $found = 1;
-            last;
+                $found = 1;
+                last all_sources_list_files;
+            }
         }
     }
-
-    warn "Couldn't parse $sources_list_file of the Dom0.\n" unless $found;
 }
+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);

bin/xt-install-image

@@ -27,6 +27,7 @@ xt-install-image - Install a fresh copy of GNU/Linux into a directory
    --config         Read the specified config file in addition to the global
                     configuration file.
    --mirror         The mirror to use when installing with 'debootstrap'.
+   --apt_proxy      The proxy to use when installing with 'debootstrap'.
 
   Installation Options:
    --install-method  Specify the installation method to use.
@@ -107,6 +108,7 @@ use Env;
 use File::Copy;
 use Getopt::Long;
 use Pod::Usage;
+use Xen::Tools::Common;
 
 
 #
@@ -117,7 +119,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.2';
+my $RELEASE = '4.4~dev';
 
 
 #
@@ -131,13 +133,19 @@ my $RELEASE = '4.2';
 #  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",
@@ -155,7 +163,7 @@ my %dispatch = (
 #
 #  Read the global configuration file.
 #
-readConfigurationFile("/etc/xen-tools/xen-tools.conf");
+readConfigurationFile("/etc/xen-tools/xen-tools.conf", \%CONFIG);
 
 
 #
@@ -178,7 +186,7 @@ if ( $CONFIG{ 'config' } )
     }
 
     # Read the file, if it exists.
-    readConfigurationFile($path) if ( -e $path );
+    readConfigurationFile($path, \%CONFIG) if ( -e $path );
 }
 
 
@@ -208,13 +216,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?
@@ -279,87 +309,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.
@@ -395,6 +344,7 @@ sub parseCommandLineArguments
         "cachedir=s", \$CONFIG{ 'cachedir' },
         "config=s", \$CONFIG{ 'config' },
         "mirror=s", \$CONFIG{ 'mirror' },
+        "apt_proxy=s", \$CONFIG{ 'apt_proxy' },
 
         # Help.
         "verbose", \$CONFIG{ 'verbose' },
@@ -409,13 +359,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;
     }
 }
@@ -471,7 +415,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 )
     {
@@ -551,53 +495,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
@@ -683,7 +580,7 @@ sub do_copy
     #
     #  Run the copy command.
     #
-    runCommand($cmd);
+    runCommand($cmd, \%CONFIG);
 }
 
 
@@ -703,21 +600,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
@@ -734,7 +619,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");
@@ -757,6 +642,14 @@ sub do_debootstrap
         $EXTRA .= " --arch $CONFIG{'arch'}";
     }
 
+    #
+    #  Setup http_proxy so that debootstrap pulls files through the apt-proxy
+    #
+    if ( $CONFIG{ 'apt_proxy' } )
+    {
+        print("Using apt_proxy: $CONFIG{'apt_proxy'}\n");
+        $ENV{'http_proxy'} = $CONFIG{'apt_proxy'};
+    }
 
     #
     #  This is the command we'll run
@@ -767,7 +660,7 @@ sub do_debootstrap
     #
     #  Run the command.
     #
-    runCommand($command);
+    runCommand($command, \%CONFIG);
 
 
     #
@@ -811,7 +704,24 @@ sub do_rinse
     {
         $command .= " --arch $CONFIG{'arch'}";
     }
+    else
+    {
+        my $uname_machine = `uname -m`;
+        chomp($uname_machine);
 
+        if ($uname_machine eq 'x86_64')
+        {
+            $command .= " --arch amd64";
+        }
+        elsif ($uname_machine =~ /^i[3-6]86$/) {
+            $command .= " --arch i386";
+        }
+        else
+        {
+            die "Local architecture ($uname_machine) not supported by rinse.\n".
+                "Please choose a supported installation architecture (i386 or amd64) explicitly."
+        }
+    }
 
     #
     #  Propogate the verbosity setting.
@@ -821,7 +731,7 @@ sub do_rinse
         $command .= " --verbose";
     }
 
-    runCommand($command);
+    runCommand($command, \%CONFIG);
 }
 
 
@@ -864,7 +774,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);
 }
 
 
@@ -898,5 +808,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~dev-1) UNRELEASED; 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, 05 Apr 2013 20:19:02 +0200
+
 xen-tools (4.2~rc1-1) unstable; urgency=low
 
   By default, xen-create-image now generates a random root password and

debian/changelog

@@ -1,3 +1,164 @@
+xen-tools (4.4~dev-1) UNRELEASED; urgency=low
+
+  * New upstream 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
+    - Preliminary support for Debian Jessie and Ubuntu Raring
+    - 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, 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. 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.
+  * 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 copyright years in debian/copyright.
+  * Apply wrap-and-sort.
+
+ -- Axel Beckert <abe@debian.org>  Thu, 17 Jan 2013 17:09:02 +0100
+
+xen-tools (4.3.1-1) unstable; urgency=low
+
+  * Remove t/modules.t in upstream's t/Makefile instead of debian/rules'
+    clean target.
+  * Run t/hook-tls.t only if distribution actually has
+    10-disable-tls. Fixes test suite failure on 32 bit architectures.
+
+ -- Axel Beckert <abe@debian.org>  Sat, 30 Jun 2012 16:44:50 +0200
+
+xen-tools (4.3-1) unstable; urgency=low
+
+  * New upstream release
+    - Remove most Mercurial traces
+  * Fixes FTBFS due to testsuite failures (Closes: #676681)
+    - Disable tests of not yet used Xen::Tools. Fixes FTBFS in test suite
+      due to not satisifed Moose dependency in Xen::Tools::Log.
+    - Added build-dependencies on libmoose-perl, git, and
+      libtest-pod-coverage-perl for t/perl-syntax.t, t/gitignore.t, and
+      t/pod-coverage.t.
+    - Skip t/hook-inittab.t if /etc/inittab is not present on the build
+      host. Fixes FTBFS on Ubuntu.
+  * Switch to source format to "3.0 (quilt)"
+  * Don't remove stamp files manually, dh_clean does that already
+  * Remove generated file t/modules.t in clean target to be able to build
+    twice in a row.
+
+ -- Axel Beckert <abe@debian.org>  Tue, 26 Jun 2012 22:23:59 +0200
+
+xen-tools (4.3~rc1-1) unstable; urgency=low
+
+  * New upstream release candidate
+    - Correctly checks and documents valid values for
+      disk_device. (Closes: #621499)
+    - Supports creating Ubuntu 11.10 Oneiric DomUs (LP: #848654)
+    - Supports creating Ubuntu 12.04 Precise and 12.10 Quantal DomUs
+    - Supports creating CentOS 6 DomUs (Closes: #578399; Thanks Johan
+      Schurer)
+      + Recommend rinse >= 1.9.1-1
+    - Supports rinse 2.0
+    - Updated mirror list for discontinued releases of Debian and Ubuntu
+    - Workaround for missing unit parsing in xen-create-nfs (Closes:
+      #648814)
+    - Fix wildcard vs regexp in memory configuration parsing.
+    - Fix misbehaviour if --ip option is passed multiple times (Closes:
+      #652110; Thanks Brian Bennett and Alexander Mette!)
+    - Supports /etc/apt/sources.list.d/ (Closes: #650300)
+    - xt-guess-suite-and-mirror exits with non-zero if no proper mirror
+      could be extracted from /etc/apt/sources.list or
+      /etc/apt/sources.list.d/*.list (Thanks Phil Frost!)
+    - Only attempts to generate the ssh host keys if not already present
+      (Closes: #607236; Thanks Vagrant Cascadian!)
+    - New option --apt_proxy (Closes: #610457; Thanks Alex Tomlins!)
+    - Always write down root partition as first physical device, otherwise
+      pygrub fails (Closes: #609673)
+    - No more expect at least one option to mkfs.* calls. Fixes btrfs
+      creation.  (Closes: #609982)
+    - Fixes call to non-existent function logPrint (Closes: #673335)
+    - Also disable initctl in the chroot, not only start-stop-daemon
+      (LP: #997063; Thanks xstasi!)
+    - Massive code deduplication in hooks directory
+    - Use release blacklist for libc6-xen instead of whitelist in
+      hooks/debian.d/20-setup-apt
+    - Enforces umask 022 in 50-setup-hostname* (Hopefully closes: #619630)
+  * Add dependency on openssh-client for ssh-keygen (Closes: #649108)
+  * Use dh_auto_test for build time tests and add according
+    build-dependencies on devscripts and libfile-slurp-perl.
+  * No more suggest evms-cli -- it's no more available on any supported
+    Dom0 distribution. Thanks to Markus Waldeck for the hint.
+  * Add NEWS to debian/docs.
+  * Bump Standards-Version to 3.9.3 (no changes)
+  * Fix the following Lintian warnings:
+    - copyright-refers-to-symlink-license
+    - debian-rules-missing-recommended-target
+  * debian/copyright: Update copyright years
+  * Move xen-utils (for pygrub) from Suggests to Recommends as pygrub
+    becomes the necessary way to boot more and more often.
+  * Remove xen-shell from Recommends, nobody picked it up. (Closes:
+    #603708)
+
+ -- Axel Beckert <abe@debian.org>  Fri, 08 Jun 2012 14:18:38 +0200
+
+xen-tools (4.2.1-1) unstable; urgency=low
+
+  * New upstream release
+    - Fixes bashism in "editor" roles script. Thanks Raphaël Halimi for
+      the patch! (Closes: #605203)
+    - Fixes missing architecture check in Sarge amd64 special case. Thanks
+      to Guillaume Pernot! (Closes: #611397) Also changes default Sarge
+      amd64 mirror to http://archive.debian.org/debian-amd64/.
+    - Allows --ip=auto again (Closes: #611407)
+    - Unmounts /proc and /dev/pts of the freshly installed DomU just
+      before unmounting the disk image. (Closes: #588783)
+
+ -- Axel Beckert <abe@debian.org>  Thu, 17 Mar 2011 01:00:47 +0100
+
 xen-tools (4.2-1) unstable; urgency=low
 
   * New upstream release

debian/control

@@ -2,17 +2,39 @@ 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
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 7.0.0),
+               devscripts,
+               git,
+               libfile-slurp-perl,
+               libfile-which-perl,
+               libmoose-perl,
+               libtest-notabs-perl,
+               libtest-pod-coverage-perl,
+               libtest-pod-perl,
+               libtext-template-perl
+Standards-Version: 3.9.3
 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
 
 Package: xen-tools
 Architecture: all
-Depends: debootstrap | cdebootstrap, perl-modules, libtext-template-perl, libconfig-inifiles-perl, libfile-slurp-perl, ${misc:Depends}
-Recommends: xen-hypervisor-amd64 | xen-hypervisor-i386 | xen-hypervisor-i386-pae, rinse, xen-shell, libexpect-perl
-Suggests: reiserfsprogs, xfsprogs, xen-utils, cfengine2, evms-cli, btrfs-tools
+Depends: debootstrap | cdebootstrap,
+         libconfig-inifiles-perl,
+         libfile-slurp-perl,
+         libfile-which-perl,
+         libtext-template-perl,
+         openssh-client,
+         perl-modules,
+         ${misc:Depends}
+Recommends: libexpect-perl,
+            rinse (>= 1.9.1-1),
+            xen-hypervisor-amd64 | xen-hypervisor-i386 | xen-hypervisor-i386-pae,
+            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,6 +47,7 @@ Description: Tools to manage Xen virtual servers
    * Debian 4.0 Etch
    * Debian 5.0 Lenny
    * Debian 6.0 Squeeze
+   * Debian 7.0 Wheezy
    * Debian Sid (Unstable)
    * Ubuntu 6.06 Dapper Drake (LTS)
    * Ubuntu 6.10 Edgy Eft
@@ -36,3 +59,8 @@ Description: Tools to manage Xen virtual servers
    * Ubuntu 9.10 Karmic Koala
    * Ubuntu 10.04 Lucid Lynx (LTS)
    * Ubuntu 10.10 Maverick Meerkat
+   * Ubuntu 11.04 Natty Narwhal
+   * Ubuntu 11.10 Oneiric Ocelot
+   * Ubuntu 12.04 Precise Pangolin (LTS)
+   * CentOS 5
+   * CentOS 6

debian/copyright

@@ -4,10 +4,10 @@ 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: The Xen-Tools Development Team, currently consisting of:
-		Axel Beckert <abe@deuxchevaux.org>,
-		Dmitry Nedospasov <dmitry@nedos.net>, and
-		Stéphane Jourdois <sjourdois@gmail.com>
+Copyright 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>
 
 License:
 
@@ -23,5 +23,5 @@ Perl is distributed under licenses:
     b) the "Artistic License" which comes with Perl.
 
     On Debian GNU/Linux systems, the complete text of the GNU General
-    Public License can be found in /usr/share/common-licenses/GPL' and
+    Public License can be found in /usr/share/common-licenses/GPL-1' and
     the Artistic Licence in /usr/share/common-licenses/Artistic'.

debian/dirs

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

debian/docs

@@ -1,6 +1,7 @@
 AUTHORS
-README
-SUPPORT
-BUGS
-TODO
-KNOWN_BUGS
+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/rules

@@ -2,54 +2,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+%:
+	dh $@
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	touch configure-stamp
-
-
-build: build-stamp
-
-build-stamp: configure-stamp 
-	dh_testdir
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	make clean
-	rm -f build-stamp configure-stamp
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-
-	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/triggers

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

etc/xen-tools.conf

@@ -125,13 +125,14 @@ 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
+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 +236,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.
 #
@@ -263,25 +271,36 @@ mirror = `xt-guess-suite-and-mirror --mirror`
 #
 # mirror_sarge = http://archive.debian.org/debian
 # mirror_etch = http://archive.debian.org/debian
-# mirror_lenny = http://cdn.debian.net/debian
+# mirror_lenny = http://archive.debian.org/debian
 # mirror_squeeze = http://cdn.debian.net/debian
 # mirror_wheezy = http://cdn.debian.net/debian
+# mirror_jessie = http://cdn.debian.net/debian
 # mirror_sid = http://cdn.debian.net/debian
-# mirror_dapper = http://archive.ubuntu.com/ubuntu
+# 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_karmic = http://archive.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://archive.ubuntu.com/ubuntu
-# mirror_natty = http://archive.ubuntu.com/ubuntu
+# mirror_maverick = http://old-releases.ubuntu.com/ubuntu
+# mirror_natty = http://old-releases.ubuntu.com/ubuntu
+# mirror_oneiric = http://archive.ubuntu.com/ubuntu
+# mirror_precise = http://archive.ubuntu.com/ubuntu
+# mirror_quantal = http://archive.ubuntu.com/ubuntu
+# mirror_raring = http://archive.ubuntu.com/ubuntu
 
+# If this is defined it will be used by debootstrap, and configured as the
+# proxy for the guest
+#
+# apt_proxy =
 
 #
 #  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
@@ -298,7 +317,7 @@ btrfs_options    = defaults
 #
 #  If you're using the lenny or later version of the Xen guest kernel you will
 # need to make sure that you use 'hvc0' for the guest serial device,
-# and 'xvdX' instead of 'sdX' for serial devices.
+# and 'xvdX' instead of 'sdX' for disk devices.
 #
 #  You may specify the things to use here:
 #

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)) )
@@ -53,7 +54,17 @@ memory      = '{$memory}'
     $OUT .= "disk        = [\n";
     for ( my $i = $#PARTITIONS; $i >= 0 ; $i-- )
     {
-      $OUT .= "                  '$PARTITIONS[$i]{'imagetype'}$PARTITIONS[$i]{'image'},$device" . ( $i + 1 ) .",w',\n";
+       if ( $PARTITIONS[$i]{'mountpoint'} eq '/' )
+       {
+           $OUT .= "                  '$PARTITIONS[$i]{'imagetype'}$PARTITIONS[$i]{'image'},$device" . ( $i + 1 ) .",w',\n";
+       }
+    }
+    for ( my $i = $#PARTITIONS; $i >= 0 ; $i-- )
+    {
+       if ( $PARTITIONS[$i]{'mountpoint'} ne '/' )
+       {
+           $OUT .= "                  '$PARTITIONS[$i]{'imagetype'}$PARTITIONS[$i]{'image'},$device" . ( $i + 1 ) .",w',\n";
+       }
     }
     $OUT .= "              ]\n";
   }
@@ -135,7 +146,7 @@ name        = '{$hostname}'
       $br = ",bridge=$bridge"
     }
 
-    $OUT .= "vif         = [ 'ip=$ip1";
+    $OUT .= "vif         = [ 'ip=$ips";
     $OUT .= "$m";
     $OUT .= "$vn";
     $OUT .= "$br";

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-4/10-disable-tls

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

hooks/centos-4/10-disable-tls

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

hooks/centos-4/15-setup-arch

@@ -1,44 +0,0 @@
-#!/bin/sh
-
-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
-
-
-#
-#  Record arch, if present.
-#
-if [ -d $prefix/etc/rpm ]; then
-
-    logMessage Found /etc/rpm
-
-    #
-    #  If i386 then record this
-    #
-    if [ "$arch" = "i386" ]; then
-        echo "i386-fedora-linux-gnu" >> $prefix/etc/rpm/platform
-    fi
-else
-
-    logMessage Failed to find /etc/rpm
-
-fi
-
-#
-#  Log our finish
-#
-logMessage Script $0 finished
-

hooks/centos-4/15-setup-arch

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

hooks/centos-4/20-setup-yum

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

hooks/centos-4/20-setup-yum

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

hooks/centos-4/30-disable-gettys

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

hooks/centos-4/30-disable-gettys

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

hooks/centos-4/35-setup-users

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

hooks/centos-4/35-setup-users

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

hooks/centos-4/40-setup-networking

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

hooks/centos-4/40-setup-networking

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

hooks/centos-4/50-setup-hostname

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

hooks/centos-4/50-setup-hostname

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

hooks/centos-4/55-create-dev

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

hooks/centos-4/55-create-dev

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

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

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

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

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

hooks/centos-4/70-install-ssh

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

hooks/centos-4/70-install-ssh

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

hooks/centos-4/75-fixup-securetty

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

hooks/centos-4/75-fixup-securetty

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

hooks/centos-4/80-install-modules

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

hooks/centos-4/80-install-modules

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

hooks/centos-4/90-make-fstab

@@ -1,123 +0,0 @@
-#!/bin/sh
-#
-#  This script is responsible for setting up /etc/fstab upon the
-# new instance.
-#
-#  This should be a simple job, but it is complicated by some of the
-# differences between filesystems - some root filesystems will require
-# the installation of new packages, and we have to handle that here.
-#
-# 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
-
-
-logMessage Filesystem options are ${options}
-
-
-#
-# Find the root device.
-#
-#  1.  default to xvda.
-#
-#  2.  If --ide is specified use hda.
-#
-#  3.  If --scsi is specified use sda.
-#
-#  4.  Otherwise use a named $disk_device
-#
-device=xvda
-if [ "${ide}" ]; then
-    device=hda
-elif [ "${scsi}" ]; then
-    device=sda
-else
-    if [ ! -z "${disk_device}" ]; then
-        device=`basename $disk_device`
-    fi
-fi
-
-logMessage "Root device is /dev/$device"
-
-
-#
-#  Now we have the options we can create the fstab.
-#
-has_xfs=0
-has_reiserfs=0
-has_btrfs=0
-cat <<E_O_FSTAB > ${prefix}/etc/fstab
-# /etc/fstab: static file system information.
-#
-# <file system> <mount point>   <type>  <options>       <dump>  <pass>
-proc            /proc           proc    defaults        0       0
-devpts          /dev/pts        devpts  rw,noexec,nosuid,gid=5,mode=620 0  0
-E_O_FSTAB
-for part in `seq 1 ${NUMPARTITIONS}`; do
-    eval "PARTITION=\"\${PARTITION${part}}\""
-    OLDIFS="${IFS}"
-    IFS=:
-    x=0
-    for partdata in ${PARTITION}; do
-        eval "partdata${x}=\"${partdata}\""
-        x=$(( $x+1 ))
-    done
-    IFS="${OLDIFS}"
-
-    case "${partdata2}" in
-        xfs)
-            has_xfs=1
-            ;;
-        reiserfs)
-            has_reiserfs=1
-            ;;
-        btrfs)
-            has_btrfs=1
-            ;;
-    esac
-
-    if [ "${partdata2}" = "swap" ]; then
-        echo "/dev/${device}${part} none swap sw 0 0" >> ${prefix}/etc/fstab
-    else
-        echo "/dev/${device}${part} ${partdata3} ${partdata2} ${partdata4} 0 1" >> ${prefix}/etc/fstab
-    fi
-done
-
-
-#
-#  Finally we can 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/centos-4/90-make-fstab

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

hooks/centos-4/99-clean-image

@@ -1,49 +0,0 @@
-#!/bin/sh
-#
-#  This script cleans the yum database on the new system.
-#
-# Steve
-# --
-# http://www.steve.org.uk/
-
-
-prefix=$1
-
-#
-#  Source our common functions
-#
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
-else
-    . ./hooks/common.sh
-fi
-
-
-#
-# Log our start
-#
-logMessage Script $0 starting
-
-
-#
-# Clean up RPM files.
-#
-logMessage Cleaning .rpm* files.
-find ${prefix}/ -name '*.rpmorig' -exec rm -f \{\} \;
-find ${prefix}/ -name '*.rpmnew' -exec rm -f \{\} \;
-
-#
-#  Clean yum
-#
-logMessage Cleaning Yum Repository
-if [ ! -d ${prefix}/proc ]; then
-    mkdir -p ${prefix}/proc
-fi
-mount -o bind /proc ${prefix}/proc
-chroot ${prefix} /usr/bin/yum clean all
-umount ${prefix}/proc
-
-#
-#  Log our finish
-#
-logMessage Script $0 finished

hooks/centos-4/99-clean-image

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

hooks/centos-5/10-disable-tls

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

hooks/centos-5/10-disable-tls

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

hooks/centos-5/15-setup-arch

@@ -1,44 +0,0 @@
-#!/bin/sh
-
-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
-
-
-#
-#  Record arch, if present.
-#
-if [ -d $prefix/etc/rpm ]; then
-
-    logMessage Found /etc/rpm
-
-    #
-    #  If i386 then record this
-    #
-    if [ "$arch" = "i386" ]; then
-        echo "i386-fedora-linux-gnu" >> $prefix/etc/rpm/platform
-    fi
-else
-
-    logMessage Failed to find /etc/rpm
-
-fi
-
-#
-#  Log our finish
-#
-logMessage Script $0 finished
-

hooks/centos-5/15-setup-arch

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

hooks/centos-5/20-setup-yum

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

hooks/centos-5/20-setup-yum

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

hooks/centos-5/25-setup-kernel

@@ -0,0 +1,76 @@
+#!/bin/sh
+#
+#  This script sets up the kernel and fstab for CentOS 5.
+#
+
+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
+
+# Make the console work
+sed -i "/Cancelled/ {G;s/$/co:2345:respawn:\/sbin\/mingetty console/;}" ${prefix}/etc/inittab
+sed -i "s/^1:2345/#1:2345/" ${prefix}/etc/inittab
+
+# MAKEDEV is needed at this point
+chroot ${prefix} ln -s /sbin/MAKEDEV /dev/MAKEDEV
+chroot ${prefix} /sbin/MAKEDEV sda sdb sdc sdd
+
+# Create fstab
+logMessage Create /etc/fstab
+cat > ${prefix}/etc/fstab << EOF
+# /etc/fstab: static file system information.
+#
+# <file system> <mount point>   <type>  <options>       <dump>  <pass>
+proc            /proc           proc    defaults        0       0
+none            /dev/pts        devpts  mode=0620       0       0
+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
+     echo "none swap ws 0 0" >> ${prefix}/etc/fstab
+  else
+     echo $part | awk -F: '{print $4,$3,$5,0,1}' >> ${prefix}/etc/fstab
+  fi
+done
+
+# Install the kernel, grub and perl
+chroot ${prefix} yum clean expire-cache
+chroot ${prefix} yum -y install kernel-xen grub.x86_64 perl.x86_64
+
+KERNELVERSION=`ls ${prefix}/boot/vmlinuz-* | sed "s#$prefix/boot/vmlinuz-##"`
+logMessage "Kernel $KERNELVERSION found"
+
+# Create grub's menu.list
+logMessage "Creating /boot/grub/menu.lst"
+mkdir -p ${prefix}/boot/grub
+cat > ${prefix}/boot/grub/menu.lst << EOF
+# WARNING : Don't forget to update this when you upgrade kernel !
+# You can also exclude kernel-xen from updates by putting
+# exclude=kernel-xen in in [main] in yum.conf
+
+default=0
+timeout=5
+title CentOS ($KERNELVERSION)
+kernel        /boot/vmlinuz-$KERNELVERSION xen_pv_hvm=enable elevator=noop
+initrd        /boot/initrd-$KERNELVERSION.img
+EOF
+
+#
+#  Log our finish
+#
+logMessage Script $0 finished

hooks/centos-5/30-disable-gettys

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

hooks/centos-5/30-disable-gettys

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

hooks/centos-5/35-setup-users

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

hooks/centos-5/35-setup-users

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

hooks/centos-5/40-setup-networking

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

hooks/centos-5/40-setup-networking

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

hooks/centos-5/50-setup-hostname

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

hooks/centos-5/50-setup-hostname

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

hooks/centos-5/55-create-dev

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

hooks/centos-5/55-create-dev

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

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

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

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

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

hooks/centos-5/70-install-ssh

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

hooks/centos-5/70-install-ssh

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

hooks/centos-5/75-fixup-securetty

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

hooks/centos-5/75-fixup-securetty

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

hooks/centos-5/80-install-modules

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

hooks/centos-5/80-install-modules

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

hooks/centos-5/90-make-fstab

@@ -1,124 +0,0 @@
-#!/bin/sh
-#
-#  This script is responsible for setting up /etc/fstab upon the
-# new instance.
-#
-#  This should be a simple job, but it is complicated by some of the
-# differences between filesystems - some root filesystems will require
-# the installation of new packages, and we have to handle that here.
-#
-# 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
-
-
-logMessage Filesystem options are ${options}
-
-
-
-#
-# Find the root device.
-#
-#  1.  default to xvda.
-#
-#  2.  If --ide is specified use hda.
-#
-#  3.  If --scsi is specified use sda.
-#
-#  4.  Otherwise use a named $disk_device
-#
-device=xvda
-if [ "${ide}" ]; then
-    device=hda
-elif [ "${scsi}" ]; then
-    device=sda
-else
-    if [ ! -z "${disk_device}" ]; then
-        device=`basename $disk_device`
-    fi
-fi
-
-logMessage "Root device is /dev/$device"
-
-
-#
-#  Now we have the options we can create the fstab.
-#
-has_xfs=0
-has_reiserfs=0
-has_btrfs=0
-cat <<E_O_FSTAB > ${prefix}/etc/fstab
-# /etc/fstab: static file system information.
-#
-# <file system> <mount point>   <type>  <options>       <dump>  <pass>
-proc            /proc           proc    defaults        0       0
-none            /dev/pts        devpts  mode=0620       0       0
-E_O_FSTAB
-for part in `seq 1 ${NUMPARTITIONS}`; do
-    eval "PARTITION=\"\${PARTITION${part}}\""
-    OLDIFS="${IFS}"
-    IFS=:
-    x=0
-    for partdata in ${PARTITION}; do
-        eval "partdata${x}=\"${partdata}\""
-        x=$(( $x+1 ))
-    done
-    IFS="${OLDIFS}"
-    
-    case "${partdata2}" in
-        xfs)
-            has_xfs=1
-            ;;
-        reiserfs)
-            has_reiserfs=1
-            ;;
-        btrfs)
-            has_btrfs=1
-            ;;
-    esac
-    
-    if [ "${partdata2}" = "swap" ]; then
-        echo "/dev/${device}${part} none swap sw 0 0" >> ${prefix}/etc/fstab
-    else
-        echo "/dev/${device}${part} ${partdata3} ${partdata2} ${partdata4} 0 1" >> ${prefix}/etc/fstab
-    fi
-done
-
-
-#
-#  Finally we can 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/centos-5/90-make-fstab

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

hooks/centos-5/99-clean-image

@@ -1,51 +0,0 @@
-#!/bin/sh
-#
-#  This script cleans the yum database on the new system.
-#
-# Steve
-# --
-# http://www.steve.org.uk/
-
-
-prefix=$1
-
-#
-#  Source our common functions
-#
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
-else
-    . ./hooks/common.sh
-fi
-
-
-#
-# Log our start
-#
-logMessage Script $0 starting
-
-
-#
-# Clean up RPM files.
-#
-logMessage Cleaning .rpm* files.
-find ${prefix}/ -name '*.rpmorig' -exec rm -f \{\} \;
-find ${prefix}/ -name '*.rpmnew' -exec rm -f \{\} \;
-
-#
-#  Clean yum
-#
-logMessage Cleaning Yum Repository
-
-if [ ! -d ${prefix}/proc ]; then
-    mkdir -p ${prefix}/proc
-fi
-mount -o bind /proc ${prefix}/proc
-chroot ${prefix} /usr/bin/yum  clean all
-umount ${prefix}/proc
-
-
-#
-#  Log our finish
-#
-logMessage Script $0 finished

hooks/centos-5/99-clean-image

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

hooks/centos-6/10-disable-tls

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