Release 4.3

Remove generated file t/modules.t in clean target
Otherwise the package wouldn't build twice in a row. It didn't hurt while developing since it's listed in .gitignore. :-)
2026-02-20 05:45:15 +00:00 · 2012-06-27 00:03:56 +02:00 · 2012-06-27 00:03:56 +02:00 · 2012-06-27 00:03:56 +02:00 · 2012-06-26 22:32:52 +02:00 · 2012-06-08 21:45:49 +02:00
228 changed files with 2959 additions and 10492 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,6 @@
 .*
 # but we _wan't_ those dot-files
 !.gitignore
-!.hgignore
 !.mailmap

 # ChangeLog is generated during make
--- a/.hgignore
+++ b/.hgignore
@@ -1,5 +0,0 @@
-(^|/)CVS($|/)
-(^|/)\.hg($|/)
-(^|/)\.hgtags($|/)
-ChangeLog
-~$
--- a/28
+++ b/28
@@ -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
--- a/35
+++ b/35
@@ -1,6 +1,6 @@
 KNOWN BUGS in xen-tools

-Bugs to fix before a 4.2 release
+Bugs to fix before a 4.3 release
 --------------------------------

 * xen-delete-image doesn't remove all logical volumes if --partitions is used.
@@ -11,3 +11,36 @@ Bugs to fix before a 4.2 release
   http://xen-tools.org/pipermail/xen-tools-discuss/2010-May/000757.html

 * xen-delete-image ignores extension setting
+
+* partitions were mounted in config file order, not in mountpoint order.
+  That implies that if you specified :
+	/boot
+	/
+  in that order, / was mounted _over_ /boot, and you would not _see_ /boot.
+  Xen-Tools would then install boot on your / partition, and your boot device
+  was just empty and unbootable.
+
+  Workaround for 4.2 is to write your partition file such as mounts overlap
+  correctly when mounted in specified order.
+
+  Current (unreleased) fix is to sort by mountpoint length.
+
+  Fix would be to reproduce what mount does with mount -a.
+
+* xen-create-image doesn't unmount the tempdir properly if /proc wasn't mounted inside
+
+* xen-create-image says on startup summary that the Debian mirror is
+  used even if Ubuntu is going to be installed (and works)
+
+* xen-list-images does not honour --extension
+
+* --extension='' (i.e. empty string) no more works
+
+
+Bugs to fix later
+-----------------
+
+t/xen-tools.t can't really test Xen::Tools as the latter requires a
+local Xen installation. For proper testing, a dummy set of Xen
+configuration files and configurable paths to them in Xen::Tools would
+be necessary.
--- a/7
+++ b/7
@@ -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-2012: 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
--- a/25
+++ b/25
@@ -14,12 +14,10 @@
 #
 TMP        ?= /tmp
 DIST_PREFIX = ${TMP}
-VERSION     = 4.2
+VERSION     = 4.3
 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.
