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

Also run xen-delete-image verbose and print output.
Properly clean up after t/xt-create-xen-config.t
2026-02-27 16:52:51 +00:00 · 2013-04-18 16:26:55 +02:00 · 2013-04-18 16:21:25 +02:00 · 2013-04-18 16:21:25 +02:00 · 2013-04-18 14:45:27 +02:00 · 2013-04-18 13:52:45 +02:00
103 changed files with 946 additions and 695 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,6 @@

 # backups created by "make update-version"
 *.bak
+
+# Devel::Cover cache
+cover_db/
--- a/KNOWN_BUGS.markdown
+++ b/KNOWN_BUGS.markdown
@@ -1,6 +1,11 @@
 KNOWN BUGS in xen-tools
 =======================

+Bugs to fix before next release
+-------------------------------
+
+[None so far]
+
 Bugs to fix rather soon
 -----------------------

@@ -11,8 +16,6 @@ Bugs to fix rather soon

   [Bug Report](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 :

@@ -30,16 +33,6 @@ Bugs to fix rather soon

  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
 -----------------
--- a/2
+++ b/2
@@ -3,7 +3,7 @@ xen-tools
 ---------

 Copyright (c) 2005-2009: Steve Kemp.  All rights reserved.
-Copyright (c) 2010-2012: The Xen-Tools Development Team, currently consisting of:
+Copyright (c) 2010-2013: The Xen-Tools Development Team, currently consisting of:
                         Axel Beckert <abe@deuxchevaux.org>,
                         Dmitry Nedospasov <dmitry@nedos.net>, and
                         Stéphane Jourdois <sjourdois@gmail.com>
--- a/125
+++ b/125
@@ -22,7 +22,8 @@ VCS         = git
 #
 #  Installation prefix, useful for the Debian package.
 #
-prefix=
+DESTDIR=
+prefix=${DESTDIR}


 nop:
@@ -94,7 +95,7 @@ fixup-perms:
 	chmod 644 etc/xen-tools.conf
 	chmod 644 etc/xm.tmpl
 	chmod 644 etc/xm-nfs.tmpl
-	chmod 644 misc/xen-tools misc/README
+	chmod 644 misc/*

 #
 #  Install files to /etc/
@@ -109,8 +110,10 @@ install-etc:
 	cp etc/xm.tmpl        ${prefix}/etc/xen-tools/
 	cp etc/xm-nfs.tmpl    ${prefix}/etc/xen-tools/
 	cp partitions/*-*     ${prefix}/etc/xen-tools/partitions.d/
-	-mkdir -p             ${prefix}/etc/bash_completion.d
-	cp misc/xen-tools     ${prefix}/etc/bash_completion.d/
+	-mkdir -p                         ${prefix}/etc/bash_completion.d/
+	cp misc/xen-tools.bash-completion ${prefix}/etc/bash_completion.d/xen-tools
+	-mkdir -p                         ${prefix}/etc/initramfs-tools/conf.d/
+	cp misc/xen-tools.initramfs-tools ${prefix}/etc/initramfs-tools/conf.d/xen-tools


 #
@@ -144,62 +147,62 @@ install-bin:
 #
 install-hooks:
 	for i in roles/* ; do if [ -f $$i ]; then cp $$i ${prefix}/etc/xen-tools/role.d; fi ; done
-	for i in ${prefix}/usr/lib/xen-tools/*.d; do if [ -L "$$i" ]; then rm -vf "$$i"; fi; done
-	mkdir -p ${prefix}/usr/lib/xen-tools/centos-4.d/
-	mkdir -p ${prefix}/usr/lib/xen-tools/centos-5.d/
-	mkdir -p ${prefix}/usr/lib/xen-tools/centos-6.d/
-	mkdir -p ${prefix}/usr/lib/xen-tools/fedora-core-6.d/
-	cp -R hooks/centos-4/*-* ${prefix}/usr/lib/xen-tools/centos-4.d
-	cp -R hooks/centos-5/*-* ${prefix}/usr/lib/xen-tools/centos-5.d
-	cp -R hooks/centos-6/*-* ${prefix}/usr/lib/xen-tools/centos-6.d
-	cp -R hooks/fedora-core-6/*-* ${prefix}/usr/lib/xen-tools/fedora-core-6.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-4.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-5.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-7.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-8.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-9.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-10.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-11.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-12.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-13.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-14.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-15.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-16.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-17.d
-	mkdir -p ${prefix}/usr/lib/xen-tools/debian.d/
-	cp -R hooks/debian/*-* ${prefix}/usr/lib/xen-tools/debian.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d sarge.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d etch.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d lenny.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d squeeze.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d wheezy.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d jessie.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d sid.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d testing.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d stable.d
-	mkdir -p ${prefix}/usr/lib/xen-tools/gentoo.d/
-	cp -R hooks/gentoo/*-* ${prefix}/usr/lib/xen-tools/gentoo.d
-	mkdir -p ${prefix}/usr/lib/xen-tools/dapper.d/
-	cp -R hooks/dapper/*-* ${prefix}/usr/lib/xen-tools/dapper.d/
-	mkdir -p ${prefix}/usr/lib/xen-tools/edgy.d/
-	cp -R hooks/edgy/*-* ${prefix}/usr/lib/xen-tools/edgy.d/
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s edgy.d feisty.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s edgy.d gutsy.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s edgy.d hardy.d
-	mkdir -p ${prefix}/usr/lib/xen-tools/intrepid.d/
-	cp -R hooks/intrepid/*-* ${prefix}/usr/lib/xen-tools/intrepid.d/
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s intrepid.d jaunty.d
-	mkdir -p ${prefix}/usr/lib/xen-tools/karmic.d/
-	cp -R hooks/karmic/*-* ${prefix}/usr/lib/xen-tools/karmic.d/
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d lucid.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d maverick.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d natty.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d oneiric.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d precise.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d quantal.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d raring.d
-	cp hooks/common.sh ${prefix}/usr/lib/xen-tools
-	cp -r hooks/common ${prefix}/usr/lib/xen-tools
+	for i in ${prefix}/usr/share/xen-tools/*.d; do if [ -L "$$i" ]; then rm -vf "$$i"; fi; done
+	mkdir -p ${prefix}/usr/share/xen-tools/centos-4.d/
+	mkdir -p ${prefix}/usr/share/xen-tools/centos-5.d/
+	mkdir -p ${prefix}/usr/share/xen-tools/centos-6.d/
+	mkdir -p ${prefix}/usr/share/xen-tools/fedora-core-6.d/
+	cp -R hooks/centos-4/*-* ${prefix}/usr/share/xen-tools/centos-4.d
+	cp -R hooks/centos-5/*-* ${prefix}/usr/share/xen-tools/centos-5.d
+	cp -R hooks/centos-6/*-* ${prefix}/usr/share/xen-tools/centos-6.d
+	cp -R hooks/fedora-core-6/*-* ${prefix}/usr/share/xen-tools/fedora-core-6.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-4.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-5.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-7.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-8.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-9.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-10.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-11.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-12.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-13.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-14.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-15.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-16.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-17.d
+	mkdir -p ${prefix}/usr/share/xen-tools/debian.d/
+	cp -R hooks/debian/*-* ${prefix}/usr/share/xen-tools/debian.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d sarge.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d etch.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d lenny.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d squeeze.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d wheezy.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d jessie.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d sid.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d testing.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d stable.d
+	mkdir -p ${prefix}/usr/share/xen-tools/gentoo.d/
+	cp -R hooks/gentoo/*-* ${prefix}/usr/share/xen-tools/gentoo.d
+	mkdir -p ${prefix}/usr/share/xen-tools/dapper.d/
+	cp -R hooks/dapper/*-* ${prefix}/usr/share/xen-tools/dapper.d/
+	mkdir -p ${prefix}/usr/share/xen-tools/edgy.d/
+	cp -R hooks/edgy/*-* ${prefix}/usr/share/xen-tools/edgy.d/
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s edgy.d feisty.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s edgy.d gutsy.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s edgy.d hardy.d
+	mkdir -p ${prefix}/usr/share/xen-tools/intrepid.d/
+	cp -R hooks/intrepid/*-* ${prefix}/usr/share/xen-tools/intrepid.d/
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s intrepid.d jaunty.d
+	mkdir -p ${prefix}/usr/share/xen-tools/karmic.d/
+	cp -R hooks/karmic/*-* ${prefix}/usr/share/xen-tools/karmic.d/
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d lucid.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d maverick.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d natty.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d oneiric.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d precise.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d quantal.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d raring.d
+	cp hooks/common.sh ${prefix}/usr/share/xen-tools
+	cp -r hooks/common ${prefix}/usr/share/xen-tools


 #
@@ -300,7 +303,9 @@ uninstall:
 	-rm -rf ${prefix}/etc/xen-tools/skel
 	-rmdir ${prefix}/etc/xen-tools/
 	-rm -f ${prefix}/etc/bash_completion.d/xen-tools
+	# Maybe needed to remove older releases of xen-tools
 	rm -rf ${prefix}/usr/lib/xen-tools
+	rm -rf ${prefix}/usr/share/xen-tools
 	rm -f ${prefix}/usr/share/man/man8/xen-create-image.8.gz
 	rm -f ${prefix}/usr/share/man/man8/xen-delete-image.8.gz
 	rm -f ${prefix}/usr/share/man/man8/xen-list-images.8.gz
--- a/NEWS.markdown
+++ b/NEWS.markdown
@@ -1,5 +1,11 @@
-xen-tools 4.3rc2 (released TODO)
-=======================================
+xen-tools 4.3.1 (released 30-Jun-2012)
+======================================
+
+Bugfix Release only
+
+
+xen-tools 4.3 (released 26-Jun-2012)
+====================================

 Bug Fixes
 ---------
--- a/README.markdown
+++ b/README.markdown
@@ -40,11 +40,11 @@ known to work reliably, i.e.:

 (only DomUs tested)

-* Dapper Drake 6.06
-* Edgy Eft 6.10
+* Dapper Drake 6.06 (needs editing of `/usr/share/debootstrap/scripts/dapper` since at least debootstrap version 1.0.37, see [#659360][1])
+* Edgy Eft 6.10 (needs editing of `/usr/share/debootstrap/scripts/edgy` since at least debootstrap version 1.0.37, see [#659360][1])
 * Feisty Fawn 7.04
 * Gutsy Gibbon 7.10
-* Hardy Heron 8.04 (see [1][])
+* Hardy Heron 8.04 (see [Installing Ubuntu 8.04 as DomU][2])
 * Interpid Ibex 8.10
 * Jaunty Jackaplope 9.04
 * Karmic Koala 9.10
@@ -56,10 +56,11 @@ known to work reliably, i.e.:
 * Quantal Quetzal 12.10
 * Raring Ringtail 13.04 (preliminary support as it's not yet available)

-[1]: http://www.linux-vserver.org/Installing_Ubuntu_8.04_Hardy_as_guest
-"There is an issue with debootstrap on hardy not installing ksyslogd
-This can be fixed by chrooting into the newly installed system and
-removing the startup scripts."
+[1]: http://bugs.debian.org/659360
+    "debootstrap in Wheezy can no more build Ubuntu Edgy or earlier"
+
+[2]: http://www.linux-vserver.org/Installing_Ubuntu_8.04_Hardy_as_guest
+    "There is an issue with debootstrap on hardy not installing ksyslogd."

 ### CentOS

--- a/TODO.markdown
+++ b/TODO.markdown
@@ -3,12 +3,6 @@ TODO

 See KNOWN_BUGS.markdown 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
 ---------------------------------------

@@ -181,6 +175,25 @@ Bugs to fix and features to add for 5.0

 * Use `Perl::Critic`

+* Refactor the different Ubuntu hooks directories so that only one
+  ubuntu hooks directory is left.
+
+  Then also refactor TLS disabling so that it works on all
+  distributions the same. Currently Debian is a special case and
+  Ubuntu half a special case.
+
+* Replace findBinary() with File::Which
+
+* Remove from the (unused) Xen::Tools what's already in the used
+  Xen::Tools::Common.
+
+* Add test for `--size` constraints (upper- and lowercase letters,
+  with and without `B`, etc.)
+
+  * Needs a `--dry-run` or `--check-constraints` option in
+    `xen-create-image` first. Which probably both would be a good
+    idea.
+
 Stuff from Steve's TODO list / Generic TODOs
 --------------------------------------------

@@ -188,6 +201,9 @@ Stuff from Steve's TODO list / Generic TODOs

 * `xen-delete-image` should unallocate any used IP addresses.

+* `installGentooPackage` in `hooks/common.sh` is a stub and does
+  nothing yet.
+
 Axel's Break-Backwards-Compatibility Wishlist
 ---------------------------------------------

@@ -223,3 +239,9 @@ Axel's Break-Backwards-Compatibility Wishlist
  Maybe add some `--autostart` or such.

 * Maybe replace findBinary with File::Which
+
+* MAC addresses should no more depend on the distribution.
+
+* Let the admin switch between MAC addresses based on XenSource's OUI,
+  its organisation's own OUI or locally administrated MAC addresses.
+  See also http://wiki.xen.org/wiki/Xen_Networking#MAC_addresses
--- a/bin/xen-create-image
+++ b/bin/xen-create-image
@@ -8,35 +8,49 @@ xen-create-image - Easily create new Xen instances with networking and OpenSSH.

 =head1 SYNOPSIS

+xen-create-image --hostname=<hostname> <further options>
+
+=head1 EXAMPLES
+
+xen-create-image --hostname=some-domu --dist=wheezy --lvm=vg0
+
+xen-create-image --hostname=some-domu --dist=precise --dir=/srv/xen
+
+See below for more specific examples: LOOPBACK EXAMPLES, LVM EXAMPLE
+and EVMS EXAMPLE.
+
+=head1 OPTIONS

  Help Options:

-   --help       Show the help information for this script.
+   --help        Show the help information for this script.

-   --manual     Read the manual, and examples, for this script.
+   --manual      Read the manual, and examples, for this script.

-   --verbose    Show useful debugging information.
+   --(no)verbose (Don't) show more of what xen-create-image is
+                 currently doing.

-   --dumpconfig Show current configuration.
+   --dumpconfig  Show current configuration.

-   --version    Show the version number and exit.
+   --version     Show the version number and exit.



  Size / General options:

-   --accounts   Copy all non-system accounts to the guest image
+   --(no)accounts
+                (Don't) copy all non-system accounts to the guest
+                image

   --admins     Specify that some administrators should be created for
                this image, using xen-shell.

-   --boot       Boot the new instance after creating it.
+   --(no)boot   (Don't) boot the new instance after creating it.

   --cache=bool Cache .deb files on the host when installing the new
                guest with the debootstrap tool. Accepted values:
                "yes" (default) and "no".

-
   --cachedir=/path/to/cache/directory
                Override the default .deb cache directory. Defaults to
                /var/cache/apt/archives/ if it exists (i.e. on Debian
@@ -47,7 +61,9 @@ xen-create-image - Easily create new Xen instances with networking and OpenSSH.
                Read the specified file in addition to the global
                configuration file.

-   --copyhosts  Copy entries from the dom0's /etc/hosts file to the guest
+   --(no)copyhosts
+                (Don't) copy entries from the dom0's /etc/hosts file
+                to the guest

   --copy-cmd   NOP:  Ignored.

@@ -57,60 +73,64 @@ xen-create-image - Easily create new Xen instances with networking and OpenSSH.
                installed. Specifying the path is optional.

   --disk_device=diskname
-                Use specified device name for virtual devices instead of
-                the default value "xvda".
+                Use specified device name for virtual devices instead
+                of the default value "xvda".

   --extension=ext
                Specify the suffix to give the Xen configuration
                file. (Default value: ".cfg")

-   --force      Force overwriting existing images. This will remove
-                existing images or LVM volumes which match those which
-                are liable to be used by the new invocation.
+   --(no)force  (Don't) force overwriting existing images. This will
+                remove existing images or LVM volumes which match
+                those which are liable to be used by the new
+                invocation.

   --fs=fs      Specify the filesystem type to use for the new guest.
                Valid choices are 'ext2', 'ext3', 'ext4', 'reiserfs',
-                'xfs' or 'btrfs'. (Note: pygrub *DOES NOT* support xfs)
+                'xfs' or 'btrfs'. (Note: pygrub *DOES NOT* support
+                xfs)

-   --genpass=1  Generate a random root password (default, set to 0 to turn off)
+   --genpass=1  Generate a random root password (default, set to 0 to
+                turn off)

   --genpass_len=N
-                Override the default password length of 8 and generate a
-                random password of length N. Note: this only works in
-                conjunction with --genpass
+                Override the default password length of 8 and generate
+                a random password of length N. Note: this only works
+                in conjunction with --genpass

   --hash_method=algorithm
-                Override the default hashing method of sha256 and use the
-                provided algorithm. Can be : md5, sha256 or sha512
+                Override the default hashing method of sha256 and use
+                the provided algorithm. Can be : md5, sha256 or sha512

   --hooks=1    Specify whether to run hooks after the image is created.

   --ide        Use IDE names for virtual devices (i.e. hda not xvda)

-   --image=str  Specify whether to create "sparse" or "full" disk images.
-                Full images are mandatory when using LVM, so this setting
-                is ignored in that case.
+   --image=str  Specify whether to create "sparse" or "full" disk
+                images.  Full images are mandatory when using LVM, so
+                this setting is ignored in that case.

   --image-dev=/path/to/device
                Specify a physical/logical volume for the disk image.

   --initrd=/path/to/initrd
-                Specify the initial ramdisk. If an image is specified it
-                must exist.
+                Specify the initial ramdisk. If an image is specified
+                it must exist.

   --install=1  Specify whether to install the guest system or not.

-   --keep       Don't delete our images if installation fails.
+   --(no)keep   (Don't) keep our images if installation fails. It
+                maybe unmounted, though.

   --kernel=/path/to/kernel
                Set the path to the kernel to use for domU. If a
                kernel is specified it must exist.

   --memory=size
-                Setup the amount of memory allocated to the new instance.
-                As suffix recognized size units are "M", "MB", "G" and
-                "GB" (case does not matter). If there's no unit given,
-                megabytes are assumed.
+                Setup the amount of memory allocated to the new
+                instance.  As suffix recognized size units are "M",
+                "MB", "G" and "GB" (case does not matter). If there's
+                no unit given, megabytes are assumed.

   --modules=/path/to/modules
                Set the path to the kernel modules to use for domU.
@@ -125,9 +145,8 @@ xen-create-image - Easily create new Xen instances with networking and OpenSSH.
   --no-xen-ok  Don't complain if xen seems not installed or xend is
                not running. (Needed for the testsuite.)

-   --output=dir Specify the output directory to create the xen configuration
-                file within.
-
+   --output=dir Specify the output directory to create the xen
+                configuration file within.

   --partitions=file
                Use a specific partition layout configuration file.
@@ -140,23 +159,23 @@ xen-create-image - Easily create new Xen instances with networking and OpenSSH.
   --password=passphrase
                Set the root password for the new guest.

-   --passwd     Ask for a root password interactively during setup.
-                NOTE:  This overrides --genpass --password
+   --(no)passwd (Don't) ask for a root password interactively during
+                setup.  NOTE: This overrides --genpass --password.

-   --pygrub     DomU should be booted using pygrub.
+   --(no)pygrub DomU should (not) be booted using pygrub.

-   --role=role  Run the specified role script(s) post-install.
-                Role scripts are discussed later in this manpage.
-                Can be an absolute path. Otherwise it's relative to the
-                value of --roledir.
+   --role=role  Run the specified role script(s) post-install.  Role
+                scripts are discussed later in this manpage.  Can be
+                an absolute path. Otherwise it's relative to the value
+                of --roledir.

   --role-args="--arg1 --arg2"
                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.
+                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.
@@ -183,20 +202,22 @@ xen-create-image - Easily create new Xen instances with networking and OpenSSH.
                beforehand.

   --vcpus=num
-                Set the number of vcpus that the new instance will have
-                instead of the default value of "1".
+                Set the number of vcpus that the new instance will
+                have instead of the default value of "1".
+


  Installation options:

-   --arch=arch  Pass the given architecture to debootstrap, rinse,
-                or rpmstrap when installing the system.  This argument
-                is ignored for other install methods.
+   --arch=arch  Pass the given architecture to debootstrap, rinse, or
+                rpmstrap when installing the system.  This argument is
+                ignored for other install methods.

   --dist=dist  Specify the distribution you wish to install.

   --install-method=method
-                Specify the installation method to use. Valid methods are:
+                Specify the installation method to use. Valid methods
+                are:

                * debootstrap
                * cdebootstrap
@@ -214,12 +235,13 @@ xen-create-image - Easily create new Xen instances with networking and OpenSSH.
   --mirror=url Setup the mirror to use when installing via
                debootstrap. (Default value: mirror used in
                /etc/apt/sources.list or for Debian
-                "http://cdn.debian.net/debian/" and for Ubuntu
+                "http://http.debian.net/debian/" and for Ubuntu
                "http://archive.ubuntu.com/ubuntu/")

-                The above mentioned Debian mirror hostname uses GeoIP
-                to choose a more or less close Debian mirror. See
-                http://wiki.debian.org/DebianGeoMirror for details.
+                The above mentioned Debian mirror hostname
+                automatically tries to choose a more or less close
+                Debian mirror. See http://http.debian.net/ for
+                details.

   --apt_proxy=url
                Specify a proxy to be used by debootstrap, and within
@@ -234,15 +256,15 @@ xen-create-image - Easily create new Xen instances with networking and OpenSSH.
  Networking options:

   --bridge=brname
-                Optionally, set a specific bridge for the new instance.
-                This can be especially useful when running multiple
-                bridges on a dom0.
+                Optionally, set a specific bridge for the new
+                instance.  This can be especially useful when running
+                multiple bridges on a dom0.

   --broadcast=123.456.789.ABC
                Setup the broadcast address for the new instance.

-   --dhcp       The guest will be configured to fetch its networking
-                details via DHCP.
+   --(no)dhcp   The guest will (not) be configured to fetch its
+                networking details via DHCP.

   --gateway=gw Setup the network gateway for the new instance.

@@ -252,8 +274,9 @@ xen-create-image - Easily create new Xen instances with networking and OpenSSH.
                one is setup as the "system" IP, and the additional
                ones are added as aliases.

-                Note that Xen 3.x supports a maximum of three vif statements
-                per guest. This option conflicts with --dhcp.
+                Note that Xen 3.x supports a maximum of three vif
+                statements per guest. This option conflicts with
+                --dhcp.

   --mac=AA:BB:CC:DD:EE:FF
                Specify the MAC address to use for a given interface.
@@ -267,26 +290,31 @@ xen-create-image - Easily create new Xen instances with networking and OpenSSH.

   --nameserver="123.456.789.ABC 123.456.789.DEF"
                Setup the nameserver of the machine, multiple space
-                separated nameservers are allowed.
-                If not provided, Dom0's /etc/resolv.conf will be copied
-                to guest.
+                separated nameservers are allowed.  If not provided,
+                Dom0's /etc/resolv.conf will be copied to guest.

   --vifname=vifname
-                Optionally, set a specific vif name for the new instance.
+                Optionally, set a specific vif name for the new
+                instance.
+


  Mandatory options:

   --dir=/path/to/directory
+
                Specify where the output images should go.
-                Subdirectories will be created for each guest
-                If you do not wish to use loopback images specify --lvm
-                or --evms.  (These three options are mutually exclusive.)
+                Subdirectories will be created for each guest.
+
+                If you do not wish to use loopback images specify
+                --lvm or --evms.  (These three options are mutually
+                exclusive.)

   --evms=lvm2/container
-                Specify the container to save images within, i.e. '--evms
-                lvm2/mycontainer'.  If you do not wish to use EVMS specify
-                --dir or --lvm.  (These three options are mutually exclusive.)
+                Specify the container to save images within,
+                i.e. '--evms lvm2/mycontainer'.  If you do not wish to
+                use EVMS specify --dir or --lvm.  (These three options
+                are mutually exclusive.)

   --hostname=host.example.org
                Set the hostname of the new guest system.  Ideally
@@ -769,7 +797,7 @@ Install an X11 server, using VNC and XDM

 =head1 LICENSE

-Copyright (c) 2005-2009 by Steve Kemp, (c) 2010-2012 by The Xen-Tools
+Copyright (c) 2005-2009 by Steve Kemp, (c) 2010-2013 by The Xen-Tools
 Development Team. All rights reserved.

 This module is free software;
@@ -779,6 +807,7 @@ The LICENSE file contains the full text of the license.

 =cut

+$SIG{INT} = \&clean_up;

 use strict;
 use English;
@@ -787,6 +816,7 @@ use Env;
 use File::Path qw/ mkpath /;
 use File::Temp qw/ tempdir /;
 use File::Copy qw/ mv cp /;
+use File::Which;
 use Getopt::Long;
 use Pod::Usage;
 use Data::Dumper;
@@ -1048,7 +1078,7 @@ if ( $CONFIG{ 'install' } )
    #
    if ( !-x $MOUNT_POINT . "/bin/ls" )
    {
-        logprint("System installation failed.  Aborting\n");
+        logprint("System installation failed: /bin/ls missing.  Aborting.\n");
        $CONFIG{'FAIL'} = 1;
        exit 127;
    }
@@ -1320,10 +1350,10 @@ sub setupDefaultOptions

    # Initialize per distribution mirror defaults: Debian
    foreach my $debdist (qw(squeeze wheezy jessie sid testing oldstable stable unstable)) {
-        $CONFIG{ 'mirror_'.$debdist } = $CONFIG{ 'mirror' }
+        $CONFIG{ 'mirror_'.$debdist } = 'http://http.debian.net/debian';
    }
    foreach my $debdist (qw(sarge etch lenny)) {
-        $CONFIG{ 'mirror_'.$debdist } = 'http://archive.debian.org/debian';
+        $CONFIG{ 'mirror_'.$debdist } = 'http://http.debian.net/debian-archive/debian';
    }
    # Initialize per distribution mirror defaults: Ubuntu
    foreach my $ubuntudist (qw(hardy lucid oneiric precise quantal raring)) {
@@ -1333,7 +1363,9 @@ sub setupDefaultOptions
        $CONFIG{ 'mirror_'.$ubuntudist } = 'http://old-releases.ubuntu.com/ubuntu';
    }
    $CONFIG{ 'apt_proxy' }     = '';
-    $CONFIG{ 'arch' }          = '';
+    $CONFIG{ 'arch' }          =
+        which('dpkg') ? `dpkg --print-architecture` : '';
+    chomp($CONFIG{ 'arch' });
    $CONFIG{ 'fs' }            = 'ext3';
    $CONFIG{ 'force' }         = 0;
    $CONFIG{ 'no_xen_ok' }     = 0;
@@ -1417,13 +1449,13 @@ sub checkOption
    # Define argument types
    my %types = (
        integerWithSuffix => {
-            check   => qr/^[0-9.]+[GgMmKk]b?$/,
-            message => "takes a suffixed integer.\n",
+            check   => qr/^[0-9.]+[GMk]B?$/i,
+            message => "takes a suffixed (mb, MB, G, k, etc.) integer.\n",
        },
        distribution => {
-            check   => sub { -d "/usr/lib/xen-tools/$_[0].d" },
+            check   => sub { -d "/usr/share/xen-tools/$_[0].d" },
            message => "takes a distribution name " .
-                       "(see /usr/lib/xen-tools for valid values).\n",
+                       "(see /usr/share/xen-tools for valid values).\n",
        },
        imageType => {
            check   => qr/^sparse|full$/,
@@ -1609,14 +1641,14 @@ sub parseCommandLineArguments
            "disk_device=s", \&checkOption,

            # Hosts options
-            "nohosts",   \$CONFIG{ 'nohosts' },
-            "copyhosts", \$CONFIG{ 'copyhosts' },
+            "nohosts",     \$CONFIG{ 'nohosts' },
+            "copyhosts!",  \$CONFIG{ 'copyhosts' },
            # Deprecated legacy options for backwards compatibility
-            "no-hosts",   \$CONFIG{ 'nohosts' },
-            "copy-hosts", \$CONFIG{ 'copyhosts' },
+            "no-hosts",    \$CONFIG{ 'nohosts' },
+            "copy-hosts!", \$CONFIG{ 'copyhosts' },

            # Networking options
-            "dhcp",         \$CONFIG{ 'dhcp' },
+            "dhcp!",        \$CONFIG{ 'dhcp' },
            "bridge=s",     \&checkOption,
            "gateway=s",    \&checkOption,
            "hostname=s",   \&checkOption,
@@ -1637,11 +1669,11 @@ sub parseCommandLineArguments
            "debootstrap-cmd=s", \$CONFIG{ 'debootstrap-cmd' },

            # Misc. options
-            "accounts",     \$CONFIG{ 'accounts' },
+            "accounts!",    \$CONFIG{ 'accounts' },
            "admins=s",     \&checkOption,
            "arch=s",       \&checkOption,
            "fs=s",         \&checkOption,
-            "boot",         \$CONFIG{ 'boot' },
+            "boot!",        \$CONFIG{ 'boot' },
            "cache=s",      \&checkOption,
            "cachedir=s",   \&checkOption,
            "config=s",     \&checkOption,
@@ -1649,8 +1681,8 @@ sub parseCommandLineArguments
            "scsi",         \$CONFIG{ 'scsi' },
            "install=i",    \&checkOption,
            "hooks=i",      \&checkOption,
-            "pygrub",       \$CONFIG{ 'pygrub' },
-            "passwd",       \$CONFIG{ 'passwd' },
+            "pygrub!",      \$CONFIG{ 'pygrub' },
+            "passwd!",      \$CONFIG{ 'passwd' },
            "genpass=i",    \&checkOption,
            "genpass-len=i", \&checkOption,
            "genpass_len=i", \&checkOption,
@@ -1661,20 +1693,20 @@ sub parseCommandLineArguments
            "role-args=s",  \&checkOption,
            "finalrole=s",       \&checkOption,
            "roledir=s",    \&checkOption,
-            "force",        \$CONFIG{ 'force' },
+            "force!",       \$CONFIG{ 'force' },
            "no-xen-ok",    \$CONFIG{ 'no_xen_ok' },
-            "keep",         \$CONFIG{ 'keep' },
+            "keep!",        \$CONFIG{ 'keep' },
            "template=s",   \&checkOption,
            "output=s",     \&checkOption,
-            "extension=s",  \&checkOption,
+            "extension:s",  \&checkOption,
            "dontformat",   \&checkOption,

            # Help options
-            "debug",      \$CONFIG{ 'debug' },
+            "debug!",     \$CONFIG{ 'debug' },
            "help",       \$HELP,
            "manual",     \$MANUAL,
            "dumpconfig", \$DUMPCONFIG,
-            "verbose",    \$CONFIG{ 'verbose' },
+            "verbose!",   \$CONFIG{ 'verbose' },
            "version",    \$VERSION
        ) )
    {
@@ -1823,9 +1855,10 @@ sub checkArguments
    #
    if ( $CONFIG{ 'dist' } =~ /sarge/ and
         $CONFIG{ 'arch' } =~ /amd64/ and
-         $CONFIG{ 'mirror_sarge' } eq 'http://archive.debian.org/debian' )
+         $CONFIG{ 'mirror_sarge' } =~ m(/debian-archive/debian/?$))
    {
-        $CONFIG{ 'mirror_sarge' } = 'http://archive.debian.org/debian-amd64';
+        $CONFIG{ 'mirror_sarge' } =~
+            s(/debian-archive/debian/?)(/debian-archive/debian-amd64);
    }

    #
@@ -3516,15 +3549,6 @@ sub installSystem
 sub exportEnvironment
 {

-    #
-    #  Per-distribution mirror?
-    #
-    my $distMirror = "mirror_" . $CONFIG{ 'dist' };
-    if ( $CONFIG{ $distMirror } && length( $CONFIG{ $distMirror } ) )
-    {
-        $CONFIG{ 'mirror' } = $CONFIG{ $distMirror };
-    }
-
    #
    # Export partitions array to configuration
    #
@@ -3534,7 +3558,9 @@ sub exportEnvironment
    {
        if ( defined( $CONFIG{ $key } ) )
        {
-            $ENV{ $key } = $CONFIG{ $key };
+            my $envkey = $key;
+            $envkey =~ s/-/_/g;
+            $ENV{ $envkey } = $CONFIG{ $key };
        }
    }
 }
@@ -4029,13 +4055,13 @@ sub generatePassword {

 sub unMountImage
 {
-    my ($point) = (@_);
+    my ($point, $fail_ok) = (@_);

    #
    #  First we unmount /proc and /dev/pts in the guest install.
    #
-    runCommand("umount $point/proc", \%CONFIG);
-    #runCommand("umount $point/dev/pts", \%CONFIG);
+    runCommand("umount $point/proc", \%CONFIG, $fail_ok);
+    #runCommand("umount $point/dev/pts", \%CONFIG, $fail_ok);

    #
    #  Open /proc/mount and get a list of currently mounted paths
@@ -4072,7 +4098,7 @@ sub unMountImage
    foreach my $path (@points)
    {
        $CONFIG{ 'verbose' } && print "Unmounting : $path\n";
-        runCommand("umount $path", \%CONFIG);
+        runCommand("umount $path", \%CONFIG, $fail_ok);
    }

    $MOUNT_POINT = undef;
@@ -4088,9 +4114,19 @@ sub unMountImage

 =cut

-sub END
+sub clean_up () {
+    if ( defined($MOUNT_POINT) )
+    {
+        unMountImage($MOUNT_POINT, 1);
+    }
+}
+
+END
 {
-    exit 0 if $VERSION || $HELP || $MANUAL || $DUMPCONFIG;
+    # Capture exit code
+    my $exitcode = $?;
+
+    exit $exitcode if $VERSION || $HELP || $MANUAL || $DUMPCONFIG;

    my $host_rsa_key = '';
    #
@@ -4108,7 +4144,7 @@ sub END
        } else {
            $host_rsa_key = "N/A";
        }
-        unMountImage($MOUNT_POINT);
+        unMountImage($MOUNT_POINT, $CONFIG{'FAIL'});
    }

    #
@@ -4117,14 +4153,6 @@ sub END
    #
    if ( $CONFIG{ 'boot' } and !$CONFIG{'FAIL'} )
    {
-
-        #
-        #  Unmount the image and any subsequent mounts.
-        #
-        if ( defined($MOUNT_POINT) ) {
-            unMountImage($MOUNT_POINT);
-        }
-
        #
        #  If there is an /etc/xen/auto directory then link in the
        # domain so that it will automatically restart, if it isn't
@@ -4188,7 +4216,7 @@ sub END
    #  $CONFIG{'FAIL'} = 0  -  Success
    #  $CONFIG{'FAIL'} = 1  -  Failed to install, delete the image
    #  $CONFIG{'FAIL'} = 2  -  Files exist, either .cfg or lvm... etc
-    if ( ($CONFIG{'FAIL'} == 1 or $CONFIG{'FAIL'} == 1) && ( !$CONFIG{ 'keep' } ) )
+    if ( $CONFIG{'FAIL'} == 1 && ( !$CONFIG{ 'keep' } ) )
    {

        #
@@ -4238,4 +4266,6 @@ sub END
        }
        logprint("\n");
    }
+
+    exit $exitcode;
 }
--- a/bin/xen-delete-image
+++ b/bin/xen-delete-image
@@ -8,6 +8,10 @@ xen-delete-image - Delete previously created Xen instances.

  xen-delete-image [options] [--hostname=]imageName1 [--hostname=]imageName2

+  Filename Options:
+   --extension  Specify the file extension to use. An empty extension is equal
+                to any extension.
+
  Help Options:
   --help     Show help information.
   --manual   Read the manual for this script.
@@ -142,7 +146,7 @@ Show the version number and exit.

 =head1 LICENSE

-Copyright (c) 2005-2009 by Steve Kemp, (c) 2010 by The Xen-Tools
+Copyright (c) 2005-2009 by Steve Kemp, (c) 2010-2013 by The Xen-Tools
 Development Team. All rights reserved.

 This module is free software;
@@ -181,6 +185,11 @@ my $RELEASE = '4.4~dev';
 #
 $CONFIG{ 'xm' } = findXenToolstack();

+#
+#  Default values
+#
+$CONFIG{ 'extension' } = '.cfg';
+

 #
 # Read the global configuration file if it exists.
@@ -223,27 +232,21 @@ E_O_ROOT

 #
 #  Loop over the supplied arguments, and attempt to delete each
-# image.
+# image. Check both, bare parameters as well as --hostname options.
 #
-while ( my $name = shift )
-{
-    if ( $CONFIG{ 'no_xen_ok' } or !xenRunning($name, \%CONFIG) )
-    {
-        deleteXenImage($name);
-    }
-    else
-    {
-        print "Skipping xen guest '$name' - it appears to be running.\n";
-    }
+
+my @hosts = ();
+if (exists($CONFIG{ 'hostname' }) and defined($CONFIG{ 'hostname' })) {
+    my $hostname_option = $CONFIG{ 'hostname' };
+    @hosts = 'ARRAY' eq ref($hostname_option) ?
+        @$hostname_option : $hostname_option;
 }

-#
-#  Also delete any which were specified using the --hostname flag
-#
-my $hosts = $CONFIG{ 'hostname' };
-foreach my $name (@$hosts)
+foreach my $name (@ARGV, @hosts)
 {
-    if ( $CONFIG{ 'no_xen_ok' } or !xenRunning($name, \%CONFIG) )
+    my %PER_HOST_CONFIG = %CONFIG;
+    $PER_HOST_CONFIG{ 'hostname' } = $name;
+    if ( $CONFIG{ 'no_xen_ok' } or !xenRunning($name, \%PER_HOST_CONFIG) )
    {
        deleteXenImage($name);
    }
@@ -282,6 +285,7 @@ sub parseCommandLineArguments
                "dry-run",     \$CONFIG{ 'dry-run' },
                "lvm=s",       \$CONFIG{ 'lvm' },
                "evms=s",      \$CONFIG{ 'evms' },
+                "extension:s", \$CONFIG{ 'extension' },
                "hostname=s@", \$CONFIG{ 'hostname' },
                "test",        \$CONFIG{ 'test' },
                "verbose",     \$CONFIG{ 'verbose' },
@@ -371,17 +375,17 @@ sub deleteXenImage
    #
    #  Delete the Xen auto-start file if it exists.
    #
-    if ( -e "/etc/xen/auto/$hostname.cfg" )
+    if ( -e "/etc/xen/auto/$hostname".$CONFIG{ 'extension' } )
    {
-        push( @delete, "/etc/xen/auto/$hostname.cfg" );
+        push( @delete, "/etc/xen/auto/$hostname".$CONFIG{ 'extension' } );
    }

    #
    #  Delete the Xen configuration file if it exists.
    #
-    if ( -e "/etc/xen/$hostname.cfg" )
+    if ( -e "/etc/xen/$hostname".$CONFIG{ 'extension' } )
    {
-        push( @delete, "/etc/xen/$hostname.cfg" );
+        push( @delete, "/etc/xen/$hostname".$CONFIG{ 'extension' } );
    }

    #
@@ -404,7 +408,8 @@ sub deleteXenImage
        }
    }

-
+    my %PER_HOST_CONFIG = %CONFIG;
+    $PER_HOST_CONFIG{ 'hostname' } = $hostname;
    if ( defined( $CONFIG{ 'dir' } ) )
    {
        my $prefix = $CONFIG{ 'dir' } . "/domains/";
@@ -438,7 +443,7 @@ sub deleteXenImage
                print "Would remove LVM swap volume /dev/$CONFIG{'lvm'}/$hostname-swap\n";
            } else {
                print "Removing swap volume\n";
-                runCommand("lvremove /dev/$CONFIG{'lvm'}/$hostname-swap --force", \%CONFIG);
+                runCommand("lvremove /dev/$CONFIG{'lvm'}/$hostname-swap --force", \%PER_HOST_CONFIG);
            }
        }

@@ -448,7 +453,7 @@ sub deleteXenImage
                print "Would remove LVM disk volume /dev/$CONFIG{'lvm'}/$hostname-disk\n";
            } else {
                print "Removing LVM disk volume\n";
-                runCommand("lvremove /dev/$CONFIG{'lvm'}/$hostname-disk --force", \%CONFIG);
+                runCommand("lvremove /dev/$CONFIG{'lvm'}/$hostname-disk --force", \%PER_HOST_CONFIG);
            }
        }

@@ -470,8 +475,8 @@ sub deleteXenImage
                print "Would remove EVMS swap volume: $CONFIG{'evms'}/$hostname-swap\n";
            } else {
                print "Removing EVMS swap volume\n";
-                runCommand("echo Delete : /dev/evms/$hostname-swap | evms", \%CONFIG);
-                runCommand("echo Delete : $CONFIG{'evms'}/$hostname-swap | evms", \%CONFIG);
+                runCommand("echo Delete : /dev/evms/$hostname-swap | evms", \%PER_HOST_CONFIG);
+                runCommand("echo Delete : $CONFIG{'evms'}/$hostname-swap | evms", \%PER_HOST_CONFIG);
            }
        }

@@ -482,8 +487,8 @@ sub deleteXenImage
                print "Would remove EVMS disk volume: $CONFIG{'evms'}/$hostname-swap\n";
            } else {
                print "Removing EVMS disk volume\n";
-                runCommand("echo Delete : /dev/evms/$hostname-disk | evms", \%CONFIG);
-                runCommand("echo Delete : $CONFIG{'evms'}/$hostname-disk | evms", \%CONFIG);
+                runCommand("echo Delete : /dev/evms/$hostname-disk | evms", \%PER_HOST_CONFIG);
+                runCommand("echo Delete : $CONFIG{'evms'}/$hostname-disk | evms", \%PER_HOST_CONFIG);
            }
        }

--- a/bin/xen-list-images
+++ b/bin/xen-list-images
@@ -8,6 +8,10 @@ xen-list-images - List all the created and configured Xen images.

  xen-list-image [options]

+  Filename Options:
+   --extension  Specify the file extension to use. An empty extension is equal
+                to any extension.
+
  Help Options:
   --help     Show this scripts help information.
   --manual   Read this scripts manual.
@@ -67,7 +71,7 @@ Show the version number and exit.

 =head1 LICENSE

-Copyright (c) 2005-2009 by Steve Kemp, (c) 2010 by The Xen-Tools
+Copyright (c) 2005-2009 by Steve Kemp, (c) 2010-2013 by The Xen-Tools
 Development Team. All rights reserved.

 This module is free software;
@@ -95,9 +99,10 @@ use Xen::Tools::Common;
 my %CONFIG;

 #
-#  Default prefix
+#  Default values
 #
 $CONFIG{ 'prefix' } = "/etc/xen";
+$CONFIG{ 'extension' } = '.cfg';

 #
 # Release number.
@@ -162,6 +167,7 @@ sub parseCommandLineArguments
    #  Parse options.
    #
    GetOptions( "test=s", \$CONFIG{ 'prefix' },
+                "extension:s", \$CONFIG{ 'extension' },
                "help", \$HELP,
                "manual", \$MANUAL,
                "version", \$VERSION );
@@ -192,9 +198,12 @@ sub findXenInstances
 {
    my @found;

-    foreach my $file ( sort( glob( $CONFIG{ 'prefix' } . "/*.cfg" ) ) )
+    foreach my $file ( sort( glob( $CONFIG{ 'prefix' } . "/*" . $CONFIG{ 'extension' } ) ) )
    {
-        push @found, $file if ( -e $file );
+        push @found, $file if (
+            -f $file and
+            $file !~ m(~$|\.dpkg-[a-z]+$|\.sxp$|/xl\.conf$)
+            );
    }

    return (@found);
@@ -259,6 +268,7 @@ sub displayInstance
    print "Memory: $mem\n";
    print "IP: " . $ip . $mac . "\n" if length($ip);
    print "DHCP" . $mac . "\n" if $dhcp;
+    print "Config: $file\n";
 }


--- a/bin/xt-create-xen-config
+++ b/bin/xt-create-xen-config
@@ -215,7 +215,7 @@ sub parseCommandLineArguments
    #
    GetOptions( "admins=s",    \$ENV{ 'admins' },
                "output=s",    \$CONFIG{ 'output' },
-                "extension=s", \$CONFIG{ 'extension' },
+                "extension:s", \$CONFIG{ 'extension' },
                "template=s",  \$CONFIG{ 'template' },
                "verbose",     \$CONFIG{ 'verbose' },
                "help",        \$HELP,
@@ -398,13 +398,13 @@ sub createXenConfig
        $ENV{ 'image_suffix' } = '';
        importPartitionsFromEnvironment();
    }
-    elsif ( $ENV{ 'image-dev' } )
+    elsif ( $ENV{ 'image_dev' } )
    {
-        $ENV{ 'image_vbd' } = "phy:$ENV{'image-dev'}";
+        $ENV{ 'image_vbd' } = "phy:$ENV{'image_dev'}";

-        if ( $ENV{ 'swap-dev' } )
+        if ( $ENV{ 'swap_dev' } )
        {
-            $ENV{ 'swap_vbd' } = "phy:$ENV{'swap-dev'}";
+            $ENV{ 'swap_vbd' } = "phy:$ENV{'swap_dev'}";
        }
        else
        {
--- a/bin/xt-customize-image
+++ b/bin/xt-customize-image
@@ -54,7 +54,7 @@ xt-customize-image - Customize a freshly installed copy of GNU/Linux
 the --location option.

  For the distribution named 'foo' the scripts will be loaded and
- executed from '/usr/lib/xen-tools/foo.d'.  Each executable will
+ executed from '/usr/share/xen-tools/foo.d'.  Each executable will
 be loaded and executed in sorted order.

 =cut
@@ -215,7 +215,7 @@ sub checkArguments
    #  If there are no scripts then we clearly cannot
    # customise it!
    #
-    my $dir = "/usr/lib/xen-tools/" . $CONFIG{ 'dist' } . ".d";
+    my $dir = "/usr/share/xen-tools/" . $CONFIG{ 'dist' } . ".d";

    if ( !-d $dir )
    {
@@ -257,7 +257,7 @@ sub runDistributionHooks
    #
    #  Hook directory.
    #
-    my $hooks = "/usr/lib/xen-tools/" . $CONFIG{ 'dist' } . ".d/";
+    my $hooks = "/usr/share/xen-tools/" . $CONFIG{ 'dist' } . ".d/";

    #
    #  Installation prefix
--- a/bin/xt-guess-suite-and-mirror
+++ b/bin/xt-guess-suite-and-mirror
@@ -55,9 +55,9 @@ full text of the license.
 # Fallback to Debian or Ubuntu in case we can't find anything
 my $fallback = 'Debian';

-# Which mirrors to use if everything else fails (cdn.debian.net uses
-# GeoIP, see http://wiki.debian.org/DebianGeoMirror)
-my %fallback_mirror = ( Debian => 'http://cdn.debian.net/debian/',
+# Which mirrors to use if everything else fails (http.debian.net
+# redirects to a working mirror nearby)
+my %fallback_mirror = ( Debian => 'http://http.debian.net/debian/',
                        Ubuntu => 'http://archive.ubuntu.com/ubuntu/' );

 # Which suite to use if everything else fails. For Debian "stable"
--- a/bin/xt-install-image
+++ b/bin/xt-install-image
@@ -133,13 +133,19 @@ my $RELEASE = '4.4~dev';
 #  needDirectory Defined if we need an install-source directory specified.
 #
 #
+my $debootstrap_cmd;
 my %dispatch = (
                 "copy" => { sub           => \&do_copy,
                             needBinary    => "/bin/cp",
                             needDirectory => 1,
                           },
                 "debootstrap" => { sub        => \&do_debootstrap,
-                                    needBinary => "/usr/sbin/debootstrap",
+                                    needBinary => ["/usr/sbin/debootstrap", "/usr/bin/cdebootstrap", "/usr/bin/cdebootstrap-static"],
+                                    var        => \$debootstrap_cmd,
+                                  },
+                 "cdebootstrap" => { sub        => \&do_debootstrap,
+                                     needBinary => ["/usr/sbin/cdebootstrap", "/usr/bin/cdebootstrap-static"],
+                                     var        => \$debootstrap_cmd,
                                  },
                 "rinse" => { sub        => \&do_rinse,
                              needBinary => "/usr/sbin/rinse",
@@ -210,13 +216,35 @@ if ( defined( $CONFIG{ 'install-method' } ) &&
        #

        # Do we need to test for a binary.
-        if ( ( $installer->{ 'needBinary' } ) &&
-             ( !-x $installer->{ 'needBinary' } ) )
-        {
-            print
-              "The following required binary for the installation was not found\n";
-            print "\t" . $installer->{ 'needBinary' } . "\n";
-            exit 1;
+        if ( $installer->{ 'needBinary' } ) {
+            if ( 'ARRAY' eq ref $installer->{ 'needBinary' } ) {
+                unless (ref $installer->{ 'var' }) {
+                    die "Assertion: If dispatch->->needBinary is an array ref, dispatch->->var must exist";
+                }
+
+                foreach my $binary (@{$installer->{ 'needBinary' }}) {
+                    if (-x $binary) {
+                        ${$installer->{ 'var' }} = $binary;
+                        last;
+                    }
+                }
+
+                unless ( ${$installer->{ 'var' }}  ) {
+                    print
+                        "One of the following binaries are required for the installation, but none was found\n";
+                    print "\t" . join(', ', @{$installer->{ 'needBinary' }}) . "\n";
+                    exit 1;
+                }
+            }
+            else
+            {
+                if ( !-x $installer->{ 'needBinary' } ) {
+                    print
+                        "The following required binary for the installation was not found\n";
+                    print "\t" . $installer->{ 'needBinary' } . "\n";
+                    exit 1;
+                }
+            }
        }

        # Do we need a directory specified as the installation source?
@@ -387,7 +415,7 @@ sub checkArguments
    #  If there are no scripts then we clearly cannot
    # customise it!
    #
-    my $dir = "/usr/lib/xen-tools/" . $CONFIG{ 'dist' } . ".d";
+    my $dir = "/usr/share/xen-tools/" . $CONFIG{ 'dist' } . ".d";

    if ( !-d $dir )
    {
@@ -572,21 +600,9 @@ sub do_debootstrap
    #  The command is a little configurable - mostly to allow you
    # to use cdebootstrap.
    #
-    my $cmd = $CONFIG{ 'debootstrap-cmd' };
+    my $cmd = $CONFIG{ 'debootstrap-cmd' } || $debootstrap_cmd;
+    print "Using $cmd as debootstrap command\n";
    my $cachedir = $CONFIG{ 'cachedir' };
-    if ( !$cmd )
-    {
-        if (-x '/usr/sbin/debootstrap') {
-            $cmd = '/usr/sbin/debootstrap';
-        } elsif (-x '/usr/sbin/cdebootstrap') {
-            $cmd = '/usr/sbin/cdebootstrap';
-        } else {
-            print STDERR "Found neither debootstrap nor cdebootstrap and no --debootstrap-cmd given\n";
-            exit 1;
-        }
-        print "Using $cmd as debootstrap command\n";
-    }
-

    #
    #  Cache from host -> new installation if we've got caching
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,18 @@
+xen-tools (4.4~dev-1) UNRELEASED; urgency=low
+
+  * Exported environment variables no more contain dashes ("-"). Dashes in
+    environment variable names are from now on converted to underscores
+    ("_") before being exported. May affect some hook or role scripts.
+
+  * /usr/lib/xen-tools/ has been moved to /usr/share/xen-tools/ to
+    properly adhere to FHS. In case you had local scripts added to
+    /usr/lib/xen-tools/, please move them to /usr/share/xen-tools/, too
+    and then remove /usr/lib/xen-tools/ and its left-over subdirectories
+    which all should be empty at that point, i.e. "rmdir -p
+    /usr/lib/xen-tools/*" should do the trick.
+
+ -- Axel Beckert <abe@debian.org>  Fri, 05 Apr 2013 20:19:02 +0200
+
 xen-tools (4.2~rc1-1) unstable; urgency=low

  By default, xen-create-image now generates a random root password and
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,24 +2,67 @@ xen-tools (4.4~dev-1) UNRELEASED; urgency=low

  * New upstream release
    - Code deduplication to unify the xen-*-image scripts
+    - Moves /usr/lib/xen-tools/ to /usr/share/xen-tools/
+    - Use http.debian.net as default Debian mirror if no mirror is given
+      and xt-guess-suite-and-mirror is not used.
    - Fix symbolic link hooks/centos-6/15-setup-arch (Closes: #690299)
    - Execute END block not on --version/--help/--manual (Closes: #684346)
    - Move code for --boot feature to END block. Fixes missing SSH
      fingerprint display if --boot was used. (Closes: #679183)
+    - Correctly handle aborts in END block. (Closes: #704882)
    - Use local parameter instead of global variable in unMountImage.
    - Also recognize "M" and "G" instead of "MB" and "GB" as size unit for
      --memory. (Closes: #691320) Document the recognized units.
    - Default DomUs to use the noop scheduler (Closes: #693131)
+    - Overwork TLS disabling on Debian and Ubuntu
+    - xen-list-images now also outputs the file name of the config file.
+    - xen-list-images and xen-delete-image now understand --extension.
+    - Fixes "--extension=" with empty parameter.
+    - Sarge amd64 case handle properly
    - Remove CVS revisions from --version output
    - Preliminary support for Debian Jessie and Ubuntu Raring
    - Preliminary support for xl toolstack
    - xen-create-image: Consistently use runCommand() instead of system()
+    - xt-install-image: Don't bail out if only cdebootstrap is installed
+      but not debootstrap (Thanks Elmar Heeb!)
+    - Makefile accepts DESTDIR=…
+    - Move examples from debian/examples to examples.
+    - Uses File::Which, added (build-) dependency on libfile-which-perl
+    - Knows about module-init-tools → kmod transition in wheezy/raring.
+    - Adds default mount options for ext4, identical to ext2/ext3.
+    - Ships /etc/initramfs-tools/conf.d/xen-tools for generating Dom0
+      initrds also suitable for DomU usage. Trigger update-initramfs.
+    - By default install linux-image-virtual instead of linux-image-server
+      on Ubuntu Intrepid and newer (Hopefully closes: #640099, LP #839492)
+    - Installs a legacy grub in all pygrub based Debian/Ubuntu DomUs to be
+      able to update the menu.list automatically.
+    - hooks/common.sh: installDebianPackage no more installs recommends.
+    - hooks/common.sh: Rename installCentOS4Package to installRPMPackage.
+      Add installCentOS4Package wrapper for backward compatibility.
+    - Fix filesystem tools installation in 91-install-fs-tools (which was
+      broken since 4.3~rc1-1) by merging 91-install-fs-tools back into
+      90-make-fstab. Also supports RPM-based distributions now.
+    - Fixes export of environment variables. Previously they could contain
+      dashes and then were only accessible from within Perl, but not from
+      within Bash.
+    - Fixes creation of "ARRAY(0x…).log" named log files.
+    - Makes some options (like --pygrub) negatable.
+    - Uses Test::NoTabs; add according build-dependency.
  * Add debian/gbp.conf to be able to to build xen-tools with
    git-buildpackage.
-  * Install (manually generated) upstream ChangeLog only if it
-    exists. Allows automatic builds from the git repository.
+  * Clean up debian/rules:
+    - Don't mention (generated) upstream changelog explicitly,
+      dh_installchangelogs finds it by itself if it exist. That way
+      building out of a freshly clone git repository does not fail due to
+      a missing upstream changelog.
+    - Use dh_auto_{install,clean}; use "$(MAKE)" instead of "make" where
+      dh_auto_* can't help. No more explicitly call "make manpages", it's
+      a depedency of "make install" in the next line anyway.
+    - Finally switch to a minimal dh style debian/rules.
+  * Bump copyright years in debian/copyright.
+  * Apply wrap-and-sort.

- -- Axel Beckert <abe@debian.org>  Tue, 13 Nov 2012 23:37:54 +0100
+ -- Axel Beckert <abe@debian.org>  Thu, 17 Jan 2013 17:09:02 +0100

 xen-tools (4.3.1-1) unstable; urgency=low

--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,16 @@ Source: xen-tools
 Section: utils
 Priority: extra
 Maintainer: Axel Beckert <abe@debian.org>
-Build-Depends: debhelper (>= 7.0.0), libtest-pod-perl, libtext-template-perl, libfile-slurp-perl, devscripts, libmoose-perl, libtest-pod-coverage-perl, git
+Build-Depends: debhelper (>= 7.0.0),
+               devscripts,
+               git,
+               libfile-slurp-perl,
+               libfile-which-perl,
+               libmoose-perl,
+               libtest-notabs-perl,
+               libtest-pod-coverage-perl,
+               libtest-pod-perl,
+               libtext-template-perl
 Standards-Version: 3.9.3
 Homepage: http://xen-tools.org/software/xen-tools
 Vcs-Browser: http://gitorious.org/xen-tools/xen-tools
@@ -10,9 +19,22 @@ 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}, openssh-client
-Recommends: xen-hypervisor-amd64 | xen-hypervisor-i386 | xen-hypervisor-i386-pae, rinse (>= 1.9.1-1), libexpect-perl, xen-utils
-Suggests: reiserfsprogs, xfsprogs, cfengine2, btrfs-tools
+Depends: debootstrap | cdebootstrap,
+         libconfig-inifiles-perl,
+         libfile-slurp-perl,
+         libfile-which-perl,
+         libtext-template-perl,
+         openssh-client,
+         perl-modules,
+         ${misc:Depends}
+Recommends: libexpect-perl,
+            rinse (>= 1.9.1-1),
+            xen-hypervisor-amd64 | xen-hypervisor-i386 | xen-hypervisor-i386-pae,
+            xen-utils
+Suggests: btrfs-tools,
+          cfengine2,
+          reiserfsprogs,
+          xfsprogs
 Description: Tools to manage Xen virtual servers
 This package contains tools to manage Debian based Xen virtual servers.
 .
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Tue, 20 Dec 2005 02:21:05 +0200.
 It was downloaded from http://xen-tools.org/software/xen-tools/

 Copyright 2005-2009: Steve Kemp <steve@steve.org.uk>
-Copyright 2010-2012: The Xen-Tools Development Team, currently consisting of:
+Copyright 2010-2013: The Xen-Tools Development Team, currently consisting of:
 		     Axel Beckert <abe@deuxchevaux.org>,
 		     Dmitry Nedospasov <dmitry@nedos.net>, and
 		     Stéphane Jourdois <sjourdois@gmail.com>
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,4 +1,4 @@
 /etc/xen-tools
 /etc/xen-tools/role.d
 /etc/xen-tools/skel
-/usr/lib/xen-tools
+/usr/share/xen-tools
--- a/debian/docs
+++ b/debian/docs
@@ -4,4 +4,4 @@ SUPPORT.markdown
 BUGS.markdown
 TODO.markdown
 KNOWN_BUGS.markdown
-NEWS
+NEWS.markdown
--- a/debian/examples
+++ b/debian/examples
@@ -0,0 +1 @@
+examples/*
--- a/debian/rules
+++ b/debian/rules
@@ -2,55 +2,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1

+%:
+	dh $@

-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	touch configure-stamp
-
-
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp: configure-stamp 
-	dh_testdir
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	make clean
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-
-	dh_auto_test
-	make manpages
-	make install prefix=`pwd`/debian/xen-tools
-
-	dh_installdirs
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_install
-	dh_installexamples debian/examples/setup-kernel-initrd debian/examples/update-modules
-	[ ! -e ChangeLog ] || dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+override_dh_auto_build:
--- a/debian/triggers
+++ b/debian/triggers
@@ -0,0 +1 @@
+activate update-initramfs
--- a/etc/xen-tools.conf
+++ b/etc/xen-tools.conf
@@ -125,13 +125,14 @@ install-method = debootstrap
 #  Disk and Sizing options.
 ##
 #
-size   = 4Gb      # Disk image size.
-memory = 128Mb    # Memory size
-swap   = 128Mb    # Swap size
-# noswap = 1      # Don't use swap at all for the new system.
-fs     = ext3     # use the EXT3 filesystem for the disk image.
-dist   = `xt-guess-suite-and-mirror --suite` # Default distribution to install.
-image  = sparse   # Specify sparse vs. full disk images.
+size   = 4G       # Root disk, suffix (G, M, k) required
+memory = 128M     # Suffix (G, M, k) required
+swap   = 128M     # Suffix (G, M, k) required
+# noswap = 1      # Don't use swap at all for new systems.
+fs     = ext3     # Default file system for any disk
+dist   = `xt-guess-suite-and-mirror --suite`
+                  # Default distribution is determined by Dom0's distribution
+image  = sparse   # Specify sparse vs. full disk images (file based images only)

 #
 #  See the README for currently supported and tested distributions. You can
@@ -235,6 +236,13 @@ image  = sparse   # Specify sparse vs. full disk images.
 kernel = /boot/vmlinuz-`uname -r`
 initrd = /boot/initrd.img-`uname -r`

+#
+# Uncomment the following line if you wish to use pygrub by default
+# for all distributions.
+#
+# pygrub = 1
+#
+
 #
 #  The architecture to use when using debootstrap, rinse, or rpmstrap.
 #
@@ -292,6 +300,7 @@ mirror = `xt-guess-suite-and-mirror --mirror`
 #
 #  Filesystem options for the different filesystems we support.
 #
+ext4_options     = noatime,nodiratime,errors=remount-ro
 ext3_options     = noatime,nodiratime,errors=remount-ro
 ext2_options     = noatime,nodiratime,errors=remount-ro
 xfs_options      = defaults
--- a/debian/examples/setup-kernel-initrd
+++ b/debian/examples/setup-kernel-initrd
--- a/debian/examples/update-modules
+++ b/debian/examples/update-modules
--- a/hooks/README
+++ b/hooks/README
@@ -19,7 +19,7 @@ hooks/
   * The installation will have a running installation of OpenSSH

  The subdirectories in this hooks/ directory will be installed
- to the directory /usr/lib/xen-tools/
+ to the directory /usr/share/xen-tools/

 Steve
 --
--- a/hooks/centos-5/25-setup-kernel
+++ b/hooks/centos-5/25-setup-kernel
@@ -8,8 +8,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    . ./hooks/common.sh
 fi
--- a/hooks/centos-6/25-setup-kernel
+++ b/hooks/centos-6/25-setup-kernel
@@ -8,8 +8,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    . ./hooks/common.sh
 fi
--- a/hooks/common.sh
+++ b/hooks/common.sh
@@ -60,7 +60,7 @@ assert ()
 #  We take special care so that daemons shouldn't start after installation
 # which they might otherwise do.
 #
-#  NOTE:  Function not renamed with trailing "s" for compatability reasons.
+#  NOTE:  Function not renamed with trailing "s" for compatibility reasons.
 #
 installDebianPackage ()
 {
@@ -98,7 +98,7 @@ installDebianPackage ()
    #
    # Install the packages
    #
-    DEBIAN_FRONTEND=noninteractive chroot ${prefix} /usr/bin/apt-get --yes --force-yes install "$@"
+    DEBIAN_FRONTEND=noninteractive chroot ${prefix} /usr/bin/apt-get --yes --force-yes --no-install-recommends install "$@"

    #
    #  Remove the policy-rc.d script.
@@ -113,6 +113,143 @@ installDebianPackage ()
 }


+#
+#  Generate a Debian-/Ubuntu-compliant menu.lst for legacy GRUB
+#
+generateDebianGrubMenuLst ()
+{
+    prefix="$1"
+    DOMU_ISSUE="$2"
+    DOMU_KERNEL="$3"
+    DOMU_RAMDISK="$4"
+
+    #
+    # Log our options
+    #
+    logMessage "Generating a legacy GRUB menu.lst into prefix ${prefix}"
+
+    #
+    #  We require at least 3 parameters
+    #
+    assert "$LINENO" "${prefix}"
+    assert "$LINENO" "${DOMU_ISSUE}"
+    assert "$LINENO" "${DOMU_KERNEL}"
+
+    #
+    # Prefix must be a directory, kernel a file
+    #
+    assert "$LINENO" -d ${prefix}
+    assert "$LINENO" -f "${prefix}/boot/${DOMU_KERNEL}"
+
+    #
+    # Generate a menu.lst for pygrub
+    #
+
+    mkdir -p ${prefix}/boot/grub
+    cat << E_O_MENU > ${prefix}/boot/grub/menu.lst
+default         0
+timeout         2
+
+### BEGIN AUTOMAGIC KERNELS LIST
+## lines between the AUTOMAGIC KERNELS LIST markers will be modified
+## by the debian update-grub script except for the default options below
+
+## DO NOT UNCOMMENT THEM, Just edit them to your needs
+
+## ## Start Default Options ##
+## default kernel options
+## default kernel options for automagic boot options
+## If you want special options for specific kernels use kopt_x_y_z
+## where x.y.z is kernel version. Minor versions can be omitted.
+## e.g. kopt=root=/dev/hda1 ro
+##      kopt_2_6_8=root=/dev/hdc1 ro
+##      kopt_2_6_8_2_686=root=/dev/hdc2 ro
+# kopt=root=/dev/xvda2 ro elevator=noop
+
+## default grub root device
+## e.g. groot=(hd0,0)
+# groot=(hd0,0)
+
+## should update-grub create alternative automagic boot options
+## e.g. alternative=true
+##      alternative=false
+# alternative=true
+
+## should update-grub lock alternative automagic boot options
+## e.g. lockalternative=true
+##      lockalternative=false
+# lockalternative=false
+
+## additional options to use with the default boot option, but not with the
+## alternatives
+## e.g. defoptions=vga=791 resume=/dev/hda5
+# defoptions=
+
+## should update-grub lock old automagic boot options
+## e.g. lockold=false
+##      lockold=true
+# lockold=false
+
+## altoption boot targets option
+## multiple altoptions lines are allowed
+## e.g. altoptions=(extra menu suffix) extra boot options
+##      altoptions=(single-user) single
+# altoptions=(single-user mode) single
+
+## controls how many kernels should be put into the menu.lst
+## only counts the first occurence of a kernel, not the
+## alternative kernel options
+## e.g. howmany=all
+##      howmany=7
+# howmany=all
+
+## should update-grub create memtest86 boot option
+## e.g. memtest86=true
+##      memtest86=false
+# memtest86=false
+
+## should update-grub adjust the value of the default booted system
+## can be true or false
+# updatedefaultentry=false
+
+## should update-grub add savedefault to the default options
+## can be true or false
+# savedefault=false
+
+## ## End Default Options ##
+
+### END DEBIAN AUTOMAGIC KERNELS LIST
+
+# Entries statically generated bu xen-tools upon installation. Maybe
+# removed manually if the entries above (generated by update-grub)
+# seem to work fine.
+
+title           $DOMU_ISSUE
+root            (hd0,0)
+kernel          /boot/$DOMU_KERNEL root=/dev/xvda2 ro elevator=noop
+initrd          /boot/$DOMU_RAMDISK
+
+title           $DOMU_ISSUE (Single-User)
+root            (hd0,0)
+kernel          /boot/$DOMU_KERNEL root=/dev/xvda2 ro single elevator=noop
+initrd          /boot/$DOMU_RAMDISK
+
+title           $DOMU_ISSUE (Default Kernel)
+root            (hd0,0)
+kernel          /vmlinuz root=/dev/xvda2 ro elevator=noop
+initrd          /initrd.img
+
+title           $DOMU_ISSUE (Default Kernel, Single-User)
+root            (hd0,0)
+kernel          /vmlinuz root=/dev/xvda2 ro single elevator=noop
+initrd          /initrd.img
+
+E_O_MENU
+
+
+}
+
+

 #
 # Disable the start-stop-daemon
@@ -191,9 +328,9 @@ removeDebianPackage ()


 #
-#  Install a CentOS4 package via yum
+#  Install a RPM package via yum
 #
-installCentOS4Package ()
+installRPMPackage ()
 {
    prefix=$1
    package=$2
@@ -201,7 +338,7 @@ installCentOS4Package ()
    #
    # Log our options
    #
-    logMessage "Installing CentOS4 ${package} to prefix ${prefix}"
+    logMessage "Installing RPM ${package} to prefix ${prefix}"

    #
    #  We require a package + prefix
@@ -220,6 +357,15 @@ installCentOS4Package ()
    chroot ${prefix} /usr/bin/yum -y install ${package}
 }

+# Backwards Compatibility Function
+installCentOS4Package () ( installRPMPackage "$@" )
+
+
+#
+#  Functions to test if we're on a redhatesk or debianesk system
+#
+isDeb() ( [ -x $1/usr/bin/apt-get -a -x $1/usr/bin/dpkg ] )
+isYum() ( [ -x $1/usr/bin/yum ] )


 #
@@ -230,11 +376,11 @@ installPackage ()
        prefix=$1
        package=$2

-        if [ -x ${prefix}/usr/bin/apt-get ] ; then
+        if isDeb ; then
                installDebianPackage "$@"

-        elif [ -x ${prefix}/usr/bin/yum ] ; then
-                installCentOS4Package "$@"
+        elif isYum ; then
+                installRPMPackage "$@"

        else
                logMessage "Unable to install package ${package}; no package manager found"
@@ -261,4 +407,3 @@ installGentooPackage ()
    logMessage "NOTE: Not doing anything - this is a stub - FIXME"

 }
-
--- a/hooks/common/01-disable-daemons
+++ b/hooks/common/01-disable-daemons
@@ -14,8 +14,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    . ./hooks/common.sh
 fi
--- a/hooks/common/05-shadowconfig-on
+++ b/hooks/common/05-shadowconfig-on
@@ -13,8 +13,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    . ./hooks/common.sh
 fi
--- a/hooks/common/10-disable-tls
+++ b/hooks/common/10-disable-tls
@@ -14,8 +14,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    . ./hooks/common.sh
 fi
--- a/hooks/common/15-disable-hwclock
+++ b/hooks/common/15-disable-hwclock
@@ -13,8 +13,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    . ./hooks/common.sh
 fi
--- a/hooks/common/15-setup-arch
+++ b/hooks/common/15-setup-arch
@@ -6,8 +6,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    . ./hooks/common.sh
 fi
--- a/hooks/common/20-setup-apt
+++ b/hooks/common/20-setup-apt
@@ -14,8 +14,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    . ./hooks/common.sh
 fi
@@ -70,18 +70,14 @@ chroot ${prefix} /usr/bin/apt-get update


 #
-#  Now fixup TLS on non-64bit systems after dapper.
+#  Now fixup TLS on non-64bit systems after dapper. For dapper this is
+#  already fixed in 10-disable-tls.
 #
-if [ "$dist" != 'dapper' ]; then
-    if [ "`uname -m`" = "x86_64" ]; then
+if [ "$arch" = 'i386' -a "$dist" != 'dapper' ]; then

-        logMessage "Ignoring TLS since we're a 64 bit host."
+    logMessage "Installing libc6-xen"
+    installDebianPackage ${prefix} libc6-xen

-    else
-
-        logMessage "Installing libc6-xen"
-        installDebianPackage ${prefix} libc6-xen
-    fi
 fi


--- a/hooks/common/20-setup-yum
+++ b/hooks/common/20-setup-yum
@@ -13,8 +13,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    . ./hooks/common.sh
 fi
--- a/hooks/common/25-generate-locale
+++ b/hooks/common/25-generate-locale
@@ -13,8 +13,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    . ./hooks/common.sh
 fi
--- a/hooks/common/30-disable-gettys
+++ b/hooks/common/30-disable-gettys
@@ -12,8 +12,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    . ./hooks/common.sh
 fi
--- a/hooks/common/40-setup-networking-deb
+++ b/hooks/common/40-setup-networking-deb
@@ -13,8 +13,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    . ./hooks/common.sh
 fi
--- a/hooks/common/40-setup-networking-rpm
+++ b/hooks/common/40-setup-networking-rpm
@@ -13,8 +13,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    . ./hooks/common.sh
 fi
--- a/hooks/common/50-setup-hostname-deb
+++ b/hooks/common/50-setup-hostname-deb
@@ -15,8 +15,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    . ./hooks/common.sh
 fi
--- a/hooks/common/50-setup-hostname-rpm
+++ b/hooks/common/50-setup-hostname-rpm
@@ -15,8 +15,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    . ./hooks/common.sh
 fi
--- a/hooks/common/55-create-dev
+++ b/hooks/common/55-create-dev
@@ -14,8 +14,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    . ./hooks/common.sh
 fi
--- a/hooks/common/60-copy-host-files
+++ b/hooks/common/60-copy-host-files
@@ -11,8 +11,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    . ./hooks/common.sh
 fi
--- a/hooks/common/65-copy-user-files
+++ b/hooks/common/65-copy-user-files
@@ -11,8 +11,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    . ./hooks/common.sh
 fi
--- a/hooks/common/70-install-ssh-deb
+++ b/hooks/common/70-install-ssh-deb
@@ -15,8 +15,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    . ./hooks/common.sh
 fi
@@ -38,9 +38,9 @@ mkdir -p ${prefix}/etc/ssh
 #
 if [ ! -f ${prefix}/etc/ssh/ssh_host_rsa_key ]; then
 if ssh-keygen -t rsa -N "" -f ${prefix}/etc/ssh/ssh_host_rsa_key -C "root@${hostname}"; then
-    logMessage "successfully generetaged Host RSA"
+    logMessage "successfully generated RSA host key"
 else
-    logMessage "failed to generate Host RSA Key"
+    logMessage "failed to generate RSA host key"
 fi
 fi

@@ -49,9 +49,9 @@ fi
 #
 if [ ! -f ${prefix}/etc/ssh/ssh_host_dsa_key ]; then
 if ssh-keygen -t dsa -N "" -f ${prefix}/etc/ssh/ssh_host_dsa_key -C "root@${hostname}"; then
-    logMessage "successfully generetaged Host DSA"
+    logMessage "successfully generated DSA host key"
 else
-    logMessage "failed to generate Host DSA Key"
+    logMessage "failed to generate DSA host key"
 fi
 fi

--- a/hooks/common/70-install-ssh-rpm
+++ b/hooks/common/70-install-ssh-rpm
@@ -13,8 +13,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    . ./hooks/common.sh
 fi
--- a/hooks/common/75-fixup-securetty
+++ b/hooks/common/75-fixup-securetty
@@ -14,8 +14,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    . ./hooks/common.sh
 fi
--- a/hooks/common/80-install-modules-deb
+++ b/hooks/common/80-install-modules-deb
@@ -19,8 +19,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    . ./hooks/common.sh
 fi
@@ -73,11 +73,6 @@ else
    cp -au /lib/modules/$(uname -r) ${prefix}/lib/modules
 fi

-#
-#  Install the module-init-tools package.
-#
-installDebianPackage ${prefix} module-init-tools
-
 fi # if pygrub

 #
--- a/hooks/common/80-install-modules-rpm
+++ b/hooks/common/80-install-modules-rpm
@@ -19,8 +19,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    . ./hooks/common.sh
 fi
--- a/hooks/common/81-install-modules-init-tools
+++ b/hooks/common/81-install-modules-init-tools
@@ -0,0 +1,44 @@
+#!/bin/sh
+#
+#  Ensure that either modules-init-tools or kmod is setup.
+#
+#  This is required in most setups.  But even if it isn't required it
+# can't really do anything bad; just waste a bit of space.
+#
+
+prefix=$1
+
+
+
+#
+#  Source our common functions
+#
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
+else
+    . ./hooks/common.sh
+fi
+
+
+#
+# Log our start
+#
+logMessage Script $0 starting
+
+#
+#  Install either kmod or module-init-tools package.
+#
+if chroot ${prefix} /usr/bin/apt-cache show module-init-tools >/dev/null 2>/dev/null; then
+    if chroot ${prefix} /usr/bin/apt-cache show module-init-tools | fgrep -qi transitional; then
+        installDebianPackage ${prefix} kmod
+    else
+        installDebianPackage ${prefix} module-init-tools
+    fi
+else
+    installDebianPackage ${prefix} kmod
+fi
+
+#
+#  Log our finish
+#
+logMessage Script $0 finished
--- a/hooks/common/82-install-grub-legacy
+++ b/hooks/common/82-install-grub-legacy
@@ -0,0 +1,52 @@
+#!/bin/sh
+#
+#  Ensure that either modules-init-tools or kmod is setup.
+#
+#  This is most likely required if you're using a custom kernel
+# for your Xen system.  But even if it isn't required it can't
+# really do anything bad; just waste a bit of space.
+
+
+prefix=$1
+
+
+
+#
+#  Source our common functions
+#
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
+else
+    . ./hooks/common.sh
+fi
+
+
+#
+# Log our start
+#
+logMessage Script $0 starting
+
+if [ ${pygrub} ]; then
+
+#
+#  Install the grub 0.9x package ("grub-legacy" on Debian, "grub" on Ubuntu)
+#
+if chroot ${prefix} /usr/bin/apt-cache show grub-legacy 2>/dev/null | egrep -qi 'GRand Unified Bootloader.*Legacy'; then
+    installDebianPackage ${prefix} grub-legacy
+else
+    installDebianPackage ${prefix} grub
+fi
+
+if [ ! -e ${prefix}/boot/grub/default ]; then
+    echo default > ${prefix}/boot/grub/default
+fi
+chroot ${prefix} /usr/sbin/update-grub
+
+else
+    logMessage "pygrub not set, skipping grub-legacy installation"
+fi # if pygrub
+
+#
+#  Log our finish
+#
+logMessage Script $0 finished
--- a/hooks/common/90-make-fstab
+++ b/hooks/common/90-make-fstab
@@ -17,8 +17,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    . ./hooks/common.sh
 fi
@@ -100,6 +100,34 @@ for part in `seq 1 ${NUMPARTITIONS}`; do
 done


+logMessage Checking for filesystem tools to install
+
+#
+#  Install any required packages for the given root filesystem
+#
+if [ "$has_xfs" -eq 1 ]; then
+    installPackage ${prefix} xfsprogs
+fi
+if [ "$has_reiserfs" -eq 1 ]; then
+    if isAPT; then
+        installDebianPackage reiserfsprogs
+    elif isYum; then
+        installRPMPackage reiserfs-utils
+    else
+        logMessage "Unable to install reiserfs tools; no package manager recognized"
+    fi
+fi
+if [ "$has_btrfs" -eq 1 ]; then
+    if isAPT; then
+        installDebianPackage btrfs-tools
+    elif isYum; then
+        installRPMPackage btrfs-progs
+    else
+        logMessage "Unable to install btrfs tools; no package manager recognized"
+    fi
+fi
+
+
 #
 #  Log our finish
 #
--- a/hooks/common/91-install-fs-tools
+++ b/hooks/common/91-install-fs-tools
@@ -1,45 +0,0 @@
-#!/bin/sh
-#
-#  Some root filesystems will require the installation of new packages
-#
-# Steve
-# --
-# http://www.steve.org.uk/
-
-
-prefix=$1
-
-#
-#  Source our common functions
-#
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
-else
-    . ./hooks/common.sh
-fi
-
-
-#
-# Log our start
-#
-logMessage Script $0 starting
-
-
-#
-#  Install any required packages for the given root filesystem
-#
-if [ $has_xfs -eq 1 ]; then
-    installDebianPackage ${prefix} xfsprogs
-fi
-if [ $has_reiserfs -eq 1 ]; then
-    installDebianPackage ${prefix} reiserfsprogs
-fi
-if [ $has_btrfs -eq 1 ]; then
-    installDebianPackage ${prefix} btrfs-tools
-fi
-
-
-#
-#  Log our finish
-#
-logMessage Script $0 finished
--- a/hooks/common/99-clean-image-deb
+++ b/hooks/common/99-clean-image-deb
@@ -13,8 +13,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    . ./hooks/common.sh
 fi
--- a/hooks/common/99-clean-image-rpm
+++ b/hooks/common/99-clean-image-rpm
@@ -12,8 +12,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    . ./hooks/common.sh
 fi
--- a/hooks/common/99-enable-daemons
+++ b/hooks/common/99-enable-daemons
@@ -14,8 +14,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    . ./hooks/common.sh
 fi
--- a/hooks/dapper/81-install-modules-init-tools
+++ b/hooks/dapper/81-install-modules-init-tools
@@ -0,0 +1 @@
+../common/81-install-modules-init-tools
--- a/hooks/dapper/91-install-fs-tools
+++ b/hooks/dapper/91-install-fs-tools
@@ -1 +0,0 @@
-../common/91-install-fs-tools
--- a/hooks/debian/20-setup-apt
+++ b/hooks/debian/20-setup-apt
@@ -14,8 +14,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    . ./hooks/common.sh
 fi
@@ -90,30 +90,20 @@ fi
 #
 chroot ${prefix} /usr/bin/apt-get update

-
 #
-# For sid or etch systems we install libc6-xen
+# For all systems after Sarge we install libc6-xen on i386
 #
-# For sarge we don't have that option, so we disable TLS.
+# For Sarge we don't have that option, so we disable TLS the hard way.
 #
-if [ "`uname -m`" = "x86_64" ]; then
-
-    logMessage "Ignoring TLS since we're a 64 bit host."
-
-else
-
-    case "${dist}" in
-        *)
-            logMessage "Installing xen-aware libc6"
-    
-            installDebianPackage ${prefix} libc6-xen
-            ;;
-        sarge)
-            logMessage "Disabling TLS"
-            mv ${prefix}/lib/tls ${prefix}/lib/tls.disabled
-            mkdir ${prefix}/lib/tls
-            ;;
-    esac
+if [ "${arch}" = "i386" ]; then
+    if [ "${dist}" = 'sarge' ]; then
+        logMessage "Disabling TLS"
+        mv ${prefix}/lib/tls ${prefix}/lib/tls.disabled
+        mkdir ${prefix}/lib/tls
+    else
+        logMessage "Installing xen-aware libc6"
+        installDebianPackage ${prefix} libc6-xen
+    fi
 fi


--- a/hooks/debian/80-install-kernel
+++ b/hooks/debian/80-install-kernel
@@ -15,8 +15,8 @@ prefix=$1
 #  Source our common functions
 #

-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    . ./hooks/common.sh
 fi
@@ -103,28 +103,8 @@ fi
 # Generate a menu.lst for pygrub
 #

-mkdir -p ${prefix}/boot/grub
-cat << E_O_MENU > ${prefix}/boot/grub/menu.lst
-default         0
-timeout         2
+generateDebianGrubMenuLst "${prefix}" "$DOMU_ISSUE" "$DOMU_KERNEL" "$DOMU_RAMDISK"

-title           $DOMU_ISSUE
-root            (hd0,0)
-kernel          /boot/$DOMU_KERNEL root=/dev/xvda2 ro elevator=noop
-initrd          /boot/$DOMU_RAMDISK
-
-title           $DOMU_ISSUE (Single-User)
-root            (hd0,0)
-kernel          /boot/$DOMU_KERNEL root=/dev/xvda2 ro single elevator=noop
-initrd          /boot/$DOMU_RAMDISK
-
-E_O_MENU
-
-#
-#  Install the module-init-tools package.
-#
-
-installDebianPackage ${prefix} module-init-tools

 else
    logMessage pygrub not set, skipping kernel install
--- a/hooks/debian/81-install-modules-init-tools
+++ b/hooks/debian/81-install-modules-init-tools
@@ -0,0 +1 @@
+../common/81-install-modules-init-tools
--- a/hooks/debian/82-install-grub-legacy
+++ b/hooks/debian/82-install-grub-legacy
@@ -0,0 +1 @@
+../common/82-install-grub-legacy
--- a/hooks/debian/91-install-fs-tools
+++ b/hooks/debian/91-install-fs-tools
@@ -1 +0,0 @@
-../common/91-install-fs-tools
--- a/hooks/debian/95-configure-locales
+++ b/hooks/debian/95-configure-locales
@@ -12,8 +12,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    . ./hooks/common.sh
 fi
--- a/hooks/edgy/80-install-kernel
+++ b/hooks/edgy/80-install-kernel
@@ -15,8 +15,8 @@ prefix=$1
 #  Source our common functions
 #

-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    . ./hooks/common.sh
 fi
@@ -27,7 +27,7 @@ fi

 logMessage Script $0 starting

-if [ ${pygrub} ]; then
+if [ "${pygrub}" ]; then

 #
 # Attempt to install a xen kernel, if that fails, then install a normal one
@@ -78,32 +78,12 @@ fi
 # Generate a menu.lst for pygrub
 #

-mkdir -p ${prefix}/boot/grub
-cat << E_O_MENU > ${prefix}/boot/grub/menu.lst
-default         0
-timeout         2
+generateDebianGrubMenuLst "${prefix}" "$DOMU_ISSUE" "$DOMU_KERNEL" "$DOMU_RAMDISK"

-title           $DOMU_ISSUE
-root            (hd0,0)
-kernel          /boot/$DOMU_KERNEL root=/dev/xvda2 ro elevator=noop
-initrd          /boot/$DOMU_RAMDISK
-
-title           $DOMU_ISSUE (Single-User)
-root            (hd0,0)
-kernel          /boot/$DOMU_KERNEL root=/dev/xvda2 ro single elevator=noop
-initrd          /boot/$DOMU_RAMDISK
-
-E_O_MENU
-
-#
-#  Install the module-init-tools package.
-#
-
-installDebianPackage ${prefix} module-init-tools

 else
    logMessage pygrub not set, skipping kernel install
-fi
+fi # if pygrub

 #
 #  Log our finish
--- a/hooks/edgy/81-install-modules-init-tools
+++ b/hooks/edgy/81-install-modules-init-tools
@@ -0,0 +1 @@
+../common/81-install-modules-init-tools
--- a/hooks/edgy/82-install-grub-legacy
+++ b/hooks/edgy/82-install-grub-legacy
@@ -0,0 +1 @@
+../common/82-install-grub-legacy
--- a/hooks/edgy/91-install-fs-tools
+++ b/hooks/edgy/91-install-fs-tools
@@ -1 +0,0 @@
-../common/91-install-fs-tools
--- a/hooks/gentoo/20-enable-su
+++ b/hooks/gentoo/20-enable-su
@@ -12,8 +12,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    . ./hooks/common.sh
 fi
--- a/hooks/gentoo/40-setup-networking
+++ b/hooks/gentoo/40-setup-networking
@@ -12,8 +12,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    . ./hooks/common.sh
 fi
--- a/hooks/gentoo/50-setup-hostname
+++ b/hooks/gentoo/50-setup-hostname
@@ -15,8 +15,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    . ./hooks/common.sh
 fi
--- a/hooks/gentoo/70-install-ssh
+++ b/hooks/gentoo/70-install-ssh
@@ -16,8 +16,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    . ./hooks/common.sh
 fi
--- a/hooks/intrepid/80-install-kernel
+++ b/hooks/intrepid/80-install-kernel
@@ -15,8 +15,8 @@ prefix=$1
 #  Source our common functions
 #

-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    . ./hooks/common.sh
 fi
@@ -27,13 +27,13 @@ fi

 logMessage Script $0 starting

-if [ ${pygrub} ]; then
+if [ "${pygrub}" ]; then

 #
 # Attempt to install a xen kernel, if that fails, then install a normal one
 #

-KERNEL_PKG="linux-image-server"
+KERNEL_PKG="linux-image-virtual"

 logMessage Attempting to install the $KERNEL_PKG kernel image
 logMessage WARNING: This kernel may not have pvops
@@ -68,32 +68,11 @@ fi
 # Generate a menu.lst for pygrub
 #

-mkdir -p ${prefix}/boot/grub
-cat << E_O_MENU > ${prefix}/boot/grub/menu.lst
-default         0
-timeout         2
-
-title           $DOMU_ISSUE
-root            (hd0,0)
-kernel          /boot/$DOMU_KERNEL root=/dev/xvda2 ro elevator=noop
-initrd          /boot/$DOMU_RAMDISK
-
-title           $DOMU_ISSUE (Single-User)
-root            (hd0,0)
-kernel          /boot/$DOMU_KERNEL root=/dev/xvda2 ro single elevator=noop
-initrd          /boot/$DOMU_RAMDISK
-
-E_O_MENU
-
-#
-#  Install the module-init-tools package.
-#
-
-installDebianPackage ${prefix} module-init-tools
+generateDebianGrubMenuLst "${prefix}" "$DOMU_ISSUE" "$DOMU_KERNEL" "$DOMU_RAMDISK"

 else
    logMessage pygrub not set, skipping kernel install
-fi
+fi # if pygrub

 #
 #  Log our finish
--- a/hooks/intrepid/81-install-modules-init-tools
+++ b/hooks/intrepid/81-install-modules-init-tools
@@ -0,0 +1 @@
+../common/81-install-modules-init-tools
--- a/hooks/intrepid/82-install-grub-legacy
+++ b/hooks/intrepid/82-install-grub-legacy
@@ -0,0 +1 @@
+../common/82-install-grub-legacy
--- a/hooks/intrepid/91-install-fs-tools
+++ b/hooks/intrepid/91-install-fs-tools
@@ -1 +0,0 @@
-../common/91-install-fs-tools
--- a/hooks/karmic/80-install-kernel
+++ b/hooks/karmic/80-install-kernel
@@ -15,25 +15,25 @@ prefix=$1
 #  Source our common functions
 #

-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    . ./hooks/common.sh
 fi
-
-if [ "${pygrub}" ]; then
 #
 # Log our start
 #

 logMessage Script $0 starting

+if [ "${pygrub}" ]; then
+
 #
 # The type of kernel that we will be installing
 #
 # linux_kernel_type="desktop"
 # 
-linux_kernel_type="server"
+linux_kernel_type="virtual"

 linux_kernel_package="linux-image-${linux_kernel_type}"

@@ -54,33 +54,17 @@ DOMU_KERNEL=$(basename $(ls -1 ${prefix}/boot/vmlinuz* | tail -n 1))
 DOMU_RAMDISK=$(basename $(ls -1 ${prefix}/boot/initrd*|tail -n 1))
 DOMU_ISSUE=$(head -n 1 ${prefix}/etc/issue | awk -F '\' '{ print $1 }' | sed 's/[ \t]*$//')

-mkdir -p ${prefix}/boot/grub
-cat << E_O_MENU > ${prefix}/boot/grub/menu.lst
-default         0
-timeout         2
+#
+# Generate a menu.lst for pygrub
+#

-title           $DOMU_ISSUE
-root            (hd0,0)
-kernel          /boot/$DOMU_KERNEL root=/dev/xvda2 ro elevator=noop
-initrd          /boot/$DOMU_RAMDISK
+generateDebianGrubMenuLst "${prefix}" "$DOMU_ISSUE" "$DOMU_KERNEL" "$DOMU_RAMDISK"

-title           $DOMU_ISSUE (Single-User)
-root            (hd0,0)
-kernel          /boot/$DOMU_KERNEL root=/dev/xvda2 ro single elevator=noop
-initrd          /boot/$DOMU_RAMDISK
-
-E_O_MENU

 else
    logMessage "Package '${linux_kernel_package}' is not available"
 fi

-#
-#  Install the module-init-tools package.
-#
-
-installDebianPackage ${prefix} module-init-tools
-
 else
    logMessage pygrub not set, skipping kernel install
 fi # if pygrub
--- a/hooks/karmic/81-install-modules-init-tools
+++ b/hooks/karmic/81-install-modules-init-tools
@@ -0,0 +1 @@
+../common/81-install-modules-init-tools
--- a/hooks/karmic/82-install-grub-legacy
+++ b/hooks/karmic/82-install-grub-legacy
@@ -0,0 +1 @@
+../common/82-install-grub-legacy
--- a/hooks/karmic/91-install-fs-tools
+++ b/hooks/karmic/91-install-fs-tools
@@ -1 +0,0 @@
-../common/91-install-fs-tools
--- a/lib/Xen/Tools/Common.pm
+++ b/lib/Xen/Tools/Common.pm
@@ -218,9 +218,9 @@ sub findXenToolstack

 =cut

-sub runCommand ($$)
+sub runCommand ($$;$)
 {
-    my ($cmd, $CONFIG) = (@_);
+    my ($cmd, $CONFIG, $fail_ok) = (@_);

    #
    #  Set a local if we don't have one.
@@ -245,10 +245,12 @@ sub runCommand ($$)
    my $rcopen = open(CMD, '-|', $cmd);
    if (!defined($rcopen)) {
        logprint_with_config("Starting command '$cmd' failed: $!\n", $CONFIG);
-        logprint_with_config("Aborting\n", $CONFIG);
-        print "See /var/log/xen-tools/".$CONFIG->{'hostname'}.".log for details\n";
-        $CONFIG->{'FAIL'} = 1;
-        exit 127;
+        unless ($fail_ok) {
+            logprint_with_config("Aborting\n", $CONFIG);
+            print "See /var/log/xen-tools/".$CONFIG->{'hostname'}.".log for details\n";
+            $CONFIG->{'FAIL'} = 1;
+            exit 127;
+        }
    }

    while (my $line = <CMD>) {
@@ -270,8 +272,10 @@ sub runCommand ($$)
        logprint_with_config("Running command '$cmd' failed with exit code $?.\n", $CONFIG);
        logprint_with_config("Aborting\n", $CONFIG);
        print "See /var/log/xen-tools/".$CONFIG->{'hostname'}.".log for details\n";
-        $CONFIG->{'FAIL'} = 1;
-        exit 127;
+        unless ($fail_ok) {
+            $CONFIG->{'FAIL'} = 1;
+            exit 127;
+        }
    }

 }
--- a/misc/xen-tools.bash-completion
+++ b/misc/xen-tools.bash-completion
@@ -65,8 +65,8 @@ _xen_create_image()
    # Available distributions, by which we mean distributions which
    # we have hook scripts available.
    #
-    for i in `/bin/ls -1 /usr/lib/xen-tools/ ` ; do
-        if [ -d /usr/lib/xen-tools/${i} ]; then
+    for i in `/bin/ls -1 /usr/share/xen-tools/ ` ; do
+        if [ -d /usr/share/xen-tools/${i} ]; then
            dists="${dists} ${i/.d/}"
        fi
    done
--- a/misc/xen-tools.initramfs-tools
+++ b/misc/xen-tools.initramfs-tools
@@ -0,0 +1,7 @@
+# This initramfs-tools configuration file is installed by xen-tools.
+#
+# To make the Dom0's initramfs working inside DomUs, too, most modules
+# need to be included, not just those necvessary for the host system
+# and its hardware.
+
+MODULES=most
--- a/misc/xen-tools.spec
+++ b/misc/xen-tools.spec
@@ -40,7 +40,7 @@ rm -rf $RPM_BUILD_ROOT
 /etc/bash_completion.d/*
 /usr/bin/*
 /usr/share/man/man8/*
-/usr/lib/xen-tools
+/usr/share/xen-tools


 %changelog
--- a/roles/builder
+++ b/roles/builder
@@ -15,8 +15,8 @@ prefix=$1
 #
 #  Source our common functions - this will let us install a Debian package.
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    echo "Installation problem"
 fi
--- a/roles/cfengine
+++ b/roles/cfengine
@@ -11,8 +11,8 @@ prefix=$1
 #
 #  Source our common functions - this will let us install a Debian package.
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    echo "Installation problem"
 fi
--- a/roles/editor
+++ b/roles/editor
@@ -30,8 +30,8 @@ source=/etc/xen-tools/sed.d/
 #
 #  Source our common functions - this will let us install a Debian package.
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    echo "Installation problem"
 fi
--- a/roles/gdm
+++ b/roles/gdm
@@ -15,8 +15,8 @@ prefix=$1
 #
 #  Source our common functions - this will let us install a Debian package.
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    echo "Installation problem"
 fi
--- a/roles/minimal
+++ b/roles/minimal
@@ -16,8 +16,8 @@ prefix=$1
 #
 #  Source our common functions - this will let us install a Debian package.
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    echo "Installation problem"
 fi
--- a/roles/puppet
+++ b/roles/puppet
@@ -11,8 +11,8 @@ prefix=$1
 #
 #  Source our common functions - this will let us install a Debian package.
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    echo "Installation problem"
 fi
--- a/roles/resolv
+++ b/roles/resolv
@@ -8,8 +8,8 @@ prefix=$1
 #
 #  Source our common functions - this will let us install a Debian package.
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    echo "Installation problem"
 fi
--- a/roles/sudoers
+++ b/roles/sudoers
@@ -8,8 +8,8 @@ prefix=$1
 #
 #  Source our common functions - this will let us install a Debian package.
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    echo "Installation problem"
 fi
--- a/roles/tmpfs
+++ b/roles/tmpfs
@@ -12,8 +12,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    . ./hooks/common.sh
 fi
--- a/roles/udev
+++ b/roles/udev
@@ -15,8 +15,8 @@ prefix=$1
 #
 #  Source our common functions - this will let us install a Debian package.
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    echo "Installation problem"
 fi
--- a/roles/xdm
+++ b/roles/xdm
@@ -15,8 +15,8 @@ prefix=$1
 #
 #  Source our common functions - this will let us install a Debian package.
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
    echo "Installation problem"
 fi
--- a/t/argument-check.t
+++ b/t/argument-check.t
@@ -39,7 +39,7 @@ foreach my $key ( sort keys %OPTIONS )

    foreach my $line ( @lines )
    {
-        if ( $line =~ /--$key/ )
+        if ( $line =~ /--(\(no\))?$key/ )
        {
            $found = 1;
        }
--- a/t/getopt.t
+++ b/t/getopt.t
@@ -51,7 +51,7 @@ sub testFile

    foreach my $line ( split( /\n/, $output ) )
    {
-        if ( $line =~ /[ \t]*--([a-z-_]+)/ )
+        if ( $line =~ /[ \t]*--(?:\(no\))?([a-z-_]+)/ )
        {
            push @documented, $1 unless( $line =~ /NOP/i );
        }
@@ -114,12 +114,17 @@ sub testFile
            }
 #print " - remove quotes : $o ";
            #
-            #  Discard anything after "=", or " "
+            #  Discard anything after "=", ":", or " "
            #
-            if ( $o =~ /(.*)[ \t=]+(.*)/ )
+            if ( $o =~ /(.*)[ \t=:]+(.*)/ )
            {
                $o = $1;
            }
+#print " - remove negation : $o ";
+            #
+            #  Discard any "!" at the end
+            #
+            $o =~ s/!//;
 #print " - remove = : $o ";
            #
            #  Now avoid blank lines.
--- a/t/no-tabs.t
+++ b/t/no-tabs.t
@@ -9,8 +9,10 @@

 use strict;
 use File::Find;
-use Test::More;
+use Test::NoTabs;

+# Check all Perl files
+all_perl_files_ok();

 #
 #  Find all the files beneath the current directory,
@@ -18,8 +20,6 @@ use Test::More;
 #
 find( { wanted => \&checkFile, no_chdir => 1 }, '.' );

-done_testing();
-
 #
 #  Check a file.
 #
@@ -62,50 +62,17 @@ sub checkFile
             ( $line =~ /\/bin\/bash/ ) )
        {
            $isShell = 1;
+            last;
        }
        if ( $line =~ /\/usr\/bin\/perl/ )
        {
-            $isPerl = 1;
+            last;
        }
    }
    close( INPUT );

    #
-    #  Return if it wasn't a perl file.
+    #  Run check if it is a shell file.
    #
-    if ( $isShell || $isPerl )
-    {
-        #
-        #  Count TAB characters
-        #
-        my $count = countTabCharacters( $file );
-
-        is( $count, 0, "Script has no tab characters: $file" );
-    }
-}
-
-
-=head2 countTabCharacters
-
-=cut
-
-sub countTabCharacters
-{
-    my ( $file ) = (@_);
-
-    my $count = 0;
-
-    open( FILE, "<", $file )
-      or die "Cannot open $file - $!";
-    foreach my $line ( <FILE> )
-    {
-        while( $line =~ /(.*)\t(.*)/ )
-        {
-            $count += 1;
-            $line = $1 . $2;
-        }
-    }
-    close( FILE );
-
-    return( $count );
+    notabs_ok( $file ) if $isShell;
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Axel Beckert	07622d8ed0	t/xen-delete-image.t: Check xen-delete-image exit code Also run xen-delete-image verbose and print output.	2013-04-18 16:26:55 +02:00
Axel Beckert	081c0370d4	Properly clean up after t/xt-create-xen-config.t	2013-04-18 16:21:25 +02:00
Axel Beckert	ea209f085b	Refactor some code duplication in xen-delete-image	2013-04-18 16:21:25 +02:00
Axel Beckert	a70b79f63f	Hopefully catch all remaining "ARRAY(0x…).log" issues	2013-04-18 14:45:27 +02:00
Axel Beckert	c482220b99	Rework xci POD: New SYNOPSIS; add EXAMPLES, rename old SYNOPSIS to OPTIONS	2013-04-18 13:52:45 +02:00
Axel Beckert	dcd0bf09f1	Add reference for the three types of MAC relevant for DomUs	2013-04-16 18:03:33 +02:00
Axel Beckert	92a825b87b	Axel's Break-Backwards-Compatibility Wishlist: MAC stuff	2013-04-16 17:57:12 +02:00
Axel Beckert	6871954f6e	Merge branch 'lib-vs-share'	2013-04-11 19:49:53 +02:00
Axel Beckert	e9d8bd0896	xt-install-image: Don't bail out if only cdebootstrap is installed There was a duplicated check on debootstrap being installed and only one has been expanded when cdebootstrap support was added. So xen-tools bailed out if debootstrap wasn't installed even if it had been instructed to use cdebootstrap instead. This also adds support for cdebootstrap-static. Additionally xt-install-image dispatcher has been extended to hand array refs of command paths instead of just single command paths. Thanks to Elmar Heeb for reporting this issue!	2013-04-11 19:47:05 +02:00
Axel Beckert	9369fd2a03	Update debian/changelog	2013-04-11 19:18:41 +02:00
Axel Beckert	04dd81ec07	Mention http.debian.net as default mirror also in POD	2013-04-11 15:59:42 +02:00
Axel Beckert	d39255dc5e	Reindent options in POD	2013-04-11 15:59:19 +02:00
Axel Beckert	5a48067d9e	Make some x-c-i commandline options negatable Update documentation and tests accordingly. Also add pygrub = 1 as example to xen-tools.conf, now that the effect can be reversed via commandline options.	2013-04-11 15:51:31 +02:00
Axel Beckert	6fc51d20be	Update xen-tools.conf comments to be more concise and consistent Thanks Elmar Heeb!	2013-04-11 13:08:31 +02:00
Axel Beckert	16dbe870f2	TODO: test for --size constraints ... and its prerequisites	2013-04-11 10:52:45 +02:00
Axel Beckert	cb3227d61b	Don't only allow lowercase "b" for "bytes". Also put some examples in the according error message.	2013-04-11 10:32:20 +02:00
Axel Beckert	a89aa86511	Consistent amount of blank lines in POD	2013-04-11 10:29:56 +02:00
Axel Beckert	555ce383d3	Switch from /usr/lib/xen-tools/ to /usr/share/xen-tools/ to properly adhere FHS	2013-04-05 20:19:22 +02:00
Axel Beckert	b29117be02	Ignore Devel::Cover cache	2013-03-22 16:58:59 +01:00
Axel Beckert	ff7ded28e8	Only the key for %ENV, but not for %CONFIG, needs to be modified	2013-03-14 00:10:18 +01:00
Axel Beckert	f0691c9a38	Merge branch 'master' of gitorious.org:xen-tools/xen-tools Conflicts: debian/changelog	2013-03-14 00:01:05 +01:00
Axel Beckert	76d9d59510	Fix export of environment variables (dash vs underscore) Previously they could contain dashes and then were only accessible from within Perl, but not from within Bash. From now on potential dashes in environment variable names are converted to underscores ("_") before being exported. May affect some hook or role scripts.	2013-03-13 23:29:52 +01:00
Axel Beckert	5342b04ac7	Some more TODOs (mostly refactoring + code cleanup)	2013-03-13 23:17:09 +01:00
Axel Beckert	01e525106b	Use Test::NoTabs in t/no-tabs.t	2013-03-05 23:07:04 +01:00
Axel Beckert	5146706536	Document 4.3.1 in NEWS	2013-01-26 01:18:28 +01:00
Axel Beckert	dfa32a97ca	Also switch xt-guess-suite-and-mirror's fallback to http.debian.net	2013-01-25 17:34:39 +01:00
Axel Beckert	c409759745	Rename NEWS to NEWS.markdown	2013-01-25 17:32:20 +01:00
Axel Beckert	149b92af77	Document 4.3 release date in NEWS	2013-01-25 17:30:17 +01:00
Axel Beckert	a4b3c9c568	Also use http.debian.net as default mirror for the debian-archive	2013-01-25 17:09:54 +01:00
Axel Beckert	dbb9124666	Use http.debian.net as default Debian mirror if no mirror is given ... i.e. if even xt-guess-suite-and-mirror is not used.	2013-01-25 17:09:19 +01:00
Axel Beckert	f2d30eaa63	xen-delete-image no more passes $CONFIG{hostname} as array to logprint_with_config The deletion of failed attempts was logged to files named like ARRAY(0xa9dd98).log because the hostname was passed twice, i.e. as arrayref (which didn't hurt otherwise).	2013-01-25 15:22:42 +01:00
Axel Beckert	0709308c1f	Save exit code $? at the beginning of the END block Otherwise cleaning up by doing some system() calls garbles $? with unwanted values.	2013-01-25 13:19:36 +01:00
Axel Beckert	d3baf1f8ba	KNOWN BUGS: -1 +1	2013-01-25 13:03:23 +01:00
Axel Beckert	d7f219f160	Create /boot/grub/default if non-existent Seems to be needed at least for Squeeze.	2013-01-24 23:14:34 +01:00
Axel Beckert	bc054b1b02	chomp the output of dpkg --print-architecture	2013-01-24 23:14:34 +01:00
Axel Beckert	f18285943c	Call update-grub at the end of 82-install-grub-legacy to update menu.lst	2013-01-24 23:14:34 +01:00
Axel Beckert	780839988d	Remove trailing blank line	2013-01-24 23:14:34 +01:00
Axel Beckert	025e20a1f1	Better check for grub-legacy availability which ignores virtual packages	2013-01-24 23:14:34 +01:00
Axel Beckert	9330b79d51	hooks/common.sh: Fix syntax error in installCentOS4Package wrapper.	2013-01-24 23:14:10 +01:00
Axel Beckert	979b6fb166	hooks/common.sh: installDebianPackage no more installs recommends	2013-01-24 23:07:56 +01:00
Axel Beckert	57c7d13c48	Factor out legacy grub menu.lst generation	2013-01-24 23:06:53 +01:00
Axel Beckert	1de424a69d	Fix filesystem tools installation in 91-install-fs-tools Was broken since 4.3rc1. Merged 91-install-fs-tools back into 90-make-fstab. Added support for RPM-based distributions, too, so it's more generic now.	2013-01-23 18:02:44 +01:00
Axel Beckert	505950dae0	isAPT: Also check for dpkg and rename it to isDeb That way we should not try to use Debian/Ubuntu package names if apt4rpm is available.	2013-01-23 17:47:13 +01:00
Axel Beckert	0c8b5d25c4	Factor out functions to test if we should use yum or apt	2013-01-23 17:40:00 +01:00
Axel Beckert	bce580658e	hooks/common.sh: Rename installCentOS4Package to installRPMPackage Add installCentOS4Package wrapper for backward compatibility.	2013-01-23 17:00:09 +01:00
Axel Beckert	b451260f0d	TODO/KNOWN_BUGS: Add some hook issues noticed recently Found during debugging error messages and warnings in log files.	2013-01-23 16:08:01 +01:00
Axel Beckert	af6e1435aa	Mention in error message why xen-create-image thinks that an installation failed	2013-01-23 13:14:35 +01:00
Axel Beckert	290ca33840	Fix some typos and grammar in log messages	2013-01-23 13:14:35 +01:00
Axel Beckert	a1838d9030	Also use linux-image-virtual instead of linux-image-server for >= karmic	2013-01-23 13:14:35 +01:00
Axel Beckert	30ae761c27	Fix typo	2013-01-22 02:37:44 +01:00
Axel Beckert	9182aaccb7	Install grub-legacy in all pygrub-based DomUs	2013-01-22 02:35:27 +01:00
Axel Beckert	a2aa1b8a02	Factor out module-init-tools (or kmod) installation	2013-01-22 02:33:12 +01:00
Axel Beckert	03506de7e4	Refactoring: Normalize 80-kernel-install for Ubuntus	2013-01-22 02:01:13 +01:00
Axel Beckert	f71460358b	chmod 644 everything in xen-tools/misc	2013-01-22 01:29:13 +01:00
Axel Beckert	8c2a2878df	Ubuntu: install linux-image-virtual instead of linux-image-server By default install linux-image-virtual instead of linux-image-server on Ubuntu Intrepid and newer. Hopefully closes: #640099, LP #839492	2013-01-22 01:18:57 +01:00
Axel Beckert	2e69bee531	Rename misc/{xen-tools → xen-tools.bash-completion} This prevents name space cluttering and ambiguity in xen-tools/misc/.	2013-01-22 00:21:10 +01:00
Axel Beckert	e985d4151b	Ship /etc/initramfs-tools/conf.d/xen-tools with MODULES=most This is a necessary setting to generate Dom0 initrds which are also suitable for DomU usage. Trigger update-initramfs in the Debian package.	2013-01-22 00:17:27 +01:00
Axel Beckert	a4a4b7a8e7	Add default mount options for ext4, identical to ext2/ext3	2013-01-21 21:23:41 +01:00
Axel Beckert	a297aa4f5b	Fix quoting in hooks/common/91-install-fs-tools	2013-01-21 16:32:10 +01:00
Axel Beckert	6423a67982	Handle module-init-tools → kmod transition in wheezy/raring gracefully	2013-01-21 16:20:03 +01:00
Axel Beckert	4dbb6fe189	Bump copyright years in xen-delete-image and xen-list-images	2013-01-18 02:25:06 +01:00
Axel Beckert	d38718b24b	xen-create-image seems to work now again, too: remove TODO	2013-01-18 02:21:25 +01:00
Axel Beckert	53c013f1cc	xen-delete-image now also understand --extension	2013-01-18 02:13:19 +01:00
Axel Beckert	6a59d0fd9b	Properly ident --extension docs in xen-list-images' POD	2013-01-18 02:12:22 +01:00
Axel Beckert	4e7f58785f	Fix Markdown syntax of reference style links in README	2013-01-18 01:55:57 +01:00
Axel Beckert	e240c63c8b	README: Installing Dapper and Edgy no more works on Wheezy due to #659360	2013-01-18 01:37:52 +01:00
Axel Beckert	c39628cbe4	Overwork TLS disabling on Debian and Ubuntu	2013-01-18 01:26:11 +01:00
Axel Beckert	73dabead05	unMountImage may fail if $CONFIG{FAIL} is already set	2013-01-17 22:59:34 +01:00
Axel Beckert	ce1624b83e	Remove redundant and broken second setting of mirror by distribution	2013-01-17 22:59:01 +01:00
Axel Beckert	97553c50fb	Handle Sarge amd64 case properly Uses File::Which, (build-) dependency on libfile-which-perl added	2013-01-17 22:48:15 +01:00
Axel Beckert	3456849ec8	Make t/xen-lists-images.t more strict: No more /i	2013-01-17 22:17:37 +01:00
Axel Beckert	dc5b36f8ef	xen-list-images now also outputs the name of the config file	2013-01-17 22:15:21 +01:00
Axel Beckert	00623e2327	Add --extension option to xen-list-images	2013-01-17 22:13:34 +01:00
Axel Beckert	c6caa0a0ad	Fix "--extension=" with empty parameter	2013-01-17 21:57:50 +01:00
Axel Beckert	13dbf65793	Mention that --keep does not prevent unmounting	2013-01-17 21:19:55 +01:00
Axel Beckert	d6144d45ea	It's said that just "END" is better style than "sub END".	2013-01-17 21:16:22 +01:00
Axel Beckert	b682ad1817	Normalize redundant FAIL test	2013-01-17 21:16:22 +01:00
Axel Beckert	61df2a6c51	Trap SIGINT to unmount to temporary mount point This makes END being called again after Ctrl-C.	2013-01-17 21:16:22 +01:00
Axel Beckert	c1e7cb717a	Add optional argument to unMountImage and hence runCommand to allow failure	2013-01-17 21:16:22 +01:00
Axel Beckert	a223eedf0b	Remove redundant unMountImage call	2013-01-17 20:55:42 +01:00
Axel Beckert	987cf32458	TODO: Move /usr/lib/xen-tools/ to /usr/share/xen-tools/	2013-01-17 18:30:39 +01:00
Axel Beckert	dd15b27b85	Apply wrap-and-sort to debian/control	2013-01-17 18:06:40 +01:00
Axel Beckert	0defc0f0e3	Switch to a minimal dh style debian/rules Override dh_auto_build as it triggers the nop target.	2013-01-17 18:05:12 +01:00
Axel Beckert	1f70c8f5d7	Use dh_installexamples with a debian/examples file This was also the reason to move the examples around in the previous commit. :-)	2013-01-17 17:53:31 +01:00
Axel Beckert	39c6bb5974	Move examples from debian/examples to examples	2013-01-17 17:51:16 +01:00
Axel Beckert	02240309b3	Bump Copyright years at multiple place	2013-01-17 17:09:37 +01:00
Axel Beckert	ed2c2d5a14	TODO: Obvious Sarge amd64 mirror issues	2013-01-17 16:49:34 +01:00
Axel Beckert	931f88f99a	No more explicitly call "make manpages" It's a depedency of "make install" in the next line anyway.	2013-01-16 18:00:26 +01:00
Axel Beckert	5d0bd617e0	Fix copy & paste error in binary-* targets in debian/rules	2013-01-16 17:59:39 +01:00
Axel Beckert	70e0115f94	Use dh_auto_{install,clean}; use "$(MAKE)" instead of "make"	2013-01-16 16:58:10 +01:00
Axel Beckert	1d16c86eba	Remove explicit mentioning of upstream changelog in debian/rules dh_installchangelogs finds it by itself if it exist. That way building out of a freshly clone git repository does not fail due to a missing upstream changelog.	2013-01-16 16:55:23 +01:00
Axel Beckert	e15d6cfd5e	Revert "Install upstream ChangeLog only if it exists." This reverts commit `35477c6172`. If the upstream ChangeLog did not exist, the debian/changelog wasn't installed either. Which was not the intention.	2013-01-16 16:47:15 +01:00
Axel Beckert	ae33f60680	Makefile: Accept "DESTDIR" instead of "prefix=", too That way it adheres more commonly used conventions and allows using dh_auto_install	2013-01-16 16:44:42 +01:00