@@ -148,9 +146,11 @@ install-hooks:
 	for i in ${prefix}/usr/lib/xen-tools/*.d; do if [ -L "$$i" ]; then rm -vf "$$i"; fi; done
 	mkdir -p ${prefix}/usr/lib/xen-tools/centos-4.d/
 	mkdir -p ${prefix}/usr/lib/xen-tools/centos-5.d/
+	mkdir -p ${prefix}/usr/lib/xen-tools/centos-6.d/
 	mkdir -p ${prefix}/usr/lib/xen-tools/fedora-core-6.d/
 	cp -R hooks/centos-4/*-* ${prefix}/usr/lib/xen-tools/centos-4.d
 	cp -R hooks/centos-5/*-* ${prefix}/usr/lib/xen-tools/centos-5.d
+	cp -R hooks/centos-6/*-* ${prefix}/usr/lib/xen-tools/centos-6.d
 	cp -R hooks/fedora-core-6/*-* ${prefix}/usr/lib/xen-tools/fedora-core-6.d
 	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-4.d
 	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-5.d
@@ -161,6 +161,10 @@ install-hooks:
 	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-11.d
 	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-12.d
 	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-13.d
+	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-14.d
+	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-15.d
+	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-16.d
+	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-17.d
 	mkdir -p ${prefix}/usr/lib/xen-tools/debian.d/
 	cp -R hooks/debian/*-* ${prefix}/usr/lib/xen-tools/debian.d
 	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d sarge.d
@@ -188,7 +192,11 @@ install-hooks:
 	-cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d lucid.d
 	-cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d maverick.d
 	-cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d natty.d
+	-cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d oneiric.d
+	-cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d precise.d
+	-cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d quantal.d
 	cp hooks/common.sh ${prefix}/usr/lib/xen-tools
+	cp -r hooks/common ${prefix}/usr/lib/xen-tools


 #
@@ -230,20 +238,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


 #
--- a/69
+++ b/69
@@ -0,0 +1,69 @@
+xen-tools 4.3rc2 (released TODO)
+=======================================
+
+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.
--- a/22
+++ b/22
@@ -19,20 +19,21 @@ About:

  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.
+ "Dapper") and some RPM-based distributions. On the Dom0 side all
+ current Xen supporting distributions should work.

  However, currently only Debian and Ubuntu releases are tested and
 known to work, i.e.:

 	Debian:
-	  * Sarge 3.1 (i386 only)
-	  * Etch 4.0
+	  * Sarge 3.1 (i386 and DomU only)
+	  * Etch 4.0 (Dom0 no more tested)
 	  * Lenny 5.0
 	  * Squeeze 6.0
-	  * Wheezy 7.0 (preliminary support as it's not yet available)
+	  * Wheezy 7.0
 	  * Sid (works at least at the moment of writing :-)

-	Ubuntu:
+	Ubuntu (only DomUs tested):
 	  * Dapper Drake 6.06
 	  * Edgy Eft 6.10
 	  * Feisty Fawn 7.04
@@ -42,8 +43,15 @@ About:
 	  * 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)
+	  * Maverick Meerkat 10.10
+	  * Natty Narwhal 11.04
+	  * Oneiric Ocelot 11.10
+	  * Precise Pangolin 12.04
+	  * Quantal Quetzal 12.10 (preliminary support as it's not yet available)
+
+	CentOS (only DomUs tested, pygrub support incomplete):
+	  * CentOS 5
+	  * CentOS 6

  [1] There is an issue with debootstrap on hardy not installing ksyslogd
      This can be fixed by chrooting into the newly installed system
--- a/94
+++ b/94
@@ -3,6 +3,12 @@ TODO

 See KNOWN_BUGS for real bugs.

+Bugs to fix and features to add for 4.3
+---------------------------------------
+
+Refactor TLS disabling. Seems to be happen twice, once in 20-setup-apt
+and once in 10-disable-tls.
+
 Bugs to fix and features to add for 5.0
 ---------------------------------------

@@ -28,6 +34,19 @@ Bugs to fix and features to add for 5.0
   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
@@ -82,20 +101,27 @@ Bugs to fix and features to add for 5.0

 * 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.
+   We still have a link farm for hooks and a meta link farm for distro
+   releases created on "make install". It probably would be better if
+   we would just have one directory per distro (like with debian) but
+   without the need to created symlinks on "make install"
+
+   Currently CentOS's 25-setup-kernel creates an fstab and
+   90-make-fstab does again. It works, but that cries for debugging
+   hell.
+
+   centos-5/25-setup-kernel centos-6/25-setup-kernel still differ and
+   I'm not sure if that's necessary respectively what's the common
+   denominator.
+
+   80-install-kernel is not yet merged into one hook script.
+
+   Common oneliners for code deduplication in the hooks/ directory:
+
+   $ find -L . -not -xtype l -not -type d -not -path '*/common/*' | sort -t / -k3
+   $ fdupes -r1 . | sort -t / -k3
+   $ find . -type f | sim_text -ipTt 50 | tac | column -t

-   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

@@ -116,11 +142,6 @@ Bugs to fix and features to add for 5.0
   "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
@@ -141,6 +162,14 @@ Bugs to fix and features to add for 5.0

   ... dist-upgrade instead of upgrade

+* Support cpu_weight and other features from
+  http://wiki.xensource.com/xenwiki/CreditScheduler
+
+* Code Deduplication / Refactor the code for less code duplication
+
+   bin/x* currently contain the same or similar code like e.g. in the
+   function readConfigurationFile. This needs to be cleaned up.
+
 * Use Perl::Critic

 Stuff from Steve's TODO list / Generic TODOs
@@ -149,3 +178,32 @@ Stuff from Steve's TODO list / Generic TODOs
 * Write more test cases.

 * xen-delete-image should unallocate any used IP addresses.
+
+Axel's Break-Backwards-Compatibility Wishlist
+---------------------------------------------
+
+* Make empty extension the default
+
+   This would ease tab completion and CLI parameter reusage with "xm
+   create" and friends.
+
+* Check if we can reduce MAKEDEV invocations in hooks/common/55-create-dev
+
+   MAKEDEV std is called in any case. First comment says "Early
+   termination if we have a couple of common devices present should
+   speed up installs which use --copy/--tar" and then "We still need
+   to make sure the basic devices are present" and calls MAKEDEV more
+   often than otherwise.
+
+   Additionally the 55-create-dev for CentOS/Fedora just created
+   console, zero and null. zero and null are part of "MAKEDEV std",
+   perhaps can we reduce it to that. console is part of "MAKEDEV
+   generic".
+
+   Additionally the devices hda, sda and tty1 may not necessary in any
+   case, but instead hvc0 should be created for sure in many
+   cases. Nothing cares about $serial_device there either.
+
+   Current MAKEDEV implementation support more than one device as
+   parameter. That could reduce the MAKEDEV calls from currently six
+   to two.
--- a/bin/xen-create-image
+++ b/bin/xen-create-image
@@ -146,6 +146,10 @@ xen-create-image - Easily create new Xen instances with networking and OpenSSH.
                Pass the named string literally to any role script.
                This is useful for site-specific roles.

+   --finalrole=role
+                Similar to role scripts. Run the specified role script(s)
+                after cfg file creation.
+
   --roledir=/path/to/directory
                Specify the directory which contains the role scripts.
                This defaults to /etc/xen-tools/role.d/
@@ -165,6 +169,11 @@ xen-create-image - Easily create new Xen instances with networking and OpenSSH.

   --tar-cmd    NOP: Ignored.

+   --dontformat Do not format the devices specified for installation.
+                Useful if you want tighter control over the filesystem
+                creation. Requires the filesystems to be created
+                beforehand.
+
   --vcpus=num
                Set the number of vcpus that the new instance will have
                instead of the default value of "1".
@@ -204,6 +213,10 @@ xen-create-image - Easily create new Xen instances with networking and OpenSSH.
                to choose a more or less close Debian mirror. See
                http://wiki.debian.org/DebianGeoMirror for details.

+   --apt_proxy=url
+                Specify a proxy to be used by debootstrap, and within
+                the guest.
+
   --template=tmpl
                Specify which template file to use when creating the
                Xen configuration file.
@@ -708,6 +721,9 @@ Install an X11 server, using VNC and XDM
 installed system as their first argument, and anything passed
 as a role-arg will be passed allong as additional arguments.

+  NOTE: Role scripts are invoked before the config file generation.
+        If you need access to the config file from within your role,
+        use --finalrole.
  NOTE: Multiple role scripts may be invoked if you separate their
 names with commas.

@@ -745,7 +761,7 @@ Install an X11 server, using VNC and XDM

 =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;
@@ -806,7 +822,7 @@ my $FAIL = 0;
 #
 # Release number.
 #
-my $RELEASE = '4.2';
+my $RELEASE = '4.3';


 #
@@ -1053,6 +1069,12 @@ runRoleScripts( $CONFIG{ 'role' } );
 runXenConfigCreation();


+#
+#  Run any specified role scripts.
+#
+runRoleScripts( $CONFIG{ 'finalrole' } );
+
+
 #
 #  Setup the password if the user wanted that.
 #
@@ -1251,7 +1273,7 @@ sub testXenConfig
    # Read the configuration file.
    #
    open( CONFIG, "<", "/etc/xen/xend-config.sxp" ) or
-      die "Failed to read /etc/xen/xend-config.sxp: $!";
+      fail("Failed to read /etc/xen/xend-config.sxp: $!");
    while (<CONFIG>)
    {
        next if ( !$_ || !length($_) );
@@ -1351,19 +1373,20 @@ sub setupDefaultOptions
    $CONFIG{ 'mirror' }        = '';

    # Initialize per distribution mirror defaults: Debian
-    foreach my $debdist (qw(lenny squeeze wheezy sid testing stable unstable)) {
+    foreach my $debdist (qw(squeeze wheezy sid testing oldstable stable unstable)) {
        $CONFIG{ 'mirror_'.$debdist } = $CONFIG{ 'mirror' }
    }
-    foreach my $debdist (qw(sarge etch)) {
+    foreach my $debdist (qw(sarge etch lenny)) {
        $CONFIG{ 'mirror_'.$debdist } = 'http://archive.debian.org/debian';
    }
    # Initialize per distribution mirror defaults: Ubuntu
-    foreach my $ubuntudist (qw(dapper hardy jaunty karmic lucid maverick natty)) {
+    foreach my $ubuntudist (qw(hardy lucid natty oneiric precise quantal)) {
        $CONFIG{ 'mirror_'.$ubuntudist } = 'http://archive.ubuntu.com/ubuntu';
    }
-    foreach my $ubuntudist (qw(edgy feisty gutsy intrepid)) {
+    foreach my $ubuntudist (qw(dapper edgy feisty gutsy intrepid jaunty karmic maverick)) {
        $CONFIG{ 'mirror_'.$ubuntudist } = 'http://old-releases.ubuntu.com/ubuntu';
    }
+    $CONFIG{ 'apt_proxy' }     = '';
    $CONFIG{ 'arch' }          = '';
    $CONFIG{ 'fs' }            = 'ext3';
    $CONFIG{ 'force' }         = 0;
@@ -1451,7 +1474,7 @@ sub readConfigurationFile

    my $line = "";

-    open( FILE, "<", $file ) or die "Cannot read file '$file' - $!";
+    open( FILE, "<", $file ) or fail("Cannot read file '$file' - $!");

    while ( defined( $line = <FILE> ) )
    {
@@ -1550,16 +1573,20 @@ sub checkOption
        },
        serialDev => {
            check   => qr/^(?:\/dev\/)?(?:tty|[xh]vc)[0-9]+$/,
-            message => "must be a serial device (tty*, hvc* or xvc*).\n",
+            message => "must be a serial device (tty[0-9]+, hvc[0-9]+ or xvc[0-9]+).\n",
        },
        diskDev => {
-            check   => qr/^(?:\/dev\/)?(?:tty|hvc)[0-9]+$/,
-            message => "must be a disk device (tty*, hvc*).\n",
+            check   => qr/^(?:\/dev\/)?(?:xvd|sd)[a-z]+$/,
+            message => "must be a disk device (xvd[a-z]+, sd[a-z]+).\n",
        },
        ipv4 => {
            check   => qr/^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/,
            message => "must be valid IPv4.\n",
        },
+        ipv4_or_auto => {
+            check   => qr/^(?:auto|(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))$/,
+            message => "must be valid IPv4 or the keyword 'auto'.\n",
+        },
        hostname => {
            check   => qr/^[a-z0-9][a-z0-9.-]{0,254}$/i,
            message => "must be a valid hostname.\n",
@@ -1624,7 +1651,7 @@ sub checkOption
        output        => 'existingDir',
        extension     => 'filename',
        mac           => 'mac',
-        ip            => 'ipv4',
+        ip            => 'ipv4_or_auto',
        hash_method   => 'hashMethod',
    );

@@ -1636,7 +1663,7 @@ sub checkOption
        my $type = $optionsTypes{ $option };

        # First, check if type exists
-        die unless exists $types{ $type };
+        fail("Type $type does not exist") unless exists $types{ $type };
        my $check = $types{ $type }{ 'check' };

        if (
@@ -1644,10 +1671,15 @@ sub checkOption
            (ref $check eq 'CODE' and &$check( $value ) )
        ) {
            # Option did validate, copy it
-            $CONFIG{ $option } = $value;
+            if ( $option eq "ip" )
+            {
+              push @{ $CONFIG{ $option } }, $value;
+            } else {
+              $CONFIG{ $option } = $value;
+            }
        } else {
            # Option did _not_ validate
-            die "ERROR: '$option' argument " . $types{ $type }{ 'message' };
+            fail("ERROR: '$option' argument " . $types{ $type }{ 'message' });
        }
    }
 }
@@ -1701,6 +1733,7 @@ sub parseCommandLineArguments
            "kernel=s",    \&checkOption,
            "initrd=s",    \&checkOption,
            "mirror=s",    \&checkOption,
+            "apt_proxy=s", \&checkOption,
            "modules=s",   \&checkOption,
            "lvm=s",       \$install{ 'lvm' },
            "image-dev=s", \$install{ 'image-dev' },
@@ -1759,12 +1792,14 @@ sub parseCommandLineArguments
            "partitions=s", \&checkOption,
            "role=s",       \&checkOption,
            "role-args=s",  \&checkOption,
+            "finalrole=s",       \&checkOption,
            "roledir=s",    \&checkOption,
            "force",        \$CONFIG{ 'force' },
            "keep",         \$CONFIG{ 'keep' },
            "template=s",   \&checkOption,
            "output=s",     \&checkOption,
            "extension=s",  \&checkOption,
+            "dontformat",   \&checkOption,

            # Help options
            "debug",   \$CONFIG{ 'debug' },
@@ -1909,7 +1944,7 @@ sub checkArguments
    #
    #  Lucid and probably all later Ubuntus, too, don't work without pygrub
    #
-    if ( $CONFIG{ 'dist' } =~ /lucid|maverick|natty/ )
+    if ( $CONFIG{ 'dist' } =~ /lucid|maverick|natty|oneiric|precise|quantal/ )
    {
        $CONFIG{ 'pygrub' } = 1;
    }
@@ -1918,9 +1953,10 @@ sub checkArguments
    #  Sarge amd64 needs different default mirror
    #
    if ( $CONFIG{ 'dist' } =~ /sarge/ and
+         $CONFIG{ 'arch' } =~ /amd64/ and
         $CONFIG{ 'mirror_sarge' } eq 'http://archive.debian.org/debian' )
    {
-        $CONFIG{ 'mirror_sarge' } = 'http://amd64.debian.net/debian';
+        $CONFIG{ 'mirror_sarge' } = 'http://archive.debian.org/debian-amd64';
    }

    #
@@ -2404,7 +2440,7 @@ sub checkBinariesPresent
            }
        }
    }
-    else
+    elsif (defined( $CONFIG{ 'lvm' } ) )
    {

        # LVM-specific binaries.
@@ -2930,7 +2966,7 @@ sub createLoopbackImages
        eval {mkpath( $output, 0, 0755 );};
        if ($@)
        {
-            die "Cannot create directory tree $output - $@";
+            fail("Cannot create directory tree $output - $@");
        }
    }

@@ -3379,37 +3415,28 @@ sub createFilesystem
    #  Split the command into "binary" + "args".  Make sure that
    # the binary exists and is executable.
    #
-    if ( $command =~ /([^ ]+) (.*)$/ )
-    {
-        my $binary = $1;
-        my $args   = $2;
+    my ($binary, $args) = split(/ /, $command, 2);

-        if ( !defined( findBinary($binary) ) )
-        {
-            logprint(
-                "The binary '$binary' required to create the filesystem $fs is missing\n"
-            );
-            $FAIL = 1;
-            exit 127;
-        }
-    }
-    else
+    if ( !defined( findBinary($binary) ) )
    {
        logprint(
-                "The filesystem creation hash is bogus for filesystem : $fs\n");
+            "The binary '$binary' required to create the filesystem $fs is missing\n"
+        );
        $FAIL = 1;
        exit 127;
    }

-    #
-    #  OK we have the command and the filesystem.  Create it.
-    #
-    logprint("\nCreating $fs filesystem on $image\n");
+    unless ( $CONFIG{ 'dontformat' } ) {
+        #
+        #  OK we have the command and the filesystem.  Create it.
+        #
+        logprint("\nCreating $fs filesystem on $image\n");

-    $command .= " " . $image;
+        $command .= " " . $image;

-    runCommand($command);
-    logprint("Done\n");
+        runCommand($command);
+        logprint("Done\n");
+    }
 }


@@ -3451,7 +3478,7 @@ sub mountImage
    #
    $MOUNT_POINT = tempdir( CLEANUP => 1 );

-    foreach my $partition (@PARTITIONS)
+    foreach my $partition (sort { length($a->{'mountpoint'}) <=> length($b->{'mountpoint'}) } @PARTITIONS)
    {
        if ( $partition->{ 'type' } ne 'swap' )
        {
@@ -3566,6 +3593,15 @@ sub installSystem
    }


+    #
+    #  Propagate --apt_proxy
+    #
+    if ( $CONFIG{ 'apt_proxy' } )
+    {
+        $cmd .= " --apt_proxy=$CONFIG{'apt_proxy'}";
+    }
+
+
    #
    #  Show the user what they are installing
    #
@@ -3727,12 +3763,6 @@ sub runCustomisationHooks
    } else {
        unlink "$MOUNT_POINT/etc/resolv.conf";
    }
-
-    #
-    #  Unmount /proc and /dev/pts in the guest install.
-    #
-    runCommand("umount $MOUNT_POINT/proc");
-    runCommand("umount $MOUNT_POINT/dev/pts");
 }


@@ -3755,7 +3785,7 @@ sub findIP
    # Open and read the file.
    #
    open( RANGE, "<", $CONFIG{ 'ipfile' } ) or
-      die "Failed to read $CONFIG{'ipfile'} - $!";
+      fail("Failed to read $CONFIG{'ipfile'} - $!");
    my @lines = <RANGE>;
    my @updated;
    close(RANGE);
@@ -3786,7 +3816,7 @@ sub findIP
    #  Now write out the new entries.
    #
    open( RANGE, ">", $CONFIG{ 'ipfile' } ) or
-      die "Failed to write to $CONFIG{'ipfile'} - $!";
+      fail("Failed to write to $CONFIG{'ipfile'} - $!");
    print RANGE join( "\n", @updated );
    close(RANGE);

@@ -3985,6 +4015,12 @@ sub runXenConfigCreation
        $command .= " --admins=$CONFIG{'admins'}";
    }

+    #
+    #  Make sure the template gets a list of all IPs
+    #
+    $ENV{ 'ips' } = $IP_ADDRESSES;
+
+
    logprint("\nCreating Xen configuration file\n");
    runCommand($command);
    logprint("Done\n");
@@ -4053,7 +4089,7 @@ sub setupRootPassword
            }
            else
            {
-                die "oops... unknown hashing method, should not happen!";
+                fail("oops... unknown hashing method, should not happen!");
            }

            my $hash = crypt($PASSWORD, $hash_method . $salt);
@@ -4064,8 +4100,8 @@ sub setupRootPassword
            #
            my $tmp_shadow_path = "$shadow_path.tmp";
            cp("$shadow_path","$tmp_shadow_path");
-            open(TMP, "<", $tmp_shadow_path) or die $!;
-            open(SHADOW, ">", $shadow_path) or die $!;
+            open(TMP, "<", $tmp_shadow_path) or fail($!);
+            open(SHADOW, ">", $shadow_path) or fail($!);
            my $line;
            while(defined($line = <TMP>))
            {
@@ -4106,6 +4142,23 @@ sub generatePassword {
 }


+=begin doc
+
+  Properly set $FAIL on die
+
+=end doc
+
+=cut
+
+sub fail
+{
+    logprint(@_);
+    $FAIL = 1;
+    exit 127;
+}
+
+
+
 =begin doc

  Print the given string to the logfile.
@@ -4261,6 +4314,12 @@ sub unMountImage
 {
    my ($point) = (@_);

+    #
+    #  First we unmount /proc and /dev/pts in the guest install.
+    #
+    runCommand("umount $MOUNT_POINT/proc");
+    #runCommand("umount $MOUNT_POINT/dev/pts");
+
    #
    #  Open /proc/mount and get a list of currently mounted paths
    # which begin with our mount point.
--- a/bin/xen-create-nfs
+++ b/bin/xen-create-nfs
@@ -131,7 +131,7 @@ $CONFIG{ 'template' } = '/etc/xen-tools/xm-nfs.tmpl';
 #
 # Release number.
 #
-my $RELEASE = '4.2';
+my $RELEASE = '4.3';


 # store version number away.
@@ -380,6 +380,30 @@ 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.
 }

--- a/bin/xen-delete-image
+++ b/bin/xen-delete-image
@@ -171,7 +171,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.2';
+my $RELEASE = '4.3';



--- a/bin/xen-list-images
+++ b/bin/xen-list-images
@@ -101,7 +101,7 @@ $CONFIG{ 'prefix' } = "/etc/xen";
 #
 # Release number.
 #
-my $RELEASE = '4.2';
+my $RELEASE = '4.3';



--- a/bin/xen-resize-guest
+++ b/bin/xen-resize-guest
@@ -116,7 +116,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.2';
+my $RELEASE = '4.3';



--- a/bin/xen-update-image
+++ b/bin/xen-update-image
@@ -120,7 +120,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.2';
+my $RELEASE = '4.3';


 #
--- a/bin/xt-create-xen-config
+++ b/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.3';



@@ -375,7 +375,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 +383,7 @@ sub createXenConfig
    #
    #  Remove any trailing Mb.
    #
-    if ( $ENV{ 'memory' } =~ /^(\d+)Mb*$/i )
+    if ( $ENV{ 'memory' } =~ /^(\d+)Mb.*$/i )
    {
        $ENV{ 'memory' } = $1;
    }
--- a/bin/xt-customize-image
+++ b/bin/xt-customize-image
@@ -98,7 +98,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.2';
+my $RELEASE = '4.3';



--- a/bin/xt-guess-suite-and-mirror
+++ b/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
@@ -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.3';

 # 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);
--- a/bin/xt-install-image
+++ b/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.
@@ -117,7 +118,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.2';
+my $RELEASE = '4.3';


 #
@@ -395,6 +396,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' },
@@ -757,6 +759,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
@@ -811,7 +821,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.
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,89 @@
+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
--- a/debian/clean
+++ b/debian/clean
@@ -0,0 +1 @@
+t/modules.t
--- a/debian/control
+++ b/debian/control
@@ -2,17 +2,17 @@ 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), libtest-pod-perl, libtext-template-perl, libfile-slurp-perl, devscripts, libmoose-perl, libtest-pod-coverage-perl, git
+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, perl-modules, libtext-template-perl, libconfig-inifiles-perl, libfile-slurp-perl, ${misc:Depends}, openssh-client
+Recommends: xen-hypervisor-amd64 | xen-hypervisor-i386 | xen-hypervisor-i386-pae, rinse (>= 1.9.1-1), libexpect-perl, xen-utils
+Suggests: reiserfsprogs, xfsprogs, cfengine2, btrfs-tools
 Description: Tools to manage Xen virtual servers
 This package contains tools to manage Debian based Xen virtual servers.
 .
@@ -25,6 +25,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 +37,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
--- a/debian/copyright
+++ b/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-2012: 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'.
--- a/debian/docs
+++ b/debian/docs
@@ -4,3 +4,4 @@ SUPPORT
 BUGS
 TODO
 KNOWN_BUGS
+NEWS
--- a/debian/rules
+++ b/debian/rules
@@ -9,8 +9,9 @@ configure-stamp:
 	touch configure-stamp


-build: build-stamp
-
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
 build-stamp: configure-stamp 
 	dh_testdir
 	touch build-stamp
@@ -19,7 +20,6 @@ clean:
 	dh_testdir
 	dh_testroot
 	make clean
-	rm -f build-stamp configure-stamp
 	dh_clean 

 install: build
@@ -27,6 +27,7 @@ install: build
 	dh_testroot
 	dh_prep

+	dh_auto_test
 	make manpages
 	make install prefix=`pwd`/debian/xen-tools

--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)
--- a/etc/xen-tools.conf
+++ b/etc/xen-tools.conf
@@ -263,21 +263,29 @@ 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_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_maverick = http://old-releases.ubuntu.com/ubuntu
 # mirror_natty = http://archive.ubuntu.com/ubuntu
+# mirror_oneiric = http://archive.ubuntu.com/ubuntu
+# mirror_precise = http://archive.ubuntu.com/ubuntu
+# mirror_quantal = http://archive.ubuntu.com/ubuntu

+# 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.
@@ -298,7 +306,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:
 #
--- a/etc/xm.tmpl
+++ b/etc/xm.tmpl
@@ -53,7 +53,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 +145,7 @@ name        = '{$hostname}'
      $br = ",bridge=$bridge"
    }

-    $OUT .= "vif         = [ 'ip=$ip1";
+    $OUT .= "vif         = [ 'ip=$ips";
    $OUT .= "$m";
    $OUT .= "$vn";
    $OUT .= "$br";
--- a/hooks/centos-4/10-disable-tls
+++ b/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
--- a/hooks/centos-4/10-disable-tls
+++ b/hooks/centos-4/10-disable-tls
@@ -0,0 +1 @@
+../common/10-disable-tls
--- a/hooks/centos-4/15-setup-arch
+++ b/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
-
--- a/hooks/centos-4/15-setup-arch
+++ b/hooks/centos-4/15-setup-arch
@@ -0,0 +1 @@
+../common/15-disable-hwclock
--- a/hooks/centos-4/20-setup-yum
+++ b/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
-
-
-
-
--- a/hooks/centos-4/20-setup-yum
+++ b/hooks/centos-4/20-setup-yum
@@ -0,0 +1 @@
+../common/20-setup-yum
--- a/hooks/centos-4/30-disable-gettys
+++ b/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
--- a/hooks/centos-4/30-disable-gettys
+++ b/hooks/centos-4/30-disable-gettys
@@ -0,0 +1 @@
+../common/30-disable-gettys
--- a/hooks/centos-4/35-setup-users
+++ b/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" );
-    }
-}
--- a/hooks/centos-4/35-setup-users
+++ b/hooks/centos-4/35-setup-users
@@ -0,0 +1 @@
+../common/35-setup-users
--- a/hooks/centos-4/40-setup-networking
+++ b/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
--- a/hooks/centos-4/40-setup-networking
+++ b/hooks/centos-4/40-setup-networking
@@ -0,0 +1 @@
+../common/40-setup-networking-rpm
--- a/hooks/centos-4/50-setup-hostname
+++ b/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
--- a/hooks/centos-4/50-setup-hostname
+++ b/hooks/centos-4/50-setup-hostname
@@ -0,0 +1 @@
+../common/50-setup-hostname-rpm
--- a/hooks/centos-4/55-create-dev
+++ b/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
--- a/hooks/centos-4/55-create-dev
+++ b/hooks/centos-4/55-create-dev
@@ -0,0 +1 @@
+../common/55-create-dev
--- a/hooks/centos-4/65-copy-user-files
+++ b/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
--- a/hooks/centos-4/65-copy-user-files
+++ b/hooks/centos-4/65-copy-user-files
@@ -0,0 +1 @@
+../common/65-copy-user-files
--- a/hooks/centos-4/70-install-ssh
+++ b/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
--- a/hooks/centos-4/70-install-ssh
+++ b/hooks/centos-4/70-install-ssh
@@ -0,0 +1 @@
+../common/70-install-ssh-rpm
--- a/hooks/centos-4/75-fixup-securetty
+++ b/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.
-
--- a/hooks/centos-4/75-fixup-securetty
+++ b/hooks/centos-4/75-fixup-securetty
@@ -0,0 +1 @@
+../common/75-fixup-securetty
--- a/hooks/centos-4/80-install-modules
+++ b/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
--- a/hooks/centos-4/80-install-modules
+++ b/hooks/centos-4/80-install-modules
@@ -0,0 +1 @@
+../common/80-install-modules-rpm
--- a/hooks/centos-4/90-make-fstab
+++ b/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
--- a/hooks/centos-4/90-make-fstab
+++ b/hooks/centos-4/90-make-fstab
@@ -0,0 +1 @@
+../common/90-make-fstab
--- a/hooks/centos-4/99-clean-image
+++ b/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
--- a/hooks/centos-4/99-clean-image
+++ b/hooks/centos-4/99-clean-image
@@ -0,0 +1 @@
+../common/99-clean-image-rpm
--- a/hooks/centos-5/10-disable-tls
+++ b/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
--- a/hooks/centos-5/10-disable-tls
+++ b/hooks/centos-5/10-disable-tls
@@ -0,0 +1 @@
+../common/10-disable-tls
--- a/hooks/centos-5/15-setup-arch
+++ b/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
-
--- a/hooks/centos-5/15-setup-arch
+++ b/hooks/centos-5/15-setup-arch
@@ -0,0 +1 @@
+../common/15-disable-hwclock
--- a/hooks/centos-5/20-setup-yum
+++ b/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
-
-
-
-
--- a/hooks/centos-5/20-setup-yum
+++ b/hooks/centos-5/20-setup-yum
@@ -0,0 +1 @@
+../common/20-setup-yum
--- a/hooks/centos-5/25-setup-kernel
+++ b/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/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 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
+initrd        /boot/initrd-$KERNELVERSION.img
+EOF
+
+#
+#  Log our finish
+#
+logMessage Script $0 finished
--- a/hooks/centos-5/30-disable-gettys
+++ b/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
--- a/hooks/centos-5/30-disable-gettys
+++ b/hooks/centos-5/30-disable-gettys
@@ -0,0 +1 @@
+../common/30-disable-gettys
--- a/hooks/centos-5/35-setup-users
+++ b/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" );
-    }
-}
--- a/hooks/centos-5/35-setup-users
+++ b/hooks/centos-5/35-setup-users
@@ -0,0 +1 @@
+../common/35-setup-users
--- a/hooks/centos-5/40-setup-networking
+++ b/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
--- a/hooks/centos-5/40-setup-networking
+++ b/hooks/centos-5/40-setup-networking
@@ -0,0 +1 @@
+../common/40-setup-networking-rpm
--- a/hooks/centos-5/50-setup-hostname
+++ b/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
--- a/hooks/centos-5/50-setup-hostname
+++ b/hooks/centos-5/50-setup-hostname
@@ -0,0 +1 @@
+../common/50-setup-hostname-rpm
--- a/hooks/centos-5/55-create-dev
+++ b/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
--- a/hooks/centos-5/55-create-dev
+++ b/hooks/centos-5/55-create-dev
@@ -0,0 +1 @@
+../common/55-create-dev
--- a/hooks/centos-5/65-copy-user-files
+++ b/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
--- a/hooks/centos-5/65-copy-user-files
+++ b/hooks/centos-5/65-copy-user-files
@@ -0,0 +1 @@
+../common/65-copy-user-files
--- a/hooks/centos-5/70-install-ssh
+++ b/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
--- a/hooks/centos-5/70-install-ssh
+++ b/hooks/centos-5/70-install-ssh
@@ -0,0 +1 @@
+../common/70-install-ssh-rpm
--- a/hooks/centos-5/75-fixup-securetty
+++ b/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.
-
--- a/hooks/centos-5/75-fixup-securetty
+++ b/hooks/centos-5/75-fixup-securetty
@@ -0,0 +1 @@
+../common/75-fixup-securetty
--- a/hooks/centos-5/80-install-modules
+++ b/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
--- a/hooks/centos-5/80-install-modules
+++ b/hooks/centos-5/80-install-modules
@@ -0,0 +1 @@
+../common/80-install-modules-rpm
--- a/hooks/centos-5/90-make-fstab
+++ b/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
--- a/hooks/centos-5/90-make-fstab
+++ b/hooks/centos-5/90-make-fstab
@@ -0,0 +1 @@
+../common/90-make-fstab
--- a/hooks/centos-5/99-clean-image
+++ b/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
--- a/hooks/centos-5/99-clean-image
+++ b/hooks/centos-5/99-clean-image
@@ -0,0 +1 @@
+../common/99-clean-image-rpm
--- a/hooks/centos-6/10-disable-tls
+++ b/hooks/centos-6/10-disable-tls
@@ -0,0 +1 @@
+../common/10-disable-tls
--- a/hooks/centos-6/15-setup-arch
+++ b/hooks/centos-6/15-setup-arch
@@ -0,0 +1 @@
+../common/15-disable-hwclock
--- a/hooks/centos-6/20-setup-yum
+++ b/hooks/centos-6/20-setup-yum
@@ -0,0 +1 @@
+../common/20-setup-yum
--- a/hooks/centos-6/25-setup-kernel
+++ b/hooks/centos-6/25-setup-kernel
@@ -0,0 +1,83 @@
+#!/bin/sh
+#
+#  This script sets up the kernel and fstab for CentOS 5.
+#
+
+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 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/sda$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
+initrd        /boot/initramfs-$KERNELVERSION.img
+EOF
+
+# Some use lvm but mkinitrd will generate a wrong initrd when these are present.
+rm -f ${prefix}/etc/lvm/backup/* ${prefix}/etc/lvm/archive/*
+
+# Generate a correct initrd.
+chroot ${prefix} mkinitrd --with=xenblk --with=xennet --preload=xenblk --preload=xennet\
+ -f /boot/initramfs-$KERNELVERSION.img $KERNELVERSION
+
+#
+#  Log our finish
+#
+logMessage Script $0 finished
--- a/hooks/centos-6/30-disable-gettys
+++ b/hooks/centos-6/30-disable-gettys
@@ -0,0 +1 @@
+../common/30-disable-gettys
--- a/hooks/centos-6/35-setup-users
+++ b/hooks/centos-6/35-setup-users
@@ -0,0 +1 @@
+../common/35-setup-users
--- a/hooks/centos-6/40-setup-networking
+++ b/hooks/centos-6/40-setup-networking
@@ -0,0 +1 @@
+../common/40-setup-networking-rpm
--- a/hooks/centos-6/50-setup-hostname
+++ b/hooks/centos-6/50-setup-hostname
@@ -0,0 +1 @@
+../common/50-setup-hostname-rpm
--- a/hooks/centos-6/55-create-dev
+++ b/hooks/centos-6/55-create-dev
@@ -0,0 +1 @@
+../common/55-create-dev
--- a/hooks/centos-6/65-copy-user-files
+++ b/hooks/centos-6/65-copy-user-files
@@ -0,0 +1 @@
+../common/65-copy-user-files
--- a/hooks/centos-6/70-install-ssh
+++ b/hooks/centos-6/70-install-ssh
@@ -0,0 +1 @@
+../common/70-install-ssh-rpm
--- a/hooks/centos-6/75-fixup-securetty
+++ b/hooks/centos-6/75-fixup-securetty
@@ -0,0 +1 @@
+../common/75-fixup-securetty
--- a/hooks/centos-6/80-install-modules
+++ b/hooks/centos-6/80-install-modules
@@ -0,0 +1 @@
+../common/80-install-modules-rpm
--- a/hooks/centos-6/90-make-fstab
+++ b/hooks/centos-6/90-make-fstab
@@ -0,0 +1 @@
+../common/90-make-fstab
--- a/hooks/centos-6/99-clean-image
+++ b/hooks/centos-6/99-clean-image
@@ -0,0 +1 @@
+../common/99-clean-image-rpm
--- a/Show More
+++ b/Show More