Merge branch 'master' into bash-completion-overhaul

EVMS has been removed[1] from Debian before Lenny, but it is necessary
for some optional functionality of xen-tools. And since some Debian
derived distributions (e.g. Ubuntu 6.06 LTS Server, Ubuntu 8.04 LTS
and grml) still support it, it's included in the list of suggested
dependencies for the sake of completeness and correctness.

  [1] http://bugs.debian.org/491808

.gitignore

@@ -0,0 +1,11 @@
+.hg
+.hgtags
+ChangeLog
+*~
+build-stamp
+configure-stamp
+man
+debian/files
+debian/xen-tools
+debian/xen-tools.debhelper.log
+debian/xen-tools.substvars

.hgignore

@@ -2,3 +2,4 @@
 (^|/)\.hg($|/)
 (^|/)\.hgtags($|/)
 ChangeLog
+~$

.hgtags

@@ -1 +1,2 @@
 d75c787add2a7ceb19b30b018d4d16b7317c772d release-4.
+6a10240d7c66e2f7df56457708efb9287640bcf4 release-4.1

AUTHORS

@@ -1,8 +1,10 @@
 
         
-Primary Author
+Primary Authors
---------------
+---------------
 
+  Axel Beckert <abe@deuxchevaux.org>
+  Dmitry Nedospasov <dmitry@nedos.net>
   Steve Kemp <steve [at] uk.org.steve>
 
 
@@ -11,7 +13,7 @@ Contributions
 
   Listed alphabetically by surname.
 
-  C.J. Adams-Collier <cjcollier [at] com.gmail.com
+  C.J. Adams-Collier <cjcollier [at] com.gmail>
    - Added new modular structure to the code.
 
   Nick Anderson  <nick [at] net.anders0n>
@@ -51,12 +53,22 @@ Contributions
   Gordon Messmer <gmessmer [at] edu.washington.u>
    - Supplied .spec file for building .rpm packages.
 
+  Wilson Neil <neil [at] uk.co.aldur>
+   - Several suggestions and code for disabling start-stop-daemon
+   - Compatibility fixups for Ubuntu.
+
+  Nathan O'Sullivan <nathan [at] au.com.mammoth>
+   - New features wrt. options and helper functions
+
   Walter Reiner <walter [at] at.wreiner>
    - Provided --image-dev + --swap-dev patch.
 
   Jameson Rollins <jrollins [at] edu.columbia.phys>
    - Provided --output + --extension code.
 
+  Michal Safranek (Wejn) <wejn [at] box.cz>
+   - Inspiration for pygrub in the install-kernel scripts
+
   Felipe Scarel <fbscarel [at] com.gmail>
    - Bugfix for --no-swap + LVM
 
@@ -76,6 +88,3 @@ Contributions
   Ward Vandewege <ward [at] be.pong>
    - Made several updates for Ubuntu support.
 
-  Wilson Neil <neil [at] uk.co.aldur>
-   - Several suggestions and code for disabling start-stop-daemon
-   - Compatibility fixups for Ubuntu.

Makefile

@@ -14,9 +14,12 @@
 #
 TMP        ?= /tmp
 DIST_PREFIX = ${TMP}
-VERSION     = 4.1
+VERSION     = 4.2rc1
+DEBVERSION  = $(shell echo $(VERSION)|sed 's/\(rc\|pre\|beta\|alpha\)/~\1/')
 BASE        = xen-tools
-
+VCS         = $(shell if git st > /dev/null; then echo git; \
+                    elif hg st  > /dev/null; then echo hg; \
+                    else                          echo cannot-determine-used-vcs; fi)
 
 #
 #  Installation prefix, useful for the Debian package.
@@ -43,7 +46,7 @@ nop:
 # with those details.
 #
 changelog:
-	hg log -v > ChangeLog
+	$(VCS) log -v > ChangeLog
 
 
 #
@@ -57,6 +60,7 @@ clean:
 	@find . -name '*.tmp' -exec rm \{\} \;
 	@find . -name 'tags' -exec rm \{\} \;
 	@find . -name '*.8.gz' -exec rm \{\} \;
+	@find . -name '*.tdy' -exec rm \{\} \;
 	@if [ -d man ]; then rm -rf man ; fi
 	@if [ -e build-stamp ]; then rm -f build-stamp ; fi
 	@if [ -e configure-stamp ]; then rm -f configure-stamp ; fi
@@ -69,14 +73,14 @@ clean:
 #  If the testsuite runs correctly then commit any pending changes.
 #
 commit: test
-	hg commit
+	$(VCS) commit
 
 
 #
 #  Show what has been changed in the local copy vs. the remote repository.
 #
 diff:
-	hg diff 2>/dev/null
+	$(VCS) diff 2>/dev/null
 
 
 #
@@ -88,7 +92,7 @@ fixup-perms:
 	chmod 644 etc/xen-tools.conf
 	chmod 644 etc/xm.tmpl
 	chmod 644 etc/xm-nfs.tmpl
-	chmod 644 misc/xm misc/xen-tools misc/README
+	chmod 644 misc/xen-tools misc/README
 
 #
 #  Install files to /etc/
@@ -105,7 +109,6 @@ install-etc:
 	cp partitions/*-*     ${prefix}/etc/xen-tools/partitions.d/
 	-mkdir -p             ${prefix}/etc/bash_completion.d
 	cp misc/xen-tools     ${prefix}/etc/bash_completion.d/
-	cp misc/xm            ${prefix}/etc/bash_completion.d/
 
 
 #
@@ -121,6 +124,7 @@ install-bin:
 	cp bin/xen-delete-image     ${prefix}/usr/bin
 	cp bin/xen-list-images      ${prefix}/usr/bin
 	cp bin/xen-update-image     ${prefix}/usr/bin
+	cp bin/xt-guess-suite-and-mirror ${prefix}/usr/bin
 	chmod 755 ${prefix}/usr/bin/xen-create-image
 	chmod 755 ${prefix}/usr/bin/xen-create-nfs
 	chmod 755 ${prefix}/usr/bin/xt-customize-image
@@ -129,6 +133,7 @@ install-bin:
 	chmod 755 ${prefix}/usr/bin/xen-delete-image
 	chmod 755 ${prefix}/usr/bin/xen-list-images
 	chmod 755 ${prefix}/usr/bin/xen-update-image
+	chmod 755 ${prefix}/usr/bin/xt-guess-suite-and-mirror
 
 
 
@@ -147,26 +152,36 @@ install-hooks:
 	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-5.d
 	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-7.d
 	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-8.d
+	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-9.d
+	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-10.d
+	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-11.d
+	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-12.d
+	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-13.d
 	mkdir -p ${prefix}/usr/lib/xen-tools/debian.d/
 	cp -R hooks/debian/*-* ${prefix}/usr/lib/xen-tools/debian.d
 	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d sarge.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d lenny.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 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/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
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s edgy.d intrepid.d
 	mkdir -p ${prefix}/usr/lib/xen-tools/dapper.d/
 	cp -R hooks/dapper/*-* ${prefix}/usr/lib/xen-tools/dapper.d/
 	mkdir -p ${prefix}/usr/lib/xen-tools/edgy.d/
 	cp -R hooks/edgy/*-* ${prefix}/usr/lib/xen-tools/edgy.d/
-	mkdir -p ${prefix}/usr/lib/xen-tools/dapper.d/
+	-cd ${prefix}/usr/lib/xen-tools/ && ln -s edgy.d feisty.d
-	cp -R hooks/dapper/*-* ${prefix}/usr/lib/xen-tools/dapper.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
 	cp hooks/common.sh ${prefix}/usr/lib/xen-tools
 
 
@@ -196,8 +211,8 @@ install: fixup-perms install-bin install-etc install-hooks install-libraries ins
 #  Build our manpages via the `pod2man` command.
 #
 manpages:
-	mkdir man
+	-mkdir -p man
-	cd bin; for i in *-*; do pod2man --release=${VERSION} --official --section=8 $$i ../man/$$i.8; done
+	cd bin; for i in *-*[!y]; do pod2man --release=${VERSION} --official --section=8 $$i ../man/$$i.8; done
 	for i in man/*.8; do gzip --force -9 $$i; done
 
 
@@ -210,12 +225,20 @@ release: tidy fixup-perms update-version update-modules clean changelog
 	cp -R . $(DIST_PREFIX)/$(BASE)-$(VERSION)
 	rm -rf $(DIST_PREFIX)/$(BASE)-$(VERSION)/debian
 	rm -rf $(DIST_PREFIX)/$(BASE)-$(VERSION)/.hg*
+	rm -rf $(DIST_PREFIX)/$(BASE)-$(VERSION)/.git*
 	cd $(DIST_PREFIX) && tar -cvf $(DIST_PREFIX)/$(BASE)-$(VERSION).tar $(BASE)-$(VERSION)/
 	gzip $(DIST_PREFIX)/$(BASE)-$(VERSION).tar
 	mv $(DIST_PREFIX)/$(BASE)-$(VERSION).tar.gz .
 	rm -rf $(DIST_PREFIX)/$(BASE)-$(VERSION)
 	gpg --armour --detach-sign $(BASE)-$(VERSION).tar.gz
 
+#
+#  Make a new orig.tar.gz for the Debian package
+#
+orig-tar-gz: release
+	mv $(BASE)-$(VERSION).tar.gz ../$(BASE)_$(DEBVERSION).orig.tar.gz
+	mv $(BASE)-$(VERSION).tar.gz.asc ../$(BASE)_$(DEBVERSION).orig.tar.gz.asc
+
 
 #
 #  Run the test suite.
@@ -237,7 +260,7 @@ test-verbose:
 #
 tidy:
 	if [ -x /usr/bin/perltidy ]; then \
-	for i in bin/*-*; do \
+	for i in bin/*-*[^~]; do \
 		echo "tidying $$i"; \
 		perltidy  $$i \
 	; done \
@@ -255,12 +278,12 @@ uninstall:
 	rm -f ${prefix}/usr/bin/xt-install-image
 	rm -f ${prefix}/usr/bin/xt-create-xen-config
 	rm -f ${prefix}/usr/bin/xen-create-nfs
+	rm -f ${prefix}/usr/bin/xt-guess-suite-and-mirror
 	rm -f ${prefix}/etc/xen-tools/xen-tools.conf
 	rm -f ${prefix}/etc/xen-tools/xm.tmpl
 	-rm -rf ${prefix}/etc/xen-tools/skel
 	-rmdir ${prefix}/etc/xen-tools/
 	-rm -f ${prefix}/etc/bash_completion.d/xen-tools
-	-rm -f ${prefix}/etc/bash_completion.d/xm
 	rm -rf ${prefix}/usr/lib/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
@@ -274,7 +297,7 @@ uninstall:
 #  NOTE: Removes empty local directories.
 #
 update:
-	hg pull --update 2>/dev/null
+	$(VCS) pull --update 2>/dev/null
 
 
 #
@@ -290,4 +313,4 @@ update-modules:
 # at the top of this file.  Steve-Specific?
 #
 update-version:
-	perl -pi.bak -e "s/RELEASE = '[0-9]\.[0-9]';/RELEASE = '${VERSION}';/g" bin/*-*
+	perl -pi.bak -e "s/RELEASE = '[0-9]\.[0-9][^']*';/RELEASE = '${VERSION}';/g" bin/*-*[^~]

README

@@ -2,8 +2,8 @@
 Homepage:
     http://www.xen-tools.org/software/xen-tools
 
-Mercurial Repository:
+Git Repository:
-    http://xen-tools.repository.steve.org.uk/
+    http://gitorious.org/xen-tools
 
 Mailing Lists:
     http://xen-tools.org/software/xen-tools/lists.html
@@ -20,11 +20,45 @@ xen-tools
  to be accessible over your local network and complete with an installed
  copy of OpenSSH.
 
-  This software is primarily aimed at users who wish to create virtual 
+  xen-tools currently has scripts to install most releases of Debian
- instances of Debian Sarge, Etch, or Sid.  Although other distributions
+ (starting with 3.1 "Sarge") and Ubuntu (starting with 6.06 LTS
- such as Ubuntu Dapper, Edgy, and Feisty are supported if you have the
+ "Dapper") and some RPM-based distributions.
- appropriate packages installed.
 
+  However currently only Debian and Ubuntu releases are tested and
+  known to work, i.e.:
+
+	Debian:
+	  * Sarge 3.1 (i386 only)
+	  * Etch 4.0
+	  * Lenny 5.0
+	  * Squeeze 6.0
+	  * Sid (works at least at the moment of writing :-)
+
+	Ubuntu:
+	  * Dapper Drake 6.06
+	  * Edgy Eft 6.10
+	  * Feisty Fawn 7.04
+	  * Gutsy Gibbon 7.10
+	  * Hardy Heron 8.04 (see [1])
+	  * Interpid Ibex 8.10
+	  * Jaunty Jackaplope 9.04
+	  * Karmic Koala 9.10
+	  * Lucid Lynx 10.04 (see [2])
+	  * Maverick Meerkat 10.10 (works at least at the moment of writing :-)
+
+  [1] There is an issue with debootstrap on hardy not installing ksyslogd
+      This can be fixed by chrooting into the newly installed system
+      and removing the startup scripts. See:
+      http://www.linux-vserver.org/Installing_Ubuntu_8.04_Hardy_as_guest
+
+  [2] As of writing this 24.04.10, there is an issue with tar on
+      Lucid with kernels < 2.6.22 this should however be patched right
+      after release. See:
+      https://bugs.launchpad.net/ubuntu/+source/tar/+bug/539814
+
+  Older versions of ubuntu may work, however you will have to have to find
+ a mirror that still hosts them. Currently the oldest Ubuntu Distribution
+ on Canonical's archive.ubuntu.com is Hardy Heron.
 
 Requirements
 ------------
@@ -37,18 +71,11 @@ Requirements
         * The Perl module "Config::IniFiles"
           - Both of these modules are available as Debian packages,
             or direct from http://www.cpan.org/ for non-Debian distributions.
+        * Make, if you are not installing through a package manager
 
-
+  You can try to install RPM-based distributions such as CentOS, or
-  In order to install RPM-based distributions such as CentOS, or
  Fedora Core you will need a correctly installed and configured
- "rinse" package.
+ "rinse" package. This is currently not supported.
-
-  To install Ubuntu distributions upon a Debian host system you will
- need either:
-
-        * The Ubuntu version of debootstrap installed.
-        * A patched debootstrap package from:
-                http://steve.org.uk/Software/tmp/debootstrap/
 
   If you wish to create new Xen instances which may be controlled by
  users via a login shell you should also install the xen-shell package

TODO

@@ -1,16 +1,161 @@
 TODO
-----
+====
 
-  1. Test and support more file system types.  Actually this should be
+Bugs to fix and Features to add before a 4.2 release
-    pretty simple now that the parameters are stored in the configuration
+----------------------------------------------------
-    hash.  The only issue is that trailing whitespace is missing from the
-    "make_fs_foo" option.
 
-  2. Write more test cases.
+* xen-create-image man page overhaul:
 
-  3. LVM snapshot support as an install source.
+- ambiguous option list with regards to parameters
 
-  4. xen-delete-image should unallocate any used IP addresses.
+* Interactive Password Handling (maybe also the passwd role)
 
-Steve
+   Shouldn't give up after only one password missmatch. This is just
---
+   a mater of wrapping the passwd call in a loop.
+
+* Fix 70-install-ssh
+
+   Currently 70-install-ssh fails to finish installing the ssh-server
+   because it does not have a random seed to generate the host keys.
+   Mounting /proc and /dev in chroot prior to calling the install
+   function should fix this. If ssh-server is successfully installed
+   in the domU, it's key fingerprint should be echo'd in a way that
+   can easily be grep'ed into other scripts.
+
+
+* Test and support more file system types.
+
+   Actually this should be pretty simple now that the parameters are
+   stored in the configuration hash.  The only issue is that trailing
+   whitespace is missing from the "make_fs_foo" option.
+
+* xen-delete-image doesn't remove all logical volumes if --partitions is used.
+
+   See the link below for details how to reproduce. Reproducable at
+   least with --lvm. Thanks to Antoine Benkemoun for reporting.
+
+   http://xen-tools.org/pipermail/xen-tools-discuss/2010-May/000757.html
+
+* xen-delete-image ignores extension setting
+
+* xen-create-image should check all integer options on non-digits.
+
+* Test suite should pass
+
+   Currently failing:
+
+   t/getopt.t
+   t/xen-delete-image.t
+   t/xen-tools.t
+   t/xt-create-xen-config.t
+
+* Clean up setup-hostname - copying /etc/hosts isn't reliable
+
+   One could argue that that this gives "extra" information to the domU, since
+   the /etc/hosts file may contain more than just hosts on the same subnet.
+   This should atleast be disabled via a flag.
+
+* Setup locales in the hooks?
+
+   Currently no locales are set and this causes several domU errors which appear
+   in the domU's logs.
+
+Maybe for a 4.3 or 5.0 release
+------------------------------
+
+* xen-create-image --dist=... / sources.list generation should be more fine-grained
+
+   xen-tools should offer the possibility to enable/disable
+   security/volatile/backports as well as
+   contrib/non-free/universe/restricted/multiverse for each of them
+   not only based on defaults plus the Dom0's sources.list
+
+   One idea is to allow parameters like
+
+   --dist="lenny:main,contrib,non-free;security;volatile:main"
+
+   and maybe (if the default will be to include security) to also
+   allow
+
+   --dist="lenny;no-security"
+
+   The second idea (by Mathieu Parent) is to have an
+   /etc/xen-tools/sources.list.d/ which then contains files like
+   lenny.list, lenny-server.list, karmic.list, etc. which defaults to
+   $dist.list, but can be also select with --sources-list=lenny-server
+   (which looks for ./lenny-server.list, ./lenny-server,
+   /etc/xen-tools/sources.list.d/lenny-server.list and
+   /etc/xen-tools/sources.list.d/lenny-server in that order).
+
+   Third variant is to use /etc/xen-tools/sources.lists/ instead of
+   /etc/xen-tools/sources.list.d/ because that directory is no
+   runparts-like directory.
+
+* LVM snapshot support as an install source.
+
+* Clean up mounts on Ctrl-C, causes error while installing otherwise:
+
+   Removing /dev/vg0/acromantula-domu1-disk - since we're forcing the install
+   Can't remove open logical volume "acromantula-domu1-disk" this should be a
+   matter of unmounting the mounted volume from /tmp.
+
+* Non-Interactive Password Handling
+
+   Option to generate passwords (check pwgen, apg, makepasswd, and
+   gpw which of them are best suited for generating complete
+   /etc/passwd and /etc/shadow lines). The password should be echo'ed
+   after installation in a way that can be easily grep'ed into other
+   scripts.
+
+* Generic grub support
+
+   This will generate a much nicer menu.lst as a side effect, as its currently
+   generated once at install, and is never updated. Installing a full grub into
+   the domU should update the menu.lst every time a new kernel is installed and
+   will also use the domU distro's menu.lst conform.
+
+* Move the hooks directory to /etc/xen-tools/ to officially allow
+   added and modified hooks.
+
+* Clean up the hooks directory
+
+   Currently we have one directory for Ubuntu and Fedora named after
+   the first supported release which is then duplicated for each
+   subsequent release.
+
+   I'm sure this won't scale forever. So to minimise code duplication
+   I'd like to have one common directory per distribution (e.g. called
+   ubuntu-common, fedora-common, debian-common, maybe even deb-common,
+   rpm-common or yum-common for dpkg/apt-, rpm/yum-based
+   distributions, etc.) with generic hooks valid for all or most of
+   the releases of one distribution and then one hook directory per
+   release (e.g. called ubuntu-10.04 or ubuntu-lucid or so) which has
+   symbolic links to everything which can be used unchanged from the
+   common directory and new files for everything which has to be
+   different or only there.
+
+* Create users, add ssh pubkeys to .ssh/authorized_keys
+
+   Still have to think of a good way of doing this. It would be nice
+   To specify a directory of public keys, parsing the hostnames
+   parsing the usernames from the ssh comment line
+
+* More generic hooks
+
+   Deploy a web server or setup ssmtp directly via flag when setting up
+   the machine. Open to suggestions, should just be some general use-cases
+   that are fairly common.
+
+* Sections for the xen-tools.conf file
+
+   Currently it's really annoying when you are trying to create VMs
+   on multiple subnets. It would be nice to specify with a flag what
+   "type" of configuration you want, and a set of options specific to
+   that flag could be parsed from xen-tools.conf
+
+Stuff from Steve's TODO list / Generic TODOs
+--------------------------------------------
+
+* Write more test cases.
+
+* xen-delete-image should unallocate any used IP addresses.

bin/xen-create-nfs

@@ -94,7 +94,7 @@ Show the version number and exit.
 
 =head1 LICENSE
 
-Copyright (c) 2005-2007 by Steve Kemp.  All rights reserved.
+Copyright (c) 2005-2009 by Steve Kemp.  All rights reserved.
 
 This module is free software;
 you can redistribute it and/or modify it under
@@ -124,17 +124,17 @@ my %CONFIG;
 #
 #  Default options
 #
-$CONFIG{'template'} = '/etc/xen-tools/xm-nfs.tmpl';
+$CONFIG{ 'template' } = '/etc/xen-tools/xm-nfs.tmpl';
 
 
 #
 # Release number.
 #
-my $RELEASE = '4.1';
+my $RELEASE = '4.2rc1';
 
 
 # store version number away.
-$CONFIG{'xen_tools_version'} = $RELEASE;
+$CONFIG{ 'xen_tools_version' } = $RELEASE;
 
 
 #
@@ -161,13 +161,13 @@ testArguments();
 if ( -e "/etc/xen/$CONFIG{'hostname'}.cfg" )
 {
     die "Configuration file for $CONFIG{'hostname'} already exists"
-      unless ( $CONFIG{'force'} );
+      unless ( $CONFIG{ 'force' } );
 }
 
 #
 #  If we've been given any administrators then set them up.
 #
-if ( $CONFIG{'admins'} )
+if ( $CONFIG{ 'admins' } )
 {
     setupAdminUsers();
 }
@@ -258,7 +258,7 @@ sub readConfigurationFile
             }
 
             # Store value.
-            $CONFIG{$key} = $val;
+            $CONFIG{ $key } = $val;
         }
     }
 
@@ -288,30 +288,30 @@ sub parseCommandLineArguments
     GetOptions(
 
         # Networking options
-        "dhcp",        \$CONFIG{'dhcp'},
+        "dhcp",        \$CONFIG{ 'dhcp' },
-        "gateway=s",   \$CONFIG{'gateway'},
+        "gateway=s",   \$CONFIG{ 'gateway' },
-        "broadcast=s", \$CONFIG{'broadcast'},
+        "broadcast=s", \$CONFIG{ 'broadcast' },
-        "ip=s",        \$CONFIG{'ip'},
+        "ip=s",        \$CONFIG{ 'ip' },
-        "netmask=s",   \$CONFIG{'netmask'},
+        "netmask=s",   \$CONFIG{ 'netmask' },
-        "hostname=s",  \$CONFIG{'hostname'},
+        "hostname=s",  \$CONFIG{ 'hostname' },
-        "memory=s",    \$CONFIG{'memory'},
+        "memory=s",    \$CONFIG{ 'memory' },
-        "mac=s",       \$CONFIG{'mac'},
+        "mac=s",       \$CONFIG{ 'mac' },
 
         # NFS options.
-        "nfs_server=s", \$CONFIG{'nfs_server'},
+        "nfs_server=s", \$CONFIG{ 'nfs_server' },
-        "nfs_root=s",   \$CONFIG{'nfs_root'},
+        "nfs_root=s",   \$CONFIG{ 'nfs_root' },
 
         # Misc. options
-        "admins=s",   \$CONFIG{'admins'},
+        "admins=s",   \$CONFIG{ 'admins' },
-        "kernel=s",   \$CONFIG{'kernel'},
+        "kernel=s",   \$CONFIG{ 'kernel' },
-        "initrd=s",   \$CONFIG{'initrd'},
+        "initrd=s",   \$CONFIG{ 'initrd' },
-        "force",      \$CONFIG{'force'},
+        "force",      \$CONFIG{ 'force' },
-        "template=s", \$CONFIG{'template'},
+        "template=s", \$CONFIG{ 'template' },
 
         # Help options
         "help",    \$HELP,
         "manual",  \$MANUAL,
-        "verbose", \$CONFIG{'verbose'},
+        "verbose", \$CONFIG{ 'verbose' },
         "version", \$VERSION
 
     );
@@ -349,33 +349,33 @@ sub testArguments
     #
     #  Hostname is mandatory
     #
-    die "No hostname" unless ( $CONFIG{'hostname'} );
+    die "No hostname" unless ( $CONFIG{ 'hostname' } );
 
     my @network = qw/ ip gateway netmask /;
 
     #
     #  If DHCP then all the other options aren't needed
     #
-    if ( $CONFIG{'dhcp'} )
+    if ( $CONFIG{ 'dhcp' } )
     {
         foreach my $f (@network)
         {
-            delete( $CONFIG{$f} );
+            delete( $CONFIG{ $f } );
         }
     }
     else
     {
         foreach my $f (@network)
         {
-            die "Missing --$f" unless ( $CONFIG{$f} );
+            die "Missing --$f" unless ( $CONFIG{ $f } );
         }
     }
 
     #
     #  We need an NFS server + root
     #
-    die "Missing NFS server." unless ( $CONFIG{'nfs_server'} );
+    die "Missing NFS server." unless ( $CONFIG{ 'nfs_server' } );
-    die "Missing NFS root."   unless ( $CONFIG{'nfs_root'} );
+    die "Missing NFS root."   unless ( $CONFIG{ 'nfs_root' } );
 
 
     # All OK.
@@ -420,7 +420,7 @@ sub setupAdminUsers
     #  For each user make sure they exist, and setup the
     # login shell for them.
     #
-    foreach my $user ( split( /,/, $ENV{'admins'} ) )
+    foreach my $user ( split( /,/, $ENV{ 'admins' } ) )
     {
 
         # Strip leading and trailing whitespace.
@@ -435,22 +435,22 @@ sub setupAdminUsers
         {
 
             # Change shell.
-            $CONFIG{'verbose'} && print "Changing shell for $user: $shell\n";
+            $CONFIG{ 'verbose' } && print "Changing shell for $user: $shell\n";
             system( "chsh", "-s", $shell, $user );
         }
         else
         {
 
             # Add a new user.
-            $CONFIG{'verbose'} && print "Adding new user: $user\n";
+            $CONFIG{ 'verbose' } && print "Adding new user: $user\n";
             system( "useradd", "-s", $shell, $user );
         }
 
         #
         #  Add the entry to /etc/sudoers.
         #
-        open( SUDOERS, ">>", "/etc/sudoers" )
+        open( SUDOERS, ">>", "/etc/sudoers" ) or
-          or warn "Failed to add user to sudoers file : $user - $!";
+          warn "Failed to add user to sudoers file : $user - $!";
         print SUDOERS
           "$user ALL = NOPASSWD: /usr/sbin/xm, /usr/bin/xen-create-image\n";
         close(SUDOERS);
@@ -470,13 +470,13 @@ sub setupAdminUsers
 sub createNewConfigurationFile
 {
     die "Template file missing: $CONFIG{'template'}"
-      unless ( -e $CONFIG{'template'} );
+      unless ( -e $CONFIG{ 'template' } );
 
     #
     #  Load the template.
     #
     my $template = new Text::Template( TYPE   => 'FILE',
-                                       SOURCE => $CONFIG{'template'} );
+                                       SOURCE => $CONFIG{ 'template' } );
 
     my $result = $template->fill_in( HASH => \%CONFIG );
 

bin/xen-delete-image

@@ -141,7 +141,7 @@ Show the version number and exit.
 
 =head1 LICENSE
 
-Copyright (c) 2005-2007 by Steve Kemp.  All rights reserved.
+Copyright (c) 2005-2009 by Steve Kemp.  All rights reserved.
 
 This module is free software;
 you can redistribute it and/or modify it under
@@ -169,7 +169,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.1';
+my $RELEASE = '4.2rc1';
 
 
 
@@ -198,7 +198,7 @@ checkArguments();
 #
 #  Abort if non-root user.
 #
-if ( ( !$CONFIG{'test'} ) && ( $EFFECTIVE_USER_ID != 0 ) )
+if ( ( !$CONFIG{ 'test' } ) && ( $EFFECTIVE_USER_ID != 0 ) )
 {
     print <<E_O_ROOT;
 
@@ -231,7 +231,7 @@ while ( my $name = shift )
 #
 #  Also delete any which were specified using the --hostname flag
 #
-my $hosts = $CONFIG{'hostname'};
+my $hosts = $CONFIG{ 'hostname' };
 foreach my $name (@$hosts)
 {
     if ( !xenRunning($name) )
@@ -318,7 +318,7 @@ sub readConfigurationFile
             }
 
             # Store value.
-            $CONFIG{$key} = $val;
+            $CONFIG{ $key } = $val;
         }
     }
 
@@ -340,20 +340,21 @@ sub parseCommandLineArguments
     my $HELP    = 0;
     my $MANUAL  = 0;
     my $VERSION = 0;
+    $CONFIG{ 'dry-run' } = 0;
 
     #  Parse options.
     #
-    GetOptions(
+    GetOptions( "dir=s",       \$CONFIG{ 'dir' },
-                "dir=s",       \$CONFIG{'dir'},
+                "dry-run",     \$CONFIG{ 'dry-run' },
-                "lvm=s",       \$CONFIG{'lvm'},
+                "lvm=s",       \$CONFIG{ 'lvm' },
-                "evms=s",      \$CONFIG{'evms'},
+                "evms=s",      \$CONFIG{ 'evms' },
-                "hostname=s@", \$CONFIG{'hostname'},
+                "hostname=s@", \$CONFIG{ 'hostname' },
-                "test",        \$CONFIG{'test'},
+                "test",        \$CONFIG{ 'test' },
-                "verbose",     \$CONFIG{'verbose'},
+                "verbose",     \$CONFIG{ 'verbose' },
                 "help",        \$HELP,
                 "manual",      \$MANUAL,
                 "version",     \$VERSION
-    );
+              );
 
     pod2usage(1) if $HELP;
     pod2usage( -verbose => 2 ) if $MANUAL;
@@ -390,10 +391,10 @@ sub checkArguments
     #
     #  When testing we only care about loopback images, not disk images.
     #
-    if ( $CONFIG{'test'} )
+    if ( $CONFIG{ 'test' } )
     {
-        $CONFIG{'lvm'}  = undef;
+        $CONFIG{ 'lvm' }  = undef;
-        $CONFIG{'evms'} = undef;
+        $CONFIG{ 'evms' } = undef;
     }
 
     #
@@ -402,7 +403,7 @@ sub checkArguments
     my $count = 0;
     foreach my $type (qw/dir lvm evms/)
     {
-        $count += 1 if defined( $CONFIG{$type} );
+        $count += 1 if defined( $CONFIG{ $type } );
     }
 
     #
@@ -435,8 +436,8 @@ sub xenRunning
 
     my $running = 0;
 
-    open( CMD, "xm list $hostname 2>/dev/null |" )
+    open( CMD, "xm list $hostname 2>/dev/null |" ) or
-      or die "Failed to run 'xm list $hostname'";
+      die "Failed to run 'xm list $hostname'";
     while (<CMD>)
     {
         my $line = $_;
@@ -489,8 +490,12 @@ sub deleteXenImage
     {
         if ( -e $file )
         {
-            print "Deleting: $file\n";
+            if ($CONFIG{ 'dry-run' }) {
-            unlink($file);
+                print "Would delete: $file\n";
+            } else {
+                print "Deleting: $file\n";
+                unlink($file);
+            }
         }
         else
         {
@@ -499,20 +504,24 @@ sub deleteXenImage
     }
 
 
-    if ( defined( $CONFIG{'dir'} ) )
+    if ( defined( $CONFIG{ 'dir' } ) )
     {
-        my $prefix = $CONFIG{'dir'} . "/domains/";
+        my $prefix = $CONFIG{ 'dir' } . "/domains/";
 
         #
         #  Now remove the directory.
         #
         if ( -d $prefix . $hostname )
         {
-            print "Removing: " . $prefix . $hostname . "\n";
+            if ($CONFIG{ 'dry-run' }) {
-            rmdir( $prefix . $hostname );
+                print "Would delete: $prefix$hostname\n";
+            } else {
+                print "Removing: " . $prefix . $hostname . "\n";
+                rmdir( $prefix . $hostname );
+            }
         }
     }
-    elsif ( defined( $CONFIG{'lvm'} ) )
+    elsif ( defined( $CONFIG{ 'lvm' } ) )
     {
 
         #
@@ -524,18 +533,26 @@ sub deleteXenImage
 
         if ( -e "/dev/$CONFIG{'lvm'}/$hostname-swap" )
         {
-            print "Removing swap volume\n";
+            if ($CONFIG{ 'dry-run' }) {
-            runCommand("lvremove /dev/$CONFIG{'lvm'}/$hostname-swap --force");
+                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");
+            }
         }
 
         if ( -e "/dev/$CONFIG{'lvm'}/$hostname-disk" )
         {
-            print "Removing LVM disk volume\n";
+            if ($CONFIG{ 'dry-run' }) {
-            runCommand("lvremove /dev/$CONFIG{'lvm'}/$hostname-disk --force");
+                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");
+            }
         }
 
     }
-    elsif ( defined( $CONFIG{'evms'} ) )
+    elsif ( defined( $CONFIG{ 'evms' } ) )
     {
 
         #
@@ -547,16 +564,26 @@ sub deleteXenImage
 
         if ( -e "/dev/evms/$hostname-swap" )
         {
-            print "Removing EVMS swap volume\n";
+            if ($CONFIG{ 'dry-run' }) {
-            runCommand("echo Delete : /dev/evms/$hostname-swap | evms");
+                print "Would remove EVMS swap volume: /dev/evms/$hostname-swap\n";
-            runCommand("echo Delete : $CONFIG{'evms'}/$hostname-swap | evms");
+                print "Would remove EVMS swap volume: $CONFIG{'evms'}/$hostname-swap\n";
+            } else {
+                print "Removing EVMS swap volume\n";
+                runCommand("echo Delete : /dev/evms/$hostname-swap | evms");
+                runCommand("echo Delete : $CONFIG{'evms'}/$hostname-swap | evms");
+            }
         }
 
         if ( -e "/dev/evms/$hostname-disk" )
         {
-            print "Removing EVMS disk volume\n";
+            if ($CONFIG{ 'dry-run' }) {
-            runCommand("echo Delete : /dev/evms/$hostname-disk | evms");
+                print "Would remove EVMS disk volume: /dev/evms/$hostname-swap\n";
-            runCommand("echo Delete : $CONFIG{'evms'}/$hostname-disk | evms");
+                print "Would remove EVMS disk volume: $CONFIG{'evms'}/$hostname-swap\n";
+            } else {
+                print "Removing EVMS disk volume\n";
+                runCommand("echo Delete : /dev/evms/$hostname-disk | evms");
+                runCommand("echo Delete : $CONFIG{'evms'}/$hostname-disk | evms");
+            }
         }
 
     }
@@ -589,12 +616,12 @@ sub runCommand
     #
     #  Header.
     #
-    $CONFIG{'verbose'} && print "Executing : $cmd\n";
+    $CONFIG{ 'verbose' } && print "Executing : $cmd\n";
 
     #
     #  Hide output unless running with --debug.
     #
-    if ( $CONFIG{'verbose'} )
+    if ( $CONFIG{ 'verbose' } )
     {
 
         #
@@ -624,10 +651,10 @@ sub runCommand
     #
     # All done.
     #
-    $CONFIG{'verbose'} && print "Output\n";
+    $CONFIG{ 'verbose' } && print "Output\n";
-    $CONFIG{'verbose'} && print "======\n";
+    $CONFIG{ 'verbose' } && print "======\n";
-    $CONFIG{'verbose'} && print $output . "\n";
+    $CONFIG{ 'verbose' } && print $output . "\n";
-    $CONFIG{'verbose'} && print "Finished : $cmd\n";
+    $CONFIG{ 'verbose' } && print "Finished : $cmd\n";
 
     return ($output);
 }

bin/xen-list-images

@@ -69,7 +69,7 @@ Show the version number and exit.
 
 =head1 LICENSE
 
-Copyright (c) 2005-2007 by Steve Kemp.  All rights reserved.
+Copyright (c) 2005-2009 by Steve Kemp.  All rights reserved.
 
 This module is free software;
 you can redistribute it and/or modify it under
@@ -97,12 +97,12 @@ my %CONFIG;
 #
 #  Default prefix
 #
-$CONFIG{'prefix'} = "/etc/xen";
+$CONFIG{ 'prefix' } = "/etc/xen";
 
 #
 # Release number.
 #
-my $RELEASE = '4.1';
+my $RELEASE = '4.2rc1';
 
 
 
@@ -131,7 +131,7 @@ my @instances = findXenInstances();
 my $count = 0;
 foreach my $instance (@instances)
 {
-    if ($count) { print "\n"; }
+    if ($count) {print "\n";}
 
     displayInstance($instance);
     $count += 1;
@@ -214,7 +214,7 @@ sub readConfigurationFile
             }
 
             # Store value.
-            $CONFIG{$key} = $val;
+            $CONFIG{ $key } = $val;
         }
     }
     close(FILE);
@@ -238,8 +238,8 @@ sub parseCommandLineArguments
 
     #  Parse options.
     #
-    GetOptions( "test=s", \$CONFIG{'prefix'}, "help", \$HELP, "manual",
+    GetOptions( "test=s", \$CONFIG{ 'prefix' },
-                \$MANUAL, "version", \$VERSION );
+                "help", \$HELP, "manual", \$MANUAL, "version", \$VERSION );
 
     pod2usage(1) if $HELP;
     pod2usage( -verbose => 2 ) if $MANUAL;
@@ -273,7 +273,7 @@ sub findXenInstances
 {
     my @found;
 
-    foreach my $file ( sort( glob( $CONFIG{'prefix'} . "/*.cfg" ) ) )
+    foreach my $file ( sort( glob( $CONFIG{ 'prefix' } . "/*.cfg" ) ) )
     {
         push @found, $file if ( -e $file );
     }

bin/xen-resize-guest

@@ -87,7 +87,7 @@ Show the version number and exit.
 
 =head1 LICENSE
 
-Copyright (c) 2005-2007 by Steve Kemp.  All rights reserved.
+Copyright (c) 2005-2009 by Steve Kemp.  All rights reserved.
 
 This module is free software;
 you can redistribute it and/or modify it under
@@ -116,7 +116,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.1';
+my $RELEASE = '4.2rc1';
 
 
 
@@ -143,13 +143,14 @@ testArguments();
 #
 my $path = undef;
 
-if ( $CONFIG{'dir'} )
+if ( $CONFIG{ 'dir' } )
 {
 
     #
     #  Make sure we can find the disk
     #
-    $path = $CONFIG{'dir'} . "/domains/" . $CONFIG{'hostname'} . "/disk.img";
+    $path =
+      $CONFIG{ 'dir' } . "/domains/" . $CONFIG{ 'hostname' } . "/disk.img";
     if ( !-e $path )
     {
         print <<EOF;
@@ -187,7 +188,7 @@ EOF
     #
     #  Allow panic
     #
-    if ( !$CONFIG{'force'} )
+    if ( !$CONFIG{ 'force' } )
     {
         foreach my $i ( 1 .. 10 )
         {
@@ -202,13 +203,13 @@ EOF
     my $cmd = "dd if=/dev/zero bs=1M count=$CONFIG{'add'}k >> $path";
     system($cmd );
 }
-elsif ( $CONFIG{'lvm'} )
+elsif ( $CONFIG{ 'lvm' } )
 {
 
     #
     #  Make sure we can find the disk
     #
-    $path = "/dev/" . $CONFIG{'lvm'} . "/" . $CONFIG{'hostname'} . "-disk";
+    $path = "/dev/" . $CONFIG{ 'lvm' } . "/" . $CONFIG{ 'hostname' } . "-disk";
     if ( !-e $path )
     {
         print <<EOF;
@@ -246,7 +247,7 @@ EOF
     #
     #  Allow panic
     #
-    if ( !$CONFIG{'force'} )
+    if ( !$CONFIG{ 'force' } )
     {
         foreach my $i ( 1 .. 10 )
         {
@@ -355,7 +356,7 @@ sub readConfigurationFile
             }
 
             # Store value.
-            $CONFIG{$key} = $val;
+            $CONFIG{ $key } = $val;
         }
     }
 
@@ -389,16 +390,16 @@ sub parseCommandLineArguments
     GetOptions(
 
         # Misc. options
-        "add=s",      \$CONFIG{'add'},
+        "add=s",      \$CONFIG{ 'add' },
-        "dir=s",      \$install{'dir'},
+        "dir=s",      \$install{ 'dir' },
-        "lvm=s",      \$install{'lvm'},
+        "lvm=s",      \$install{ 'lvm' },
-        "hostname=s", \$CONFIG{'hostname'},
+        "hostname=s", \$CONFIG{ 'hostname' },
-        "force",      \$CONFIG{'force'},
+        "force",      \$CONFIG{ 'force' },
 
         # Help options
         "help",    \$HELP,
         "manual",  \$MANUAL,
-        "verbose", \$CONFIG{'verbose'},
+        "verbose", \$CONFIG{ 'verbose' },
         "version", \$VERSION
     );
 
@@ -417,17 +418,17 @@ sub parseCommandLineArguments
     # they will allow the configuration values to be overriden by
     # the command line.
     #
-    if ( $install{'lvm'} )
+    if ( $install{ 'lvm' } )
     {
-        $CONFIG{'lvm'} = $install{'lvm'};
+        $CONFIG{ 'lvm' } = $install{ 'lvm' };
-        $CONFIG{'dir'} = undef;
+        $CONFIG{ 'dir' } = undef;
-        delete $CONFIG{'dir'};
+        delete $CONFIG{ 'dir' };
     }
-    if ( $install{'dir'} )
+    if ( $install{ 'dir' } )
     {
-        $CONFIG{'dir'} = $install{'dir'};
+        $CONFIG{ 'dir' } = $install{ 'dir' };
-        $CONFIG{'lvm'} = undef;
+        $CONFIG{ 'lvm' } = undef;
-        delete $CONFIG{'lvm'};
+        delete $CONFIG{ 'lvm' };
     }
 }
 
@@ -447,7 +448,7 @@ sub testArguments
     #
     #  Make sure we received a hostname.
     #
-    if ( !$CONFIG{'hostname'} )
+    if ( !$CONFIG{ 'hostname' } )
     {
         print <<EOF;
 
@@ -462,7 +463,7 @@ EOF
     #
     #  Make sure we received a size.
     #
-    if ( !$CONFIG{'add'} )
+    if ( !$CONFIG{ 'add' } )
     {
         print <<EOF;
 
@@ -478,7 +479,7 @@ EOF
     #
     #  Make sure the guest isn't running
     #
-    if ( xenRunning( $CONFIG{'hostname'} ) )
+    if ( xenRunning( $CONFIG{ 'hostname' } ) )
     {
         print "The guest $CONFIG{'hostname'} appears to be running!\n";
         exit 1;
@@ -488,8 +489,10 @@ EOF
     #  We should either have LVM *or* directory - not neither or both.
     #
     my $options = 0;
-    $options += 1 if ( defined( $CONFIG{'lvm'} ) && length( $CONFIG{'lvm'} ) );
+    $options += 1
-    $options += 1 if ( defined( $CONFIG{'dir'} ) && length( $CONFIG{'dir'} ) );
+      if ( defined( $CONFIG{ 'lvm' } ) && length( $CONFIG{ 'lvm' } ) );
+    $options += 1
+      if ( defined( $CONFIG{ 'dir' } ) && length( $CONFIG{ 'dir' } ) );
 
     #
     #  Report
@@ -508,13 +511,13 @@ EOF
     #
     #  Convert from Gb -> Mb;
     #
-    if ( $CONFIG{'add'} =~ /^([0-9.]+)Gb*$/i )
+    if ( $CONFIG{ 'add' } =~ /^([0-9.]+)Gb*$/i )
     {
-        $CONFIG{'add'} = $1 * 1024;
+        $CONFIG{ 'add' } = $1 * 1024;
     }
-    if ( $CONFIG{'add'} =~ /^([0-9.]+)Mb*$/i )
+    if ( $CONFIG{ 'add' } =~ /^([0-9.]+)Mb*$/i )
     {
-        $CONFIG{'add'} = $1;
+        $CONFIG{ 'add' } = $1;
     }
 }
 
@@ -534,8 +537,8 @@ sub xenRunning
 
     my $running = 0;
 
-    open( CMD, "xm list $hostname 2>/dev/null |" )
+    open( CMD, "xm list $hostname 2>/dev/null |" ) or
-      or die "Failed to run 'xm list $hostname'";
+      die "Failed to run 'xm list $hostname'";
     while (<CMD>)
     {
         my $line = $_;

bin/xen-update-image

@@ -92,7 +92,7 @@ Show the version number and exit.
 
 =head1 LICENSE
 
-Copyright (c) 2005-2007 by Steve Kemp.  All rights reserved.
+Copyright (c) 2005-2009 by Steve Kemp.  All rights reserved.
 
 This module is free software;
 you can redistribute it and/or modify it under
@@ -120,7 +120,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.1';
+my $RELEASE = '4.2rc1';
 
 
 #
@@ -210,11 +210,11 @@ sub updateXenImage
     #  If we're dealing with loopback images find the main one,
     # and mount it.
     #
-    if ( $CONFIG{'dir'} )
+    if ( $CONFIG{ 'dir' } )
     {
 
         # The loopback image.
-        $img = $CONFIG{'dir'} . "/domains/" . $name . "/disk.img";
+        $img = $CONFIG{ 'dir' } . "/domains/" . $name . "/disk.img";
 
         if ( !-e $img )
         {
@@ -224,11 +224,11 @@ sub updateXenImage
 
         $mount_cmd = "mount -t auto -o loop $img $tmp";
     }
-    elsif ( $CONFIG{'lvm'} )
+    elsif ( $CONFIG{ 'lvm' } )
     {
 
         # The LVM volume
-        $img = "/dev/" . $CONFIG{'lvm'} . "/$name-disk";
+        $img = "/dev/" . $CONFIG{ 'lvm' } . "/$name-disk";
 
         # make sure it exists.
         if ( !-e $img )
@@ -239,22 +239,27 @@ sub updateXenImage
 
         $mount_cmd = "mount -t auto $img $tmp";
     }
-    elsif ( $CONFIG{'evms'} )
+    elsif ( $CONFIG{ 'evms' } )
     {
 
-# The EVMS volume  -- note, unlike LVM, you don't need the $CONFIG{'evms'}
+        # The EVMS volume -- note, unlike LVM, you don't need the
-# to see it and mount the volume. $CONFIG{'evms'} is only used for manipulating
+        # $CONFIG{'evms'} to see it and mount the
-# the underlying object.  Still, I don't want to mess with the parse code and
+        # volume. $CONFIG{'evms'} is only used for manipulating the
-# make it confusing - otherwise --evms takes an argument everywhere but here,
+        # underlying object.  Still, I don't want to mess with the
-# which will confuse users.  The better solution is to make it so that --evms can
+        # parse code and make it confusing - otherwise --evms takes an
-# take a following container, but doesn't require it.  For the moment, it is
+        # argument everywhere but here, which will confuse users.  The
-# better to leave it as it is, take a container, and then ignore it.
+        # better solution is to make it so that --evms can take a
+        # following container, but doesn't require it.  For the
+        # moment, it is better to leave it as it is, take a container,
+        # and then ignore it.
 
- # The best way to do it is to just read it out of the configuration file,
+        # The best way to do it is to just read it out of the
- # tell the user what you got and where you got it from, and not bother the user
+        # configuration file, tell the user what you got and where you
- # with picking --dir or --lvm or --evms at all, but infer it from the config
+        # got it from, and not bother the user with picking --dir or
- # file's disk = parameter.  xen-delete-image might work the same way, but
+        # --lvm or --evms at all, but infer it from the config file's
- # it could be *slightly* more dangerous in the context of deleting.
+        # disk = parameter.  xen-delete-image might work the same way,
+        # but it could be *slightly* more dangerous in the context of
+        # deleting.
         $img = "/dev/evms/$name-disk";
 
         # make sure it exists.
@@ -279,8 +284,8 @@ sub updateXenImage
     #
     #  Make sure this is a Debian image.
     #
-    if (    ( -e $tmp . "/usr/bin/apt-get" )
+    if ( ( -e $tmp . "/usr/bin/apt-get" ) &&
-         && ( -x $tmp . "/usr/bin/apt-get" ) )
+         ( -x $tmp . "/usr/bin/apt-get" ) )
     {
 
         #
@@ -293,7 +298,7 @@ sub updateXenImage
         #  Now upgrade
         #
         system(
-"DEBIAN_FRONTEND=noninteractive  chroot $tmp /usr/bin/apt-get upgrade --yes --force-yes"
+            "DEBIAN_FRONTEND=noninteractive  chroot $tmp /usr/bin/apt-get upgrade --yes --force-yes"
         );
     }
     else
@@ -326,8 +331,8 @@ sub xenRunning
 
     my $running = 0;
 
-    open( CMD, "xm list 2>/dev/null |" )
+    open( CMD, "xm list 2>/dev/null |" ) or
-      or die "Failed to run 'xm list $hostname'";
+      die "Failed to run 'xm list $hostname'";
     while (<CMD>)
     {
         my $line = $_;
@@ -407,7 +412,7 @@ sub readConfigurationFile
             }
 
             # Store value.
-            $CONFIG{$key} = $val;
+            $CONFIG{ $key } = $val;
         }
     }
 
@@ -432,11 +437,10 @@ sub parseCommandLineArguments
 
     #  Parse options.
     #
-    GetOptions(
+    GetOptions( "dir=s",  \$CONFIG{ 'dir' },  "lvm=s",   \$CONFIG{ 'lvm' },
-                "dir=s",  \$CONFIG{'dir'},  "lvm=s",   \$CONFIG{'lvm'},
+                "evms=s", \$CONFIG{ 'evms' }, "help",    \$HELP,
-                "evms=s", \$CONFIG{'evms'}, "help",    \$HELP,
+                "manual", \$MANUAL,           "version", \$VERSION
-                "manual", \$MANUAL,         "version", \$VERSION
+              );
-    );
 
     pod2usage(1) if $HELP;
     pod2usage( -verbose => 2 ) if $MANUAL;
@@ -475,7 +479,7 @@ sub checkArguments
     my $count = 0;
     foreach my $type (qw/dir lvm evms/)
     {
-        $count += 1 if defined( $CONFIG{$type} );
+        $count += 1 if defined( $CONFIG{ $type } );
     }
 
     #

bin/xt-create-xen-config

@@ -116,7 +116,7 @@ xt-create-config - Create a Xen configuration file for a new guest
 
 =head1 LICENSE
 
-Copyright (c) 2005-2007 by Steve Kemp.  All rights reserved.
+Copyright (c) 2005-2009 by Steve Kemp.  All rights reserved.
 
 This module is free software;
 you can redistribute it and/or modify it under
@@ -150,13 +150,13 @@ my @PARTITIONS = undef;
 #
 #  Default options
 #
-$CONFIG{'template'} = '/etc/xen-tools/xm.tmpl';
+$CONFIG{ 'template' } = '/etc/xen-tools/xm.tmpl';
 
 
 #
 # Release number.
 #
-my $RELEASE = '4.1';
+my $RELEASE = '4.2rc1';
 
 
 
@@ -175,7 +175,7 @@ checkArguments();
 #
 #  If we've been given any administrators then set them up.
 #
-if ( $ENV{'admins'} )
+if ( $ENV{ 'admins' } )
 {
     setupAdminUsers();
 }
@@ -213,16 +213,15 @@ sub parseCommandLineArguments
     #
     #  Parse options.
     #
-    GetOptions(
+    GetOptions( "admins=s",    \$ENV{ 'admins' },
-                "admins=s",    \$ENV{'admins'},
+                "output=s",    \$CONFIG{ 'output' },
-                "output=s",    \$CONFIG{'output'},
+                "extension=s", \$CONFIG{ 'extension' },
-                "extension=s", \$CONFIG{'extension'},
+                "template=s",  \$CONFIG{ 'template' },
-                "template=s",  \$CONFIG{'template'},
+                "verbose",     \$CONFIG{ 'verbose' },
-                "verbose",     \$CONFIG{'verbose'},
                 "help",        \$HELP,
                 "manual",      \$MANUAL,
                 "version",     \$VERSION
-    );
+              );
 
     pod2usage(1) if $HELP;
     pod2usage( -verbose => 2 ) if $MANUAL;
@@ -257,7 +256,7 @@ sub checkArguments
     #
     #  We require an output location.
     #
-    if ( !defined( $CONFIG{'output'} ) )
+    if ( !defined( $CONFIG{ 'output' } ) )
     {
         print "The '--output' argument is mandatory\n";
         exit 1;
@@ -266,10 +265,10 @@ sub checkArguments
     #
     #  The output location should be a directory which exists.
     #
-    if ( !-d $CONFIG{'output'} )
+    if ( !-d $CONFIG{ 'output' } )
     {
         print
-"The output directory we've been given, $CONFIG{'output'}, doesnt exist\n";
+          "The output directory we've been given, $CONFIG{'output'}, doesnt exist\n";
         print "Aborting\n";
         exit 1;
     }
@@ -277,12 +276,12 @@ sub checkArguments
     #
     #  Make sure that any specified template file exists.
     #
-    if ( defined( $CONFIG{'template'} ) )
+    if ( defined( $CONFIG{ 'template' } ) )
     {
-        if ( !-e $CONFIG{'template'} )
+        if ( !-e $CONFIG{ 'template' } )
         {
             print
-"The specified template file, $CONFIG{'template'} does not exist.\n";
+              "The specified template file, $CONFIG{'template'} does not exist.\n";
             exit 1;
         }
     }
@@ -306,21 +305,17 @@ sub importPartitionsFromEnvironment
 {
     @PARTITIONS = ();
 
-    for ( my $i = 1 ; $i <= $ENV{'NUMPARTITIONS'} ; $i++ )
+    for ( my $i = 1 ; $i <= $ENV{ 'NUMPARTITIONS' } ; $i++ )
     {
-        my @parts = split( /:/, $ENV{'PARTITION' . $i}, 7 );
+        my @parts = split( /:/, $ENV{ 'PARTITION' . $i }, 7 );
-        push(
+        push( @PARTITIONS,
-              @PARTITIONS,
+              {  'name'       => $parts[0],
-              {
+                 'size'       => $parts[1],
-               'name'       => $parts[0],
+                 'type'       => $parts[2],
-               'size'       => $parts[1],
+                 'mountpoint' => $parts[3],
-               'type'       => $parts[2],
+                 'options'    => $parts[4],
-               'mountpoint' => $parts[3],
+                 'imagetype'  => $parts[5],
-               'options'    => $parts[4],
+                 'image'      => $parts[6] } );
-               'imagetype'  => $parts[5],
-               'image'      => $parts[6]
-              }
-        );
     }
 }
 
@@ -342,26 +337,31 @@ sub createXenConfig
     #
     #  The output file we're going to process.
     #
-    my $file = $CONFIG{'output'} . '/' . $ENV{'hostname'} . $ENV{'extension'};
+    my $file =
+      $CONFIG{ 'output' } . '/' . $ENV{ 'hostname' } . $ENV{ 'extension' };
 
     #
     #  The template we're going to read from.
     #
     my $template = new Text::Template( TYPE   => 'FILE',
-                                       SOURCE => $CONFIG{'template'} );
+                                       SOURCE => $CONFIG{ 'template' } );
 
 
     #
     #  The device we're using.
     #
-    my $device = 'sda';
+    my $device = 'xvda';
-    if ( defined( $ENV{'ide'} ) )
+    if ( defined( $ENV{ 'ide' } ) )
     {
         $device = 'hda';
     }
-    elsif ( defined( $ENV{'disk_device'} ) )
+    elsif ( defined( $ENV{ 'scsi' } ) )
     {
-        $device = $ENV{'disk_device'};
+        $device = 'sda';
+    }
+    elsif ( defined( $ENV{ 'disk_device' } ) )
+    {
+        $device = $ENV{ 'disk_device' };
 
         # strip /dev/, if present.
         if ( $device =~ /^(.*)\/(.*)$/ )
@@ -369,65 +369,65 @@ sub createXenConfig
             $device = $2;
         }
     }
-    $ENV{'device'} = $device;
+    $ENV{ 'device' } = $device;
 
 
     #
     #  The memory size:  Convert Gb -> Mb.
     #
-    if ( $ENV{'memory'} =~ /^(\d+)Gb*$/i )
+    if ( $ENV{ 'memory' } =~ /^(\d+)Gb*$/i )
     {
-        $ENV{'memory'} = $1 * 1024;
+        $ENV{ 'memory' } = $1 * 1024;
     }
 
     #
     #  Remove any trailing Mb.
     #
-    if ( $ENV{'memory'} =~ /^(\d+)Mb*$/i )
+    if ( $ENV{ 'memory' } =~ /^(\d+)Mb*$/i )
     {
-        $ENV{'memory'} = $1;
+        $ENV{ 'memory' } = $1;
     }
 
 
     #
     # Images as presented to Xen - either loopback images, or LVM partitions.
     #
-    if ( $ENV{'lvm'} )
+    if ( $ENV{ 'lvm' } )
     {
-        $ENV{'image_prefix'} = "phy:$ENV{'lvm'}/$ENV{'hostname'}-";
+        $ENV{ 'image_prefix' } = "phy:$ENV{'lvm'}/$ENV{'hostname'}-";
-        $ENV{'image_suffix'} = '';
+        $ENV{ 'image_suffix' } = '';
         importPartitionsFromEnvironment();
     }
-    elsif ( $ENV{'evms'} )
+    elsif ( $ENV{ 'evms' } )
     {
-        $ENV{'image_prefix'} = "phy:/dev/evms/$ENV{'hostname'}-";
+        $ENV{ 'image_prefix' } = "phy:/dev/evms/$ENV{'hostname'}-";
-        $ENV{'image_suffix'} = '';
+        $ENV{ 'image_suffix' } = '';
         importPartitionsFromEnvironment();
     }
-    elsif ( $ENV{'image-dev'} )
+    elsif ( $ENV{ 'image-dev' } )
     {
-        $ENV{'image_vbd'} = "phy:$ENV{'image-dev'}";
+        $ENV{ 'image_vbd' } = "phy:$ENV{'image-dev'}";
 
-        if ( $ENV{'swap-dev'} )
+        if ( $ENV{ 'swap-dev' } )
         {
-            $ENV{'swap_vbd'} = "phy:$ENV{'swap-dev'}";
+            $ENV{ 'swap_vbd' } = "phy:$ENV{'swap-dev'}";
         }
         else
         {
-            $ENV{'swap_vbd'} = undef;
+            $ENV{ 'swap_vbd' } = undef;
         }
     }
     else
     {
-        $ENV{'image_prefix'} = "file:$ENV{'dir'}/domains/$ENV{'hostname'}/";
+        $ENV{ 'image_prefix' } = "file:$ENV{'dir'}/domains/$ENV{'hostname'}/";
-        $ENV{'image_suffix'} = '.img';
+        $ENV{ 'image_suffix' } = '.img';
         importPartitionsFromEnvironment();
     }
 
     #
     # The xen-tools version.
     #
-    $ENV{'xen_tools_version'} = $RELEASE;
+    $ENV{ 'xen_tools_version' } = $RELEASE;
 
 
     #
@@ -438,9 +438,9 @@ sub createXenConfig
     my %vars;
     foreach my $key ( sort keys %ENV )
     {
-        $vars{$key} = $ENV{$key};
+        $vars{ $key } = $ENV{ $key };
     }
-    $vars{'PARTITIONS'} = \@PARTITIONS;
+    $vars{ 'PARTITIONS' } = \@PARTITIONS;
 
     #
     #  Now output the data.
@@ -510,7 +510,7 @@ sub setupAdminUsers
     #  For each user make sure they exist, and setup the
     # login shell for them.
     #
-    foreach my $user ( split( /,/, $ENV{'admins'} ) )
+    foreach my $user ( split( /,/, $ENV{ 'admins' } ) )
     {
 
         # Strip leading and trailing whitespace.
@@ -525,22 +525,22 @@ sub setupAdminUsers
         {
 
             # Change shell.
-            $CONFIG{'verbose'} && print "Changing shell for $user: $shell\n";
+            $CONFIG{ 'verbose' } && print "Changing shell for $user: $shell\n";
             system( "chsh", "-s", $shell, $user );
         }
         else
         {
 
             # Add a new user.
-            $CONFIG{'verbose'} && print "Adding new user: $user\n";
+            $CONFIG{ 'verbose' } && print "Adding new user: $user\n";
             system( "useradd", "-s", $shell, $user );
         }
 
         #
         #  Add the entry to /etc/sudoers.
         #
-        open( SUDOERS, ">>", "/etc/sudoers" )
+        open( SUDOERS, ">>", "/etc/sudoers" ) or
-          or warn "Failed to add user to sudoers file : $user - $!";
+          warn "Failed to add user to sudoers file : $user - $!";
         print SUDOERS
           "$user ALL = NOPASSWD: /usr/sbin/xm, /usr/bin/xen-create-image\n";
         close(SUDOERS);

bin/xt-customize-image

@@ -71,7 +71,7 @@ xt-customize-image - Customize a freshly installed copy of GNU/Linux
 
 =head1 LICENSE
 
-Copyright (c) 2005-2007 by Steve Kemp.  All rights reserved.
+Copyright (c) 2005-2009 by Steve Kemp.  All rights reserved.
 
 This module is free software;
 you can redistribute it and/or modify it under
@@ -97,7 +97,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.1';
+my $RELEASE = '4.2rc1';
 
 
 
@@ -144,14 +144,13 @@ sub parseCommandLineArguments
     #
     #  Parse options.
     #
-    GetOptions(
+    GetOptions( "location=s", \$CONFIG{ 'location' },
-                "location=s", \$CONFIG{'location'},
+                "dist=s",     \$CONFIG{ 'dist' },
-                "dist=s",     \$CONFIG{'dist'},
+                "verbose",    \$CONFIG{ 'verbose' },
-                "verbose",    \$CONFIG{'verbose'},
                 "help",       \$HELP,
                 "manual",     \$MANUAL,
                 "version",    \$VERSION
-    );
+              );
 
     pod2usage(1) if $HELP;
     pod2usage( -verbose => 2 ) if $MANUAL;
@@ -186,7 +185,7 @@ sub checkArguments
     #
     #  We require a location.
     #
-    if ( !defined( $CONFIG{'location'} ) )
+    if ( !defined( $CONFIG{ 'location' } ) )
     {
         print "The '--location' argument is mandatory\n";
         exit 1;
@@ -196,7 +195,7 @@ sub checkArguments
     #
     #  Test that the location we've been given exists
     #
-    if ( !-d $CONFIG{'location'} )
+    if ( !-d $CONFIG{ 'location' } )
     {
         print "The installation directory we've been given doesn't exist\n";
         print "We tried to use : $CONFIG{'location'}\n";
@@ -207,7 +206,7 @@ sub checkArguments
     #
     #  We require a distribution name.
     #
-    if ( !defined( $CONFIG{'dist'} ) )
+    if ( !defined( $CONFIG{ 'dist' } ) )
     {
         print "The '--dist' argument is mandatory\n";
         exit 1;
@@ -221,7 +220,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/lib/xen-tools/" . $CONFIG{ 'dist' } . ".d";
 
     if ( !-d $dir )
     {
@@ -263,12 +262,12 @@ sub runDistributionHooks
     #
     #  Hook directory.
     #
-    my $hooks = "/usr/lib/xen-tools/" . $CONFIG{'dist'} . ".d/";
+    my $hooks = "/usr/lib/xen-tools/" . $CONFIG{ 'dist' } . ".d/";
 
     #
     #  Installation prefix
     #
-    my $prefix = $CONFIG{'location'};
+    my $prefix = $CONFIG{ 'location' };
 
     #
     #  If we're running verbosely then setup the client environment
@@ -277,9 +276,9 @@ sub runDistributionHooks
     #  This is useful in case this script is called outwith the usual
     # xen-create-image framework.
     #
-    if ( $CONFIG{'verbose'} )
+    if ( $CONFIG{ 'verbose' } )
     {
-        $ENV{'verbose'} = 1;
+        $ENV{ 'verbose' } = 1;
     }
 
     #
@@ -317,18 +316,26 @@ sub runDistributionHooks
             #  Run the command.  This has different prolog and epilog
             # depending on whether we're running verbosely or not.
             #
-            if ( $CONFIG{'verbose'} )
+            if ( $CONFIG{ 'verbose' } )
             {
                 print "Running hook $name ['$cmd']\n";
                 print "--\n";
-                system($cmd );
+                my $rc = system($cmd);
+                if ($rc != 0) {
+		    print "hook $name failed: $?\n";
+		    exit 1;
+		}
                 print "--\n";
                 print "Done\n\n";
             }
             else
             {
                 print "Running hook $name\n";
-                system($cmd );
+                my $rc = system($cmd);
+                if ($rc != 0) {
+		    print "hook $name failed: $?\n";
+		    exit 1;
+		}
                 print "hook $name: done.\n";
             }
         }

bin/xt-guess-suite-and-mirror

@@ -0,0 +1,183 @@
+#!/usr/bin/perl -w
+
+=head1 NAME
+
+xen-guess-debian-mirror - Tries to guess the most suitable mirror and
+suite for DomUs on Debian and Ubuntu Dom0s.
+
+=cut
+
+=head1 SYNOPSIS
+
+  xen-guess-debian-mirror [-s] [-m]
+
+  -s  show suite
+  -m  show mirror
+
+  Shows both if no parameter is given.
+
+=cut
+
+=head1 DESCRIPTION
+
+xen-guess-debian-mirror tries to find the mirror and suite the Xen
+Dom0 is currently using and returns them in a way suitable for
+xen-create-image(1) or the backticks feature in xen-tools.conf.
+
+=cut
+
+=head1 AUTHOR
+
+ Axel Beckert <abe@deuxchevaux.org>, http://noone.org/abe/
+
+=cut
+
+=head1 LICENSE
+
+Copyright (C) 2010 by Steve Kemp.  All rights reserved.
+
+This module is free software; you can redistribute it and/or modify it
+under the same terms as Perl itself. The LICENSE file contains the
+full text of the license.
+
+=cut
+
+###
+### Configuration
+###
+
+# Fallback to Debian or Ubuntu in case we can't find anything
+my $fallback = 'Debian';
+
+# Which mirrors to use if everything else fails
+my %fallback_mirror = ( Debian => 'http://ftp.debian.org/debian/',
+                        Ubuntu => 'http://archive.ubuntu.com/ubuntu/' );
+
+# Which suite to use if everything else fails. For Debian "stable"
+# should be the best choice independent of the time. Ubuntu does not
+# have aliases like stable or testing, so we take the nearest LTS
+# release which is 10.04 at the time of writing.
+my %fallback_suite = ( Debian => 'stable',
+                       Ubuntu => 'lucid' );
+
+# Where to look for the sources.list to parse
+my $sources_list_file = '/etc/apt/sources.list';
+
+use File::Slurp;
+use Getopt::Long;
+use Pod::Usage;
+
+use strict;
+
+
+#
+# Release number.
+#
+my $RELEASE = '4.2rc1';
+
+# Init
+my $mirror = '';
+my $suite = '';
+my $found = 0;
+
+# Parsing command line options
+my $want_mirror  = 0;
+my $want_suite   = 0;
+my $want_version = 0;
+my $want_help    = 0;
+my $want_usage    = 0;
+
+my $result = GetOptions ('mirror'  => \$want_mirror,
+                         'suite'   => \$want_suite,
+                         'version' => \$want_version,
+                         'usage'    => \$want_usage,
+                         'help'    => \$want_help);
+
+if ($want_help) {
+    print "Usage: $0 [-m] [-s]\n";
+    exit 0;
+}
+
+if ($want_usage) {
+    pod2usage(0);
+}
+
+if (-r $sources_list_file) {
+    # sources.list exists, so it's something debianoid.
+
+    # read sources.list and split it into lines
+    my @sources_list = read_file($sources_list_file);
+
+    # Find the first line which is a Debian or Ubuntu mirror but not
+    # an updates, backports, volatile or security mirror.
+    foreach my $sources_list_entry (@sources_list) {
+        # Normalize line
+        chomp($sources_list_entry);
+        $sources_list_entry =~ s/^\s*(.*?)\s*$/$1/;
+
+        # Skip definite non-entries
+        next if $sources_list_entry =~ /^\s*($|#)/;
+
+        # Split up into fields
+        my @source_components = split(/\s+/, $sources_list_entry);
+
+        # Minimum number of components is 4
+        next if $#source_components < 3;
+
+        # Don't use deb-src entries.
+        next if $source_components[0] eq 'deb-src';
+
+        # Skip updates, backports, volatile or security mirror.
+        next if $source_components[2] !~ /^[a-z]+$/;
+
+        if ($source_components[1] =~ m(/debian/?$|/ubuntu/?$)) {
+            # Seems a typical mirror. Let's use that one
+
+            $mirror = $source_components[1];
+            $suite = $source_components[2];
+
+            $found = 1;
+            last;
+        }
+    }
+
+    warn "Couldn't parse $sources_list_file of the Dom0.\n" unless $found;
+}
+
+my $lsb_release = `which lsb_release`;
+chomp($lsb_release);
+
+if (!$found and $lsb_release and -x $lsb_release) {
+    my $vendor = `$lsb_release -s -i`;
+
+    if ($vendor eq 'Debian' or $vendor eq 'Ubuntu') {
+        $suite = `$lsb_release -s -c`;
+        chomp($suite);
+
+        unless ($suite) {
+            $suite = $fallback_suite{$vendor};
+            warn "Dom0 seems to be $vendor, but couldn't determine suite. Falling back to $suite.\n";
+        }
+
+        $mirror = $fallback_mirror{$vendor};
+
+        $found = 1;
+    }
+}
+
+if ($found) {
+    unless ($want_help || $want_version || $want_suite || $want_mirror) {
+        print "$mirror $suite\n";
+    } else {
+        if ($want_mirror) {
+            print "$mirror";
+        }
+        if ($want_suite) {
+            print "$suite";
+        }
+        print "\n";
+    }
+} else {
+    $suite  = $fallback_suite{$fallback};
+    $mirror = $fallback_mirror{$fallback};
+}

bin/xt-install-image

@@ -29,8 +29,11 @@ xt-install-image - Install a fresh copy of GNU/Linux into a directory
    --mirror         The mirror to use when installing with 'debootstrap'.
 
   Installation Options:
-   --install-method Specify the installation method to use.
+   --install-method  Specify the installation method to use.
-   --install-source Specify the installation source to use.
+   --install-source  Specify the installation source to use.
+   --debootstrap-cmd Specify which debootstrap command to
+                     use. Defaults to debootstrap if both, debootstrap
+                     and cdebootstrap are installed.
 
   All other options from xen-create-image will be passed as environmental
  variables.
@@ -88,7 +91,7 @@ Untar a .tar file into the new installation location.  This tarfile is assumed t
 
 =head1 LICENSE
 
-Copyright (c) 2005-2007 by Steve Kemp.  All rights reserved.
+Copyright (c) 2005-2009 by Steve Kemp.  All rights reserved.
 
 This module is free software;
 you can redistribute it and/or modify it under
@@ -113,7 +116,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.1';
+my $RELEASE = '4.2rc1';
 
 
 #
@@ -128,33 +131,23 @@ my $RELEASE = '4.1';
 #
 #
 my %dispatch = (
-                 "copy" => {
+                 "copy" => { sub           => \&do_copy,
-                            sub           => \&do_copy,
+                             needBinary    => "/bin/cp",
-                            needBinary    => "/bin/cp",
+                             needDirectory => 1,
-                            needDirectory => 1,
+                           },
-                 },
+                 "debootstrap" => { sub        => \&do_debootstrap,
-                 "debootstrap" => {
+                                    needBinary => "/usr/sbin/debootstrap",
-                                   sub        => \&do_debootstrap,
+                                  },
-                                   needBinary => "/usr/sbin/debootstrap",
+                 "rinse" => { sub        => \&do_rinse,
-                 },
+                              needBinary => "/usr/sbin/rinse",
-                 "image-server" => {
+                            },
-                                    sub     => \&do_image_server,
+                 "rpmstrap" => { sub        => \&do_rpmstrap,
-                                    needURL => 1,
+                                 needBinary => "/usr/bin/rpmstrap",
-                 },
+                               },
-                 "rinse" => {
+                 "tar" => { sub        => \&do_tar,
-                             sub        => \&do_rinse,
+                            needBinary => "/bin/tar",
-                             needBinary => "/usr/bin/rinse",
+                            needFile   => 1,
-                 },
+                          } );
-                 "rpmstrap" => {
-                                sub        => \&do_rpmstrap,
-                                needBinary => "/usr/bin/rpmstrap",
-                 },
-                 "tar" => {
-                           sub        => \&do_tar,
-                           needBinary => "/bin/tar",
-                           needFile   => 1,
-                 }
-);
 
 
 
@@ -173,9 +166,9 @@ parseCommandLineArguments();
 #
 #  If we received a configuration file then read it.
 #
-if ( $CONFIG{'config'} )
+if ( $CONFIG{ 'config' } )
 {
-    my $path = $CONFIG{'config'};
+    my $path = $CONFIG{ 'config' };
 
     # If not fully-qualified then read from /etc/xen-tools.
     if ( $path !~ /^[\/]/ )
@@ -197,14 +190,14 @@ checkArguments();
 #
 #  Now lookup our installation type and dispatch control to it.
 #
-if ( defined( $CONFIG{'install-method'} )
+if ( defined( $CONFIG{ 'install-method' } ) &&
-     && length( $CONFIG{'install-method'} ) )
+     length( $CONFIG{ 'install-method' } ) )
 {
 
     #
     #  Get the entry from the dispatch table.
     #
-    my $installer = $dispatch{lc( $CONFIG{'install-method'} )};
+    my $installer = $dispatch{ lc( $CONFIG{ 'install-method' } ) };
 
     if ( defined($installer) )
     {
@@ -214,48 +207,48 @@ if ( defined( $CONFIG{'install-method'} )
         #
 
         # Do we need to test for a binary.
-        if (    ( $installer->{'needBinary'} )
+        if ( ( $installer->{ 'needBinary' } ) &&
-             && ( !-x $installer->{'needBinary'} ) )
+             ( !-x $installer->{ 'needBinary' } ) )
         {
             print
-"The following required binary for the installation was not found\n";
+              "The following required binary for the installation was not found\n";
-            print "\t" . $installer->{'needBinary'} . "\n";
+            print "\t" . $installer->{ 'needBinary' } . "\n";
             exit 1;
         }
 
         # Do we need a directory specified as the installation source?
-        if (   ( $installer->{'needDirectory'} )
+        if ( ( $installer->{ 'needDirectory' } ) &&
-            && ( !$CONFIG{'install-source'} || !-d $CONFIG{'install-source'} ) )
+             ( !$CONFIG{ 'install-source' } || !-d $CONFIG{ 'install-source' } )
+           )
         {
             print "Please specify the source directory with --install-source\n";
-            if ( $CONFIG{'install-source'} )
+            if ( $CONFIG{ 'install-source' } )
             {
                 print
-"The specified directory $CONFIG{'install-source'} does not exist.\n";
+                  "The specified directory $CONFIG{'install-source'} does not exist.\n";
             }
             exit 1;
         }
 
         # Do we need a file specified as the installation source?
-        if (   ( $installer->{'needFile'} )
+        if ( ( $installer->{ 'needFile' } ) &&
-            && ( !$CONFIG{'install-source'} || !-e $CONFIG{'install-source'} ) )
+             ( !$CONFIG{ 'install-source' } || !-e $CONFIG{ 'install-source' } )
+           )
         {
             print "Please specify the source file with --install-source\n";
 
-            if ( $CONFIG{'install-source'} )
+            if ( $CONFIG{ 'install-source' } )
             {
                 print
-"The specified file $CONFIG{'install-source'} does not exist.\n";
+                  "The specified file $CONFIG{'install-source'} does not exist.\n";
             }
             exit 1;
         }
 
         # Do we need an URL specified as the installation source?
-        if (
+        if ( ( $installer->{ 'needURL' } ) &&
-             ( $installer->{'needURL'} )
+             ( !$CONFIG{ 'install-source' } ||
-             && ( !$CONFIG{'install-source'}
+                ( $CONFIG{ 'install-source' } !~ /^http/i ) ) )
-                  || ( $CONFIG{'install-source'} !~ /^http/i ) )
-          )
         {
             print "Please specify the image server URL with --install-source\n";
             exit 1;
@@ -266,7 +259,7 @@ if ( defined( $CONFIG{'install-method'} )
         #
         #  Now we can call the appropriate handler.
         #
-        $installer->{'sub'}->();
+        $installer->{ 'sub' }->();
 
         #
         #  Did the operation succeed?
@@ -275,7 +268,7 @@ if ( defined( $CONFIG{'install-method'} )
         #
         foreach my $file (qw( /bin/ls /bin/cp ))
         {
-            if ( !-x $CONFIG{'location'} . $file )
+            if ( !-x $CONFIG{ 'location' } . $file )
             {
                 print "The installation of the new system has failed.\n";
                 print "\n";
@@ -375,7 +368,7 @@ sub readConfigurationFile
             }
 
             # Store value.
-            $CONFIG{$key} = $val;
+            $CONFIG{ $key } = $val;
         }
     }
 
@@ -404,22 +397,23 @@ sub parseCommandLineArguments
     GetOptions(
 
         # Mandatory
-        "location=s", \$CONFIG{'location'},
+        "location=s", \$CONFIG{ 'location' },
-        "dist=s",     \$CONFIG{'dist'},
+        "dist=s",     \$CONFIG{ 'dist' },
-        "hostname=s", \$CONFIG{'hostname'},
+        "hostname=s", \$CONFIG{ 'hostname' },
 
         # Installation method
-        "install-method=s", \$CONFIG{'install-method'},
+        "install-method=s", \$CONFIG{ 'install-method' },
-        "install-source=s", \$CONFIG{'install-source'},
+        "install-source=s", \$CONFIG{ 'install-source' },
+        "debootstrap-cmd=s", \$CONFIG{ 'debootstrap-cmd' },
 
         # Misc
-        "arch=s",   \$CONFIG{'arch'},
+        "arch=s",   \$CONFIG{ 'arch' },
-        "cache=s",  \$CONFIG{'cache'},
+        "cache=s",  \$CONFIG{ 'cache' },
-        "config=s", \$CONFIG{'config'},
+        "config=s", \$CONFIG{ 'config' },
-        "mirror=s", \$CONFIG{'mirror'},
+        "mirror=s", \$CONFIG{ 'mirror' },
 
         # Help.
-        "verbose", \$CONFIG{'verbose'},
+        "verbose", \$CONFIG{ 'verbose' },
         "help",    \$HELP,
         "manual",  \$MANUAL,
         "version", \$VERSION
@@ -458,7 +452,7 @@ sub checkArguments
     #
     #  We require a location.
     #
-    if ( !defined( $CONFIG{'location'} ) )
+    if ( !defined( $CONFIG{ 'location' } ) )
     {
         print "The '--location' argument is mandatory\n";
         exit 1;
@@ -468,7 +462,7 @@ sub checkArguments
     #
     #  Test that the location we've been given exists
     #
-    if ( !-d $CONFIG{'location'} )
+    if ( !-d $CONFIG{ 'location' } )
     {
         print "The installation directory we've been given doesn't exist\n";
         print "We tried to use : $CONFIG{'location'}\n";
@@ -479,7 +473,7 @@ sub checkArguments
     #
     #  We require a distribution name.
     #
-    if ( !defined( $CONFIG{'dist'} ) )
+    if ( !defined( $CONFIG{ 'dist' } ) )
     {
         print "The '--dist' argument is mandatory\n";
         exit 1;
@@ -493,18 +487,18 @@ 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/lib/xen-tools/" . $CONFIG{ 'dist' } . ".d";
 
     if ( !-d $dir )
     {
         print <<E_OR;
 
-  We're trying to configure an installation of $CONFIG{'dist'} in
+  We are trying to configure an installation of $CONFIG{'dist'} in
  $CONFIG{'location'} - but there is no hook directory for us to use.
 
-  This means we won't know how to configure this installation.
+  This means we would not know how to configure this installation.
 
-  We'd expect the hook directory to be : $dir
+  We would expect the hook directory to be $dir.
 
   Aborting.
 E_OR
@@ -516,12 +510,12 @@ E_OR
     #  Test that we received a valid installation type.
     #
     my $valid = 0;
-    if ( defined( $CONFIG{'install-method'} ) )
+    if ( defined( $CONFIG{ 'install-method' } ) )
     {
         foreach my $recognised ( keys %dispatch )
         {
             $valid = 1
-              if ( lc( $CONFIG{'install-method'} ) eq lc($recognised) );
+              if ( lc( $CONFIG{ 'install-method' } ) eq lc($recognised) );
         }
     }
     else
@@ -567,7 +561,7 @@ sub runCommand
     #
     #  Command start.
     #
-    $CONFIG{'verbose'} && print "Executing : $cmd\n";
+    $CONFIG{ 'verbose' } && print "Executing : $cmd\n";
 
     #
     #  Copy stderr to stdout, so we can see it, and make sure we log it.
@@ -583,13 +577,13 @@ sub runCommand
     {
         print "Running command '$cmd' failed.\n";
         print "Aborting\n";
-        exit;
+        exit 127;
     }
 
     #
     #  Command finished.
     #
-    $CONFIG{'verbose'} && print "Finished : $cmd\n";
+    $CONFIG{ 'verbose' } && print "Finished : $cmd\n";
 
     return ($output);
 }
@@ -659,7 +653,7 @@ sub do_copy
     #
     #  Find the copy command to run from the configuration file.
     #
-    my $cmd = $CONFIG{'copy-cmd'};
+    my $cmd = $CONFIG{ 'copy-cmd' };
     if ( !defined($cmd) )
     {
         print "Falling back to default copy command\n";
@@ -695,11 +689,18 @@ 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' };
-    if ( !defined($cmd) )
+    if ( !$cmd )
     {
-        print "Falling back to default debootstrap command\n";
+	if (-x '/usr/sbin/debootstrap') {
-        $cmd = '/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";
     }
 
 
@@ -707,7 +708,7 @@ sub do_debootstrap
     #  Cache from host -> new installation if we've got caching
     # enabled.
     #
-    if ( $CONFIG{'cache'} eq "yes" )
+    if ( $CONFIG{ 'cache' } eq "yes" )
     {
         print "\nCopying files from host to image.\n";
         runCommand("mkdir -p $CONFIG{'location'}/var/cache/apt/archives");
@@ -720,7 +721,7 @@ sub do_debootstrap
     #  Propogate --verbose appropriately.
     #
     my $EXTRA = '';
-    if ( $CONFIG{'verbose'} )
+    if ( $CONFIG{ 'verbose' } )
     {
         $EXTRA = ' --verbose';
     }
@@ -728,7 +729,7 @@ sub do_debootstrap
     #
     #  Propogate the --arch argument
     #
-    if ( $CONFIG{'arch'} )
+    if ( $CONFIG{ 'arch' } )
     {
         $EXTRA .= " --arch $CONFIG{'arch'}";
     }
@@ -750,7 +751,7 @@ sub do_debootstrap
     #  Cache from the new installation -> the host if we've got caching
     # enabled.
     #
-    if ( $CONFIG{'cache'} eq "yes" )
+    if ( $CONFIG{ 'cache' } eq "yes" )
     {
         print "\nCopying files from new installation to host.\n";
         copyDebFiles( "$CONFIG{'location'}/var/cache/apt/archives",
@@ -765,165 +766,7 @@ sub do_debootstrap
 
 =begin doc
 
-  Install a system using the image-server.
+  Install a new distribution of GNU/Linux using the rinse tool.
-
-  Note:  NON-Advertised ....
-
-=end doc
-
-=cut
-
-sub do_image_server
-{
-
-    #
-    #  Load the modules we require.
-    #
-    my $test = 'use LWP::UserAgent; use CGI;';
-
-    #
-    #  Test loading the module, if it fails then
-    # we must abort.  We don't want to insist the module
-    # is installed since that adds to the dependencies
-    # which users will not require for the typical installation
-    # method(s).
-    #
-    eval($test);
-    if ($@)
-    {
-        die "The module LDP::UserAgent wasn't found...\n";
-    }
-
-
-    #
-    #  The number of attempts to request the image from our
-    # image server, and the time to sleep between them.
-    #
-    my $attempts = 30;
-    my $sleep    = 30;
-
-
-    #
-    #  Build up the request we're going to send.
-    #
-    my $request = $CONFIG{'install-source'} . "/create.cgi?submit=1";
-
-    #
-    #  Some parameters are hard-wired.
-    #
-    $request .= "&arch=amd64";
-    $request .= "&root_device=/dev/sda";
-    $request .= "&ip1=" . $ENV{'ip1'};
-    $request .= "&dist=" . CGI::escapeHTML( $CONFIG{'dist'} );
-    $request .= "&hostname=" . CGI::escapeHTML( $CONFIG{'hostname'} );
-
-    #
-    #  We only care about some keys
-    #
-    foreach my $k (qw/ dhcp broadcast gateway netmask  /)
-    {
-
-        # Skip values which aren't defined.
-        next unless defined $ENV{$k};
-
-        # CGI encode.
-        my $val = CGI::escapeHTML( $ENV{$k} );
-
-        # Add on to the request
-        $request .= "&$k=$val";
-    }
-
-
-    #
-    #  Create a new user agent.
-    #
-    my $ua = LWP::UserAgent->new;
-    $ua->timeout(10);
-    $ua->env_proxy;
-
-    #
-    #  Do the creation step
-    #
-    my $response = $ua->get($request);
-    if ( $response->is_success )
-    {
-        my $content = $response->content;
-
-        if ( $content =~ /fetch.cgi\?session=([^"]+)"/ )
-        {
-            my $session = $1;
-            my $new     = $CONFIG{'install-source'};
-            $new .= "/fetch.cgi?session=$session";
-            my $attempt = 1;
-
-            # Make sure we don't wait indefinitely.
-            while ( $attempt < $attempts )
-            {
-                $CONFIG{'verbose'} && print "Request: [$attempt/$attempts]\n";
-
-                #
-                #  Make a request to see if our tar file is ready yet.
-                #
-                $response = $ua->head($new);
-                if ( $response->is_success )
-                {
-
-                    #
-                    #  Get the headers
-                    #
-                    my $header = $response->headers();
-                    my $type   = $header->{'content-type'};
-
-                    #
-                    # OK our file is correct.
-                    #
-                    if ( $type =~ /tar/ )
-                    {
-
-                        #
-                        #  Download it to the installation root.
-                        #
-                        $ua->get( $new,
-                                      ":content_file" => $CONFIG{'location'}
-                                    . "/$session.tar" );
-
-                        #
-                        #  If it worked .. then untar, remove, and return.
-                        #
-                        system(
-"cd $CONFIG{'location'} && tar --numeric-owner -xf $session.tar && rm -f $CONFIG{'location'}/$session.tar"
-                        );
-                        return 1;
-                    }
-                }
-
-                sleep($sleep);
-                $attempt += 1;
-
-            }
-            print("ERROR:  Timeout waiting for image to be ready.");
-            return 0;
-        }
-        else
-        {
-            print(
-                 "ERROR:  Failed to find session.  Received this:\n$content\n");
-            return 0;
-        }
-    }
-    else
-    {
-        print( "ERROR: Submitting the image create request failed:\n"
-               . $response->status_line );
-        return 0;
-    }
-}
-
-
-
-=begin doc
-
-  Install a new distribution of GNU/Linux using the rpmstrap tool.
 
 =end doc
 
@@ -941,7 +784,7 @@ sub do_rinse
     #
     #  Propogate the --arch argument
     #
-    if ( $CONFIG{'arch'} )
+    if ( $CONFIG{ 'arch' } )
     {
         $command .= " --arch $CONFIG{'arch'}";
     }
@@ -950,7 +793,7 @@ sub do_rinse
     #
     #  Propogate the verbosity setting.
     #
-    if ( $CONFIG{'verbose'} )
+    if ( $CONFIG{ 'verbose' } )
     {
         $command .= " --verbose";
     }
@@ -975,7 +818,7 @@ sub do_rpmstrap
     #  Propogate the verbosity setting.
     #
     my $EXTRA = '';
-    if ( $CONFIG{'verbose'} )
+    if ( $CONFIG{ 'verbose' } )
     {
         $EXTRA .= " --verbose";
     }
@@ -983,7 +826,7 @@ sub do_rpmstrap
     #
     #  Propogate any arch setting we might have.
     #
-    if ( $CONFIG{'arch'} )
+    if ( $CONFIG{ 'arch' } )
     {
         $EXTRA .= " --arch $CONFIG{'arch'}";
     }
@@ -992,7 +835,7 @@ sub do_rpmstrap
     #  Setup mirror if present.
     #
     my $mirror = "";
-    $mirror = $CONFIG{'mirror'} if ( $CONFIG{'mirror'} );
+    $mirror = $CONFIG{ 'mirror' } if ( $CONFIG{ 'mirror' } );
 
     #
     #  The command we're going to run.
@@ -1017,7 +860,7 @@ sub do_tar
     #
     #  Find the tar command to run from the configuration file.
     #
-    my $cmd = $CONFIG{'tar-cmd'};
+    my $cmd = $CONFIG{ 'tar-cmd' };
     if ( !defined($cmd) )
     {
         print "Falling back to default tar command\n";

debian/NEWS

@@ -0,0 +1,18 @@
+xen-tools (4.2~rc1-1) unstable; urgency=low
+
+  If the DomU hangs with "Waiting for root file system" despite
+  /dev/xvd* is used as disk device, adding "xen-blkfront" to
+  /etc/initramfs-tools/modules and runing "update-initramfs -u"
+  afterwards may help.
+
+  If the Dom0 is a Debian or Ubuntu, the distribution and suite for
+  DomUs defaults to the distribution and suite the Dom0 is
+  running. Otherwise Debian DomUs get "stable" and Ubuntu "lucid" by
+  default.
+
+  Default Debian/Ubuntu mirror is now determined by looking into
+  /etc/apt/sources.list (if it exists) and taking the first entry with
+  path ending in /debian/ there.
+
+ -- Axel Beckert <abe@debian.org>  Sat, 15 May 2010 18:04:14 +0200
+

debian/README.source

@@ -0,0 +1,21 @@
+How to build xen-tools directly from the Git repository?
+========================================================
+
+Clone the git repository and change to the directory of your local
+working copy.
+
+$ git clone git://gitorious.org/xen-tools/xen-tools.git
+$ cd xen-tools
+
+If you just want to build the binary package, run
+
+$ dpkg-buildpackage -uc -us -b
+
+If you want to build source and binary packages, e.g. for an upload to
+Debian or Ubuntu:
+
+$ make orig-tar-gz
+$ dpkg-buildpackage
+
+
+ -- Axel Beckert <abe@debian.org>, Mon, 17 May 2010 13:31:31 +0200

debian/changelog

@@ -1,3 +1,72 @@
+xen-tools (4.2~rc1-1) UNRELEASED; urgency=low
+
+  * New maintainer and upstream authors
+  * Reintroduction into Debian Unstable (Closes: #566714)
+  * New upstream release candidate
+    - Needs dependency on libfile-slurp-perl
+    - Supports for more recent versions of Fedora, Ubuntu and Debian
+      (Closes: #499477)
+    - Supports pygrub. (Added "Suggests: xen-utils" to debian/control)
+    - Uses hvc0 and xvda devices by default
+    - Sets umask to 0077 before creating disk images (Closes: #548909)
+    - Makes sure, MAKEDEV is found in either /dev/ or /sbin/
+      (Closes: #502798, #515228)
+    - Changed rinse path to /usr/sbin/. (Closes: #511211)
+    - Doesn't delete configuration file if it already exists when
+      xen-create-image is run. (Closes: #520177)
+    - Doesn't write the FQDN into /etc/hostname (Closes: #492583)
+    - Dereferences pointers before hashing them to generate a MAC
+      address. (Closes: #547265)
+    - Calls pwconv and grpconv inside chroot when installing Fedora
+      (Closes: #499476)
+    - Fixed typo in /usr/lib/xen-tools/*.d/75-fixup-securetty
+      (Closes: #503339)
+    - Makes better decisions about when to enable Debian security updates
+      in the created DomU (LP: #309750)
+    - Installs dhclient for CentOS and Fedora if DHCP networking is
+      requested (LP: #241446)
+    - Fixes some bashisms (Closes: #530226)
+      * [^y] → [!y] (Thanks to Mathieu Parent!)
+      * kill -HUP → kill -s HUP (found by checkbashism)
+      * ${parm/?/pat[/str]} → echo | sed
+      * echo -e → printf
+      * read → read dummy
+    - xt-install-image now exits with return value 127 instead of 0 to
+      indicate errors on running the command given in --install-method.
+      (Closes: #534290)
+    - The debootstrap command now also can be configured on the
+      commandline with --debootstrap-cmd in xen-create-image and
+      xt-install-image (Enhances fix for #436480 which added the
+      debootstrap-cmd config file option)
+    - Checks for debootstrap and cdebootstrap, uses debootstrap if both
+      are installed (Changed "Depends: debootstrap" to "Depends:
+      debootstrap | cdebootstrap" in debian/control)
+  * Removal of /etc/bash_completion.d/xm from the package since
+    bash-completion ships a more elaborate version of that file. (Closes:
+    #566683, #550590, LP: #538917, #484098)
+  * Downgrade reiserfsprogs and xfsprogs to Suggests. (Closes: #561618,
+    LP: #80233)
+  * Added evms-cli to Suggests. It has been removed from Debian before
+    Lenny, but it is necessary for some optional functionality of
+    xen-tools. And since some Debian derived distributions (e.g. Ubuntu
+    LTS and grml) still support it, it's included for the sake of
+    completeness and correctness.
+  * Added cfengine2 to Suggests. It is helpful to have it installed when
+    using the cfengine2 role.
+  * Bump Standards-Version to 3.8.4 (no changes necessary)
+  * Bump Debhelper Compatibility to 7
+    - Replace "dh_clean -k" by "dh_prep"
+  * Add Vcs-* headers pointing to new upstream and packaging repository
+  * Fix some Lintian warnings:
+    - [debian/control]: debhelper-but-no-misc-depends
+    - [debian/copyright]: copyright-without-copyright-notice
+    - [debian/source/format]: missing-debian-source-format
+  * Added a README.source explaining how to build xen-tools directly from
+    the Git repository.
+  * Overhauled package description
+
+ -- Axel Beckert <abe@debian.org>  Mon, 17 May 2010 13:32:04 +0200
+
 xen-tools (4.1-1) unstable; urgency=low
 
   - New command line argument '--no-hosts' to avoid touching /etc/hosts

debian/compat

@@ -1 +1 @@
-4
+7

debian/control

@@ -1,18 +1,38 @@
 Source: xen-tools
 Section: utils
 Priority: extra
-Maintainer: Roland Stigge <stigge@antcom.de>
+Maintainer: Axel Beckert <abe@debian.org>
-Uploaders: Radu Spineanu <radu@debian.org>, Steve Kemp <skx@debian.org>
+Build-Depends: debhelper (>= 7.0.0), libtest-pod-perl, libtext-template-perl
-Build-Depends: debhelper (>= 4.0.0), libtest-pod-perl, libtext-template-perl
+Standards-Version: 3.8.4
-Standards-Version: 3.8.0
 Homepage: http://xen-tools.org/software/xen-tools
+Vcs-Browser: http://gitorious.org/xen-tools/xen-tools
+Vcs-Git: git://gitorious.org/xen-tools/xen-tools.git
 
 Package: xen-tools
 Architecture: all
-Depends: debootstrap, perl-modules, libtext-template-perl, libconfig-inifiles-perl
+Depends: debootstrap | cdebootstrap, perl-modules, libtext-template-perl, libconfig-inifiles-perl, libfile-slurp-perl, ${misc:Depends}
-Recommends: xen-hypervisor-amd64 | xen-hypervisor-i386 | xen-hypervisor-i386-pae, reiserfsprogs, xfsprogs, rinse, xen-shell, libexpect-perl
+Recommends: xen-hypervisor-amd64 | xen-hypervisor-i386 | xen-hypervisor-i386-pae, rinse, xen-shell, libexpect-perl
-Description: Tools to manage Debian XEN virtual servers
+Suggests: reiserfsprogs, xfsprogs, xen-utils, cfengine2, evms-cli
- This package contains tools to manage Debian based XEN virtual servers.
+Description: Tools to manage Xen virtual servers
+ This package contains tools to manage Debian based Xen virtual servers.
  .
  Using the scripts you can easily create fully configured Xen guest
- domains (domU) which can be listed, updated, or copied easily.
+ domains (DomU) which can be listed, updated, or copied easily.
+ .
+ xen-tools currently can install:
+ .
+   * Debian 3.1 Sarge (i386 only)
+   * Debian 4.0 Etch
+   * Debian 5.0 Lenny
+   * Debian 6.0 Squeeze
+   * Debian Sid (Unstable)
+   * Ubuntu 6.06 Dapper Drake (LTS)
+   * Ubuntu 6.10 Edgy Eft
+   * Ubuntu 7.04 Feisty Fawn
+   * Ubuntu 7.10 Gutsy Gibbon
+   * Ubuntu 8.04 Hardy Heron (LTS)
+   * Ubuntu 8.10 Intrepid Ibex
+   * Ubuntu 9.04 Jaunty Jackaplope
+   * Ubuntu 9.10 Karmic Koala
+   * Ubuntu 10.04 Lucid Lynx (LTS)
+   * Ubuntu 10.10 Maverick Meerkat

debian/copyright

@@ -3,7 +3,8 @@ Tue, 20 Dec 2005 02:21:05 +0200.
 
 It was downloaded from http://xen-tools.org/software/xen-tools/
 
-Copyright Holder: Steve Kemp <steve@steve.org.uk>
+Copyright 2005-2009: Steve Kemp <steve@steve.org.uk>
+Copyright 2010: Axel Beckert <abe@deuxchevaux.org>
 
 License:
 
@@ -21,4 +22,3 @@ Perl is distributed under licenses:
     On Debian GNU/Linux systems, the complete text of the GNU General
     Public License can be found in /usr/share/common-licenses/GPL' and
     the Artistic Licence in /usr/share/common-licenses/Artistic'.
-

debian/examples/setup-kernel-initrd

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

debian/preinst

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

debian/rules

@@ -25,7 +25,7 @@ clean:
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
+	dh_prep
 
 	make manpages
 	make install prefix=`pwd`/debian/xen-tools

debian/source/format

@@ -0,0 +1 @@
+1.0

etc/xen-tools.conf

@@ -52,7 +52,7 @@
 # LVM volume group here instead
 #
 ##
-# lvm = skx-vg
+# lvm = vg0
 
 
 #
@@ -130,7 +130,7 @@ memory = 128Mb    # Memory size
 swap   = 128Mb    # Swap size
 # noswap = 1      # Don't use swap at all for the new system.
 fs     = ext3     # use the EXT3 filesystem for the disk image.
-dist   = etch     # Default distribution to install.
+dist   = `xt-guess-suite-and-mirror -s` # Default distribution to install.
 image  = sparse   # Specify sparse vs. full disk images.
 
 #
@@ -211,7 +211,7 @@ initrd      = /boot/initrd.img-`uname -r`
 #
 # The default mirror for debootstrap to install Debian-derived distributions
 #
-mirror = http://ftp.us.debian.org/debian/
+mirror = `xt-guess-suite-and-mirror -m`
 
 #
 # A mirror suitable for use when installing the Dapper release of Ubuntu.

etc/xm.tmpl

@@ -19,9 +19,22 @@
 {
   if ( $pygrub )
   {
-    $OUT .= "bootloader = '/usr/bin/pygrub'\n";
+    my $pygrub_bin = '';
+    foreach my $pygrub_path (reverse glob('/usr/lib/xen-*/bin/pygrub
+                                           /usr/lib/xen-default/bin/pygrub
+                                           /usr/*bin/pygrub')) {
+      if (-x $pygrub_path) {
+        $pygrub_bin = $pygrub_path;
+        last;
+      }
+    }
+
+    die "pygrub not found" unless $pygrub_bin;
+
+    $OUT .= "bootloader = '$pygrub_bin'\n";
   }
 }
+vcpus       = '{$vcpus}'
 memory      = '{$memory}'
 
 #
@@ -94,8 +107,22 @@ name        = '{$hostname}'
     {
       $m = "mac=$mac"
     }
-
+    my $br = '';
-    $OUT .= "vif         = [ '$m' ]";
+    if ( $bridge )
+    {
+      if ( $mac )
+      {
+        $br = ",bridge=$bridge"
+      }
+      else
+      {
+        $br = "bridge=$bridge"
+      }
+    }
+    $OUT .= "vif         = [ '";
+    $OUT .= "$m";
+    $OUT .= "$br";
+    $OUT .= "' ]";
   }
   else
   {
@@ -114,9 +141,16 @@ name        = '{$hostname}'
       $vn = ",vifname=$vifname";
     }
 
+    my $br = '';
+    if ( $bridge )
+    {
+      $br = ",bridge=$bridge"
+    }
+
     $OUT .= "vif         = [ 'ip=$ip1";
     $OUT .= "$m";
     $OUT .= "$vn";
+    $OUT .= "$br";
     $OUT .= "' ]";
   }
 }

hooks/centos-4/30-disable-gettys

@@ -31,7 +31,7 @@ logMessage Script $0 starting
 #
 # Do the transformation.
 #
-sed -i -e 's/^\([2-6].*:respawn*\)/#\1/' -e 's/^T/#\t/' ${prefix}/etc/inittab
+sed -i -e 's/^\([2-6].*:respawn*\)/#\1/' -e 's/^T/#\t/' -e 's/tty1$/hvc0/' ${prefix}/etc/inittab
 
 
 #

hooks/centos-4/40-setup-networking

@@ -79,6 +79,7 @@ DEVICE=eth0
 BOOTPROTO=dhcp
 ONBOOT=yes
 E_O_DHCP
+    chroot ${prefix} /usr/bin/yum -y install dhclient
 fi
 
 

hooks/centos-4/50-setup-hostname

@@ -31,7 +31,7 @@ logMessage Script $0 starting
 #
 #  Setup the mailname + hostname files.
 #
-echo ${hostname} > ${prefix}/etc/hostname
+echo ${hostname} | sed 's/^\([^\.]*\)\..*/\1/' > ${prefix}/etc/hostname
 echo ${hostname} > ${prefix}/etc/mailname
 
 
@@ -108,7 +108,7 @@ if [ -z "${dhcp}" ]; then
                 if [ -e /var/run/dnsmasq.pid ]; then
 
                     logMessage Allowing DNSMasq to restart.
-                    kill -HUP `cat /var/run/dnsmasq.pid`
+                    kill -s HUP `cat /var/run/dnsmasq.pid`
                 fi
             fi
         fi

hooks/centos-4/75-fixup-securetty

@@ -30,7 +30,7 @@ logMessage Script $0 starting
 # If the file doesn't exist exit early.
 #
 if [ ! -e ${prefix}/etc/securetty ]; then
-    logMesage /etc/securetty not found.
+    logMessage /etc/securetty not found.
     exit
 fi
 

hooks/centos-4/90-make-fstab

@@ -36,15 +36,19 @@ logMessage Filesystem options are ${options}
 #
 # Find the root device.
 #
-#  1.  default to sda.
+#  1.  default to xvda.
 #
 #  2.  If --ide is specified use hda.
 #
-#  3.  Otherwise use a named $disk_device
+#  3.  If --scsi is specified use sda.
 #
-device=sda
+#  4.  Otherwise use a named $disk_device
+#
+device=xvda
 if [ "${ide}" ]; then
     device=hda
+elif [ "${scsi}" ]; then
+    device=sda
 else
     if [ ! -z "${disk_device}" ]; then
         device=`basename $disk_device`

hooks/centos-5/30-disable-gettys

@@ -31,7 +31,7 @@ logMessage Script $0 starting
 #
 # Do the transformation.
 #
-sed -i -e 's/^\([2-6].*:respawn*\)/#\1/' -e 's/^T/#\t/' ${prefix}/etc/inittab
+sed -i -e 's/^\([2-6].*:respawn*\)/#\1/' -e 's/^T/#\t/' -e 's/tty1$/hvc0/' ${prefix}/etc/inittab
 
 
 #

hooks/centos-5/40-setup-networking

@@ -79,6 +79,7 @@ DEVICE=eth0
 BOOTPROTO=dhcp
 ONBOOT=yes
 E_O_DHCP
+    chroot ${prefix} /usr/bin/yum -y install dhclient
 fi
 
 

hooks/centos-5/50-setup-hostname

@@ -31,7 +31,7 @@ logMessage Script $0 starting
 #
 #  Setup the mailname + hostname files.
 #
-echo ${hostname} > ${prefix}/etc/hostname
+echo ${hostname} | sed 's/^\([^\.]*\)\..*/\1/' > ${prefix}/etc/hostname
 echo ${hostname} > ${prefix}/etc/mailname
 
 
@@ -105,7 +105,7 @@ if [ -z "${dhcp}" ]; then
                 if [ -e /var/run/dnsmasq.pid ]; then
 
                     logMessage Allowing DNSMasq to restart.
-                    kill -HUP `cat /var/run/dnsmasq.pid`
+                    kill -s HUP `cat /var/run/dnsmasq.pid`
                 fi
             fi
         fi

hooks/centos-5/75-fixup-securetty

@@ -30,7 +30,7 @@ logMessage Script $0 starting
 # If the file doesn't exist exit early.
 #
 if [ ! -e ${prefix}/etc/securetty ]; then
-    logMesage /etc/securetty not found.
+    logMessage /etc/securetty not found.
     exit
 fi
 

hooks/centos-5/90-make-fstab

@@ -37,15 +37,19 @@ logMessage Filesystem options are ${options}
 #
 # Find the root device.
 #
-#  1.  default to sda.
+#  1.  default to xvda.
 #
 #  2.  If --ide is specified use hda.
 #
-#  3.  Otherwise use a named $disk_device
+#  3.  If --scsi is specified use sda.
 #
-device=sda
+#  4.  Otherwise use a named $disk_device
+#
+device=xvda
 if [ "${ide}" ]; then
     device=hda
+elif [ "${scsi}" ]; then
+    device=sda
 else
     if [ ! -z "${disk_device}" ]; then
         device=`basename $disk_device`

hooks/common.sh

@@ -85,7 +85,7 @@ installDebianPackage ()
     #
     #  Use policy-rc to stop any daemons from starting.
     #
-    echo -e '#!/bin/bash\nexit 101\n' > ${prefix}/usr/sbin/policy-rc.d
+    printf '#!/bin/bash\nexit 101\n' > ${prefix}/usr/sbin/policy-rc.d
     chmod +x ${prefix}/usr/sbin/policy-rc.d
 
     #
@@ -98,7 +98,9 @@ installDebianPackage ()
     #
     # Install the packages
     #
+    mount -t devpts devpts ${prefix}/dev/pts
     DEBIAN_FRONTEND=noninteractive chroot ${prefix} /usr/bin/apt-get --yes --force-yes install "$@"
+    umount ${prefix}/dev/pts
 
     #
     #  Remove the policy-rc.d script.
@@ -218,6 +220,28 @@ installCentOS4Package ()
 }
 
 
+
+#
+#  Install a package using whatever package management tool is available
+#
+installPackage ()
+{
+	prefix=$1
+	package=$2
+
+	if [ -x ${prefix}/usr/bin/apt-get ] ; then
+		installDebianPackage "$@"
+
+	elif [ -x ${prefix}/usr/bin/yum ] ; then
+		installCentOS4Package "$@"
+
+	else
+		logMessage "Unable to install package ${package}; no package manager found"
+	fi
+}
+
+
+
 #
 #  Install a package upon a gentoo system via emerge.
 #

hooks/dapper/30-disable-gettys

@@ -28,7 +28,7 @@ logMessage Script $0 starting
 #
 # Switch off the gettys for everything other than tty1.
 #
-sed -i -e 's/^\([2-6].*:respawn*\)/#\1/' -e 's/^T/#\t/' ${prefix}/etc/inittab
+sed -i -e 's/^\([2-6].*:respawn*\)/#\1/' -e 's/^T/#\t/' -e 's/tty1$/hvc0/' ${prefix}/etc/inittab
 
 
 #

hooks/dapper/50-setup-hostname

@@ -31,7 +31,7 @@ logMessage Script $0 starting
 #
 #  Setup the mailname + hostname files.
 #
-echo ${hostname} > ${prefix}/etc/hostname
+echo ${hostname} | sed 's/^\([^\.]*\)\..*/\1/' > ${prefix}/etc/hostname
 echo ${hostname} > ${prefix}/etc/mailname
 
 
@@ -106,7 +106,7 @@ if [ -z "${dhcp}" ]; then
                 if [ -e /var/run/dnsmasq.pid ]; then
 
                 logMessage Allowing DNSMasq to restart.
-                kill -HUP `cat /var/run/dnsmasq.pid`
+                kill -s HUP `cat /var/run/dnsmasq.pid`
                 fi
             fi
         fi

hooks/dapper/60-copy-host-files

@@ -28,6 +28,7 @@ logMessage Script $0 starting
 # Copy "required" files from our host.
 #
 cp /etc/timezone    ${prefix}/etc
+cp /etc/localtime   ${prefix}/etc
 
 #
 # If the host has sudo then copy the configuration file, and install

hooks/dapper/75-fixup-securetty

@@ -30,7 +30,7 @@ logMessage Script $0 starting
 # If the file doesn't exist exit early.
 #
 if [ ! -e ${prefix}/etc/securetty ]; then
-    logMesage /etc/securetty not found.
+    logMessage /etc/securetty not found.
     exit
 fi
 

hooks/dapper/90-make-fstab

@@ -33,15 +33,19 @@ logMessage Script $0 starting
 #
 # Find the root device.
 #
-#  1.  default to sda.
+#  1.  default to xvda.
 #
 #  2.  If --ide is specified use hda.
 #
-#  3.  Otherwise use a named $disk_device
+#  3.  If --scsi is specified use sda.
 #
-device=sda
+#  4.  Otherwise use a named $disk_device
+#
+device=xvda
 if [ "${ide}" ]; then
     device=hda
+elif [ "${scsi}" ]; then
+    device=sda
 else
     if [ ! -z "${disk_device}" ]; then
         device=`basename $disk_device`

hooks/debian/20-setup-apt

@@ -76,9 +76,12 @@ E_O_APT
 
 
 #
-#  If the host system has security support then enable that here too.
+#  If the host system has security support then enable that here, too,
+#  except if we're installing Debian Unstable.
 #
-if ( grep ^deb.*security.debian.org /etc/apt/sources.list >/dev/null 2>/dev/null ) ; then
+if ( test "${dist}" '!=' 'sid' && test "${dist}" '!=' 'unstable' && \
+     test -e /etc/apt/sources.list && \
+     grep ^deb.*security -r /etc/apt/sources.list /etc/apt/sources.list.d >/dev/null 2>/dev/null ) ; then
 
     cat <<E_O_APT >> ${prefix}/etc/apt/sources.list
 # 

hooks/debian/30-disable-gettys

@@ -31,7 +31,7 @@ logMessage Script $0 starting
 #
 # Do the transformation.
 #
-sed -i -e 's/^\([2-6].*:respawn*\)/#\1/' -e 's/^T/#\t/' ${prefix}/etc/inittab
+sed -i -e 's/^\([2-6].*:respawn*\)/#\1/' -e 's/^T/#\t/' -e 's/tty1$/hvc0/' ${prefix}/etc/inittab
 
 
 #

hooks/debian/50-setup-hostname

@@ -31,7 +31,7 @@ logMessage Script $0 starting
 #
 #  Setup the mailname + hostname files.
 #
-echo ${hostname} > ${prefix}/etc/hostname
+echo ${hostname} | sed 's/^\([^\.]*\)\..*/\1/' > ${prefix}/etc/hostname
 echo ${hostname} > ${prefix}/etc/mailname
 
 
@@ -42,10 +42,14 @@ echo ${hostname} > ${prefix}/etc/mailname
 if [ -z "${dhcp}" ]; then
 
     # Non-IPv6 stuff.
+	# TODO: Think of a better way of doing this, this may have a lot of trash
+	# depending on the dom0 (i.e. 127.0.0.1 dom0.example.com)
     grep -v '\(::\|IPv6\)' /etc/hosts > ${prefix}/etc/hosts
 
     # New entry.
-    echo "${ip1}    ${hostname}" >> ${prefix}/etc/hosts
+	# echo "127.0.0.1	localhost" >> ${prefix}/etc/hosts
+    echo "127.0.1.1	$(echo ${hostname} | awk -F '.' '{ print $1 }')" >> ${prefix}/etc/hosts
+    echo "${ip1}	${hostname}" >> ${prefix}/etc/hosts
     echo " " >> ${prefix}/etc/hosts
 
     # IPv6 stuff.
@@ -57,7 +61,8 @@ else
     #  Stub /etc/hosts for DHCP clients.
     #
     cat >> ${prefix}/etc/hosts <<EOF
-127.0.0.1       localhost
+127.0.0.1	localhost
+127.0.1.1	$(echo ${hostname} | awk -F '.' '{ print $1 }') ${hostname}
 
 # The following lines are desirable for IPv6 capable hosts
 ::1     ip6-localhost ip6-loopback
@@ -105,7 +110,7 @@ if [ -z "${dhcp}" ]; then
                 if [ -e /var/run/dnsmasq.pid ]; then
 
                     logMessage Allowing DNSMasq to restart.
-                    kill -HUP `cat /var/run/dnsmasq.pid`
+                    kill -s HUP `cat /var/run/dnsmasq.pid`
                 fi
             fi
         fi

hooks/debian/55-create-dev

@@ -26,6 +26,19 @@ fi
 #
 logMessage Script $0 starting
 
+#
+# Test where MAKEDEV is located, assuming /sbin/ as default
+#
+MAKEDEV=''
+MAKEDEV_PATHS="/sbin/MAKEDEV /dev/MAKEDEV"
+for MAKEDEV_PATH in ${MAKEDEV_PATHS}; do
+    if [ -x "${prefix}${MAKEDEV_PATH}" ]; then
+	MAKEDEV="${prefix}${MAKEDEV_PATH}"
+	break
+    fi
+done
+
+if [ -n "${MAKEDEV}" ]; then
 
 #
 # Early termination if we have a couple of common devices present
@@ -36,10 +49,10 @@ if ( test `ls -1 ${prefix}/dev | wc -l` -gt 10 ); then
     # We still need to make sure the basic devices are present
     #
     cd ${prefix}/dev
-    ./MAKEDEV std
+    ${MAKEDEV} std
-    ./MAKEDEV hda
+    ${MAKEDEV} hda
-    ./MAKEDEV sda
+    ${MAKEDEV} sda
-    ./MAKEDEV tty1
+    ${MAKEDEV} tty1
 
     logMessage "Terminating because there appear to be files in /dev already"
     exit
@@ -50,9 +63,10 @@ fi
 #  Make the device nodes.
 #
 cd ${prefix}/dev
-./MAKEDEV generic
+${MAKEDEV} generic
-./MAKEDEV std
+${MAKEDEV} std
 
+fi # -n ${MAKEDEV}
 
 #
 #  Log our finish

hooks/debian/60-copy-host-files

@@ -28,6 +28,7 @@ logMessage Script $0 starting
 # Copy "required" files from our host.
 #
 cp /etc/timezone    ${prefix}/etc
+cp /etc/localtime   ${prefix}/etc
 
 
 #

hooks/debian/70-install-ssh

@@ -32,7 +32,7 @@ logMessage Script $0 starting
 #
 #  Install ssh
 #
-installDebianPackage ${prefix} ssh
+installDebianPackage ${prefix} openssh-server
 
 
 #

hooks/debian/75-fixup-securetty

@@ -30,7 +30,7 @@ logMessage Script $0 starting
 # If the file doesn't exist exit early.
 #
 if [ ! -e ${prefix}/etc/securetty ]; then
-    logMesage /etc/securetty not found.
+    logMessage /etc/securetty not found.
     exit
 fi
 

hooks/debian/80-install-kernel

@@ -0,0 +1,137 @@
+#!/bin/sh
+#
+#  If the pygrub flag is set, this script will install the necessary
+# packages to boot the VM from the dom0 via pygrub. This script installs
+# the kernel and modules and generates a grub menu.lst in the newly
+# created maschine.
+#
+# Dmitry Nedospasov
+# --
+# http://nedos.net
+
+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
+
+if [ "${pygrub}" ]; then
+#
+# Log our start
+#
+
+logMessage Script $0 starting
+
+#
+# Resolve the correct architecutre
+#
+
+if [ "${arch}" = "i386" ]; then
+	XEN_ARCH="686"
+elif [ "${arch}" = "amd64" ]; then
+	XEN_ARCH="amd64"
+elif [ -z "${arch}" ]; then
+	UNAME_ARCH=`uname -m`
+	if [ "${UNAME_ARCH}" = "i686" ]; then
+		XEN_ARCH="686"
+	elif [ "${UNAME_ARCH}" = "x86_64" ]; then
+		XEN_ARCH="amd64"
+	else
+		logMessage Unknown kernel architecture ${UNAME_ARCH}.
+		logMessage Please report this as bug to xen-tools-dev@xen-tools.org.
+		logMessage Script $0 failed
+		exit 1
+	fi
+else
+	logMessage Unknown kernel architecture ${arch}
+	logMessage Script $0 failed
+	exit 1
+fi
+
+#
+# Attempt to install a xen kernel, if that fails, then install a normal one
+#
+
+KERNEL_XEN_PKG="linux-image-xen-$XEN_ARCH"
+KERNEL_PKG="linux-image-$XEN_ARCH"
+
+logMessage Attempting to install the $KERNEL_XEN_PKG kernel image
+if chroot ${prefix} /usr/bin/apt-cache show $KERNEL_XEN_PKG > /dev/null 2>&1; then
+    logMessage Package $KERNEL_XEN_PKG is available - installing
+    installDebianPackage ${prefix} initramfs-tools
+    installDebianPackage ${prefix} $KERNEL_XEN_PKG
+
+else
+	logMessage Package $KERNEL_XEN_PKG is not available
+	logMessage Attempting to install the $KERNEL_PKG kernel image
+	logMessage WARNING: This kernel may not have pvops
+	if chroot ${prefix} /usr/bin/apt-cache show $KERNEL_PKG > /dev/null 2>&1; then
+		logMessage Package $KERNEL_PKG is available - installing
+	    installDebianPackage ${prefix} initramfs-tools
+	    installDebianPackage ${prefix} $KERNEL_PKG
+	else
+		logMessage Package $KERNEL_PKG is not available
+		logMessage pygrub set, but kernel could not be installed
+		logMessage Script $0 failed
+		exit 1
+	fi
+fi
+
+DOMU_KERNEL=$(basename $(ls -1 ${prefix}/boot/vmlinuz* | tail -n 1))
+KERNEL_REV=$(echo $DOMU_KERNEL | sed "s/vmlinuz-//g")
+DOMU_RAMDISK="initrd.img-$KERNEL_REV"
+DOMU_ISSUE=$(sed -re "s/ *\\\.*//g" -e1q < ${prefix}/etc/issue)
+
+#
+# Generate initrd if it does not exist
+#
+
+if [ -f ${prefix}/boot/$DOMU_RAMDISK ]; then
+	logMessage initrd exists, skipping generation
+else
+	logMessage initrd missing, generating
+	chroot ${prefix} update-initramfs -c -k $KERNEL_REV
+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 
+initrd          /boot/$DOMU_RAMDISK
+
+title           $DOMU_ISSUE (Single-User)
+root            (hd0,0)
+kernel          /boot/$DOMU_KERNEL root=/dev/xvda2 ro single
+initrd          /boot/$DOMU_RAMDISK
+
+E_O_MENU
+
+#
+#  Install the module-init-tools package.
+#
+
+installDebianPackage ${prefix} module-init-tools
+
+else
+    logMessage pygrub not set, skipping kernel install
+fi # if pygrub
+
+#
+#  Log our finish
+#
+
+logMessage Script $0 finished

hooks/debian/80-install-modules

@@ -31,7 +31,9 @@ fi
 #
 logMessage Script $0 starting
 
-
+if [ ${pygrub} ]; then
+    logMessage "pygrub set, skipping module install"
+else
 #
 #  The name of the package containing the correct modules.
 #
@@ -76,6 +78,7 @@ fi
 #
 installDebianPackage ${prefix} module-init-tools
 
+fi # if pygrub
 
 #
 #  Log our finish

hooks/debian/90-make-fstab

@@ -32,15 +32,19 @@ logMessage Script $0 starting
 #
 # Find the root device.
 #
-#  1.  default to sda.
+#  1.  default to xvda.
 #
 #  2.  If --ide is specified use hda.
 #
-#  3.  Otherwise use a named $disk_device
+#  3.  If --scsi is specified use sda.
 #
-device=sda
+#  4.  Otherwise use a named $disk_device
+#
+device=xvda
 if [ "${ide}" ]; then
     device=hda
+elif [ "${scsi}" ]; then
+    device=sda
 else
     if [ ! -z "${disk_device}" ]; then
         device=`basename $disk_device`

hooks/edgy/30-disable-gettys

@@ -28,7 +28,9 @@ logMessage Script $0 starting
 #  Remove the links for upstart
 #
 rm ${prefix}/etc/event.d/tty[!1]
-
+sed -i -e s/tty1/hvc0/ ${prefix}/etc/event.d/tty1
+mv ${prefix}/etc/event.d/tty1 ${prefix}/etc/event.d/hvc0
+[ -f ${prefix}/etc/inittab ] && sed -i -e s/tty1/hvc0/ ${prefix}/etc/inittab
 
 #
 #  Are we using an alternative serial device?
@@ -38,12 +40,12 @@ if [ ! -z "${serial_device}" ]; then
     serial_device=`basename ${serial_device}`
 
     # Let the user know.
-    logMessage "Replacing default serial device (tty1) with ${serial_device}"
+    logMessage "Replacing default serial device (hvc0) with ${serial_device}"
 
     # replace existing device.
-    mv ${prefix}/etc/event.d/tty1  ${prefix}/etc/event.d/${serial_device}
+    mv ${prefix}/etc/event.d/hvc0  ${prefix}/etc/event.d/${serial_device}
-    sed -i -e s/tty1/${serial_device}/ ${prefix}/etc/event.d/${serial_device}
+    sed -i -e s/hvc0/${serial_device}/ ${prefix}/etc/event.d/${serial_device}
-    [ -f ${prefix}/etc/inittab ] && sed -i -e s/tty1/${serial_device}/ ${prefix}/etc/inittab
+    [ -f ${prefix}/etc/inittab ] && sed -i -e s/hvc0/${serial_device}/ ${prefix}/etc/inittab
 
 
 

hooks/edgy/50-setup-hostname

@@ -31,7 +31,7 @@ logMessage Script $0 starting
 #
 #  Setup the mailname + hostname files.
 #
-echo ${hostname} > ${prefix}/etc/hostname
+echo ${hostname} | sed 's/^\([^\.]*\)\..*/\1/' > ${prefix}/etc/hostname
 echo ${hostname} > ${prefix}/etc/mailname
 
 
@@ -104,7 +104,7 @@ if [ -z "${dhcp}" ]; then
                 if [ -e /var/run/dnsmasq.pid ]; then
 
                     logMessage Allowing DNSMasq to restart.
-                    kill -HUP `cat /var/run/dnsmasq.pid`
+                    kill -s HUP `cat /var/run/dnsmasq.pid`
                 fi
             fi
         fi

hooks/edgy/60-copy-host-files

@@ -28,6 +28,7 @@ logMessage Script $0 starting
 # Copy "required" files from our host.
 #
 cp /etc/timezone    ${prefix}/etc
+cp /etc/localtime   ${prefix}/etc
 
 #
 # If the host has sudo then copy the configuration file, and install

hooks/edgy/75-fixup-securetty

@@ -30,7 +30,7 @@ logMessage Script $0 starting
 # If the file doesn't exist exit early.
 #
 if [ ! -e ${prefix}/etc/securetty ]; then
-    logMesage /etc/securetty not found.
+    logMessage /etc/securetty not found.
     exit
 fi
 

hooks/edgy/80-install-kernel

@@ -0,0 +1,112 @@
+#!/bin/sh
+#
+#  If the pygrub flag is set, this script will install the necessary
+# packages to boot the VM from the dom0 via pygrub. This script installs
+# the kernel and modules and generates a grub menu.lst in the newly
+# created maschine.
+#
+# Dmitry Nedospasov
+# --
+# http://nedos.net
+
+prefix=$1
+
+#
+#  Source our common functions
+#
+
+if [ -e /usr/lib/xen-tools/common.sh ]; then
+    . /usr/lib/xen-tools/common.sh
+else
+    . ./hooks/common.sh
+fi
+
+#
+# Log our start
+#
+
+logMessage Script $0 starting
+
+if [ ${pygrub} ]; then
+
+#
+# Attempt to install a xen kernel, if that fails, then install a normal one
+#
+
+KERNEL_XEN_PKG="linux-image-xen"
+KERNEL_PKG="linux-image-server"
+
+logMessage Attempting to install the $KERNEL_XEN_PKG kernel image
+if chroot ${prefix} /usr/bin/apt-cache show $KERNEL_XEN_PKG > /dev/null 2>&1; then
+    logMessage Package $KERNEL_XEN_PKG is available - installing
+    installDebianPackage ${prefix} initramfs-tools
+    installDebianPackage ${prefix} $KERNEL_XEN_PKG
+
+else
+	logMessage Package $KERNEL_XEN_PKG is not available
+	logMessage Attempting to install the $KERNEL_PKG kernel image
+	logMessage WARNING: This kernel may not have pvops
+	if chroot ${prefix} /usr/bin/apt-cache show $KERNEL_PKG > /dev/null 2>&1; then
+		logMessage Package $KERNEL_PKG is available - installing
+	    installDebianPackage ${prefix} initramfs-tools
+	    installDebianPackage ${prefix} $KERNEL_PKG
+	else
+		logMessage Package $KERNEL_PKG is not available
+		logMessage pygrub set, but kernel could not be installed
+		logMessage Script $0 failed
+		exit 1
+	fi
+fi
+
+DOMU_KERNEL=$(basename $(ls -1 ${prefix}/boot/vmlinuz* | tail -n 1))
+KERNEL_REV=$(echo $DOMU_KERNEL | sed "s/vmlinuz-//g")
+DOMU_RAMDISK="initrd.img-$KERNEL_REV"
+DOMU_ISSUE=$(sed -re "s/ *\\\.*//g" -e1q < ${prefix}/etc/issue)
+
+#
+# Generate initrd if it does not exist
+#
+
+if [ -f ${prefix}/boot/$DOMU_RAMDISK ]; then
+	logMessage initrd exists, skipping generation
+else
+	logMessage initrd missing, generating
+	chroot ${prefix} update-initramfs -c -k $KERNEL_REV
+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 
+initrd          /boot/$DOMU_RAMDISK
+
+title           $DOMU_ISSUE (Single-User)
+root            (hd0,0)
+kernel          /boot/$DOMU_KERNEL root=/dev/xvda2 ro single
+initrd          /boot/$DOMU_RAMDISK
+
+E_O_MENU
+
+#
+#  Install the module-init-tools package.
+#
+
+installDebianPackage ${prefix} module-init-tools
+
+else
+    logMessage pygrub not set, skipping kernel install
+fi
+
+#
+#  Log our finish
+#
+
+logMessage Script $0 finished

hooks/edgy/80-install-modules

@@ -31,7 +31,9 @@ fi
 #
 logMessage Script $0 starting
 
-
+if [ ${pygrub} ]; then
+    logMessage "pygrub set, skipping module install"
+else
 #
 #  The name of the package containing the correct modules.
 #
@@ -71,12 +73,12 @@ 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
 
 #
 #  Log our finish

hooks/edgy/90-make-fstab

@@ -33,15 +33,19 @@ logMessage Script $0 starting
 #
 # Find the root device.
 #
-#  1.  default to sda.
+#  1.  default to xvda.
 #
 #  2.  If --ide is specified use hda.
 #
-#  3.  Otherwise use a named $disk_device
+#  3.  If --scsi is specified use sda.
 #
-device=sda
+#  4.  Otherwise use a named $disk_device
+#
+device=xvda
 if [ "${ide}" ]; then
     device=hda
+elif [ "${scsi}" ]; then
+    device=sda
 else
     if [ ! -z "${disk_device}" ]; then
         device=`basename $disk_device`

hooks/fedora-core-6/30-disable-gettys

@@ -31,7 +31,7 @@ logMessage Script $0 starting
 #
 # Do the transformation.
 #
-sed -i -e 's/^\([2-6].*:respawn*\)/#\1/' -e 's/^T/#\t/' ${prefix}/etc/inittab
+sed -i -e 's/^\([2-6].*:respawn*\)/#\1/' -e 's/^T/#\t/' -e 's/tty1$/hvc0/' ${prefix}/etc/inittab
 
 
 #

hooks/fedora-core-6/35-setup-users

@@ -21,6 +21,12 @@ my $prefix = shift;
 die "Prefix must be given"       unless defined( $prefix );
 die "Prefix must be a directory" unless ( -d $prefix );
 
+#
+# Setup /etc/shadow and /etc/gshadow (Closes: #499476)
+#
+system( "chroot $prefix /usr/sbin/pwconv" );
+system( "chroot $prefix /usr/sbin/grpconv" );
+
 
 #
 #  Exit unless the 'accounts' variable is set.

hooks/fedora-core-6/40-setup-networking

@@ -79,6 +79,7 @@ DEVICE=eth0
 BOOTPROTO=dhcp
 ONBOOT=yes
 E_O_DHCP
+    chroot ${prefix} /usr/bin/yum -y install dhclient
 fi
 
 

hooks/fedora-core-6/50-setup-hostname

@@ -31,7 +31,7 @@ logMessage Script $0 starting
 #
 #  Setup the mailname + hostname files.
 #
-echo ${hostname} > ${prefix}/etc/hostname
+echo ${hostname} | sed 's/^\([^\.]*\)\..*/\1/' > ${prefix}/etc/hostname
 echo ${hostname} > ${prefix}/etc/mailname
 
 
@@ -106,7 +106,7 @@ if [ -z "${dhcp}" ]; then
                 if [ -e /var/run/dnsmasq.pid ]; then
 
                     logMessage Allowing DNSMasq to restart.
-                    kill -HUP `cat /var/run/dnsmasq.pid`
+                    kill -s HUP `cat /var/run/dnsmasq.pid`
                 fi
             fi
         fi

hooks/fedora-core-6/75-fixup-securetty

@@ -30,7 +30,7 @@ logMessage Script $0 starting
 # If the file doesn't exist exit early.
 #
 if [ ! -e ${prefix}/etc/securetty ]; then
-    logMesage /etc/securetty not found.
+    logMessage /etc/securetty not found.
     exit
 fi
 

hooks/fedora-core-6/90-make-fstab

@@ -36,15 +36,19 @@ logMessage Filesystem options are ${options}
 #
 # Find the root device.
 #
-#  1.  default to sda.
+#  1.  default to xvda.
 #
 #  2.  If --ide is specified use hda.
 #
-#  3.  Otherwise use a named $disk_device
+#  3.  If --scsi is specified use sda.
 #
-device=sda
+#  4.  Otherwise use a named $disk_device
+#
+device=xvda
 if [ "${ide}" ]; then
     device=hda
+elif [ "${scsi}" ]; then
+    device=sda
 else
     if [ ! -z "${disk_device}" ]; then
         device=`basename $disk_device`
@@ -64,7 +68,7 @@ cat <<E_O_FSTAB > ${prefix}/etc/fstab
 #
 # <file system> <mount point>   <type>  <options>       <dump>  <pass>
 proc            /proc           proc    defaults        0       0
-devpts          /dev/pts        devpts  rw,noexec,nosuid,gid=5,mode=620	0  0
+devpts          /dev/pts        devpts  rw,noexec,nosuid,gid=5,mode=620 0  0
 E_O_FSTAB
 for part in `seq 1 ${NUMPARTITIONS}`; do
     eval "PARTITION=\"\${PARTITION${part}}\""

hooks/gentoo/30-disable-gettys

@@ -31,7 +31,7 @@ logMessage Script $0 starting
 #
 # Do the transformation.
 #
-sed -i -e 's/^\([2-6].*:respawn*\)/#\1/' -e 's/^T/#\t/' ${prefix}/etc/inittab
+sed -i -e 's/^\([2-6].*:respawn*\)/#\1/' -e 's/^T/#\t/' -e 's/tty1$/hvc0/' ${prefix}/etc/inittab
 
 
 #

hooks/gentoo/50-setup-hostname

@@ -31,8 +31,8 @@ logMessage Script $0 starting
 #
 #  We need to split up the hostname into name + domain
 # do this by looking for a dot.
-name=${hostname/.*/}
+name=$(echo "$hostname" | sed -e 's/\..*$//')
-domain=${hostname/${name}\./}
+domain=$(echo "$hostname" | sed -e 's/^[^.]*\.//')
 
 
 #
@@ -112,7 +112,7 @@ if [ -z "${dhcp}" ]; then
                 if [ -e /var/run/dnsmasq.pid ]; then
 
                     logMessage Allowing DNSMasq to restart.
-                    kill -HUP `cat /var/run/dnsmasq.pid`
+                    kill -s HUP `cat /var/run/dnsmasq.pid`
                 fi
             fi
         fi

hooks/gentoo/75-fixup-securetty

@@ -30,7 +30,7 @@ logMessage Script $0 starting
 # If the file doesn't exist exit early.
 #
 if [ ! -e ${prefix}/etc/securetty ]; then
-    logMesage /etc/securetty not found.
+    logMessage /etc/securetty not found.
     exit
 fi
 

hooks/gentoo/90-make-fstab

@@ -33,15 +33,19 @@ logMessage Script $0 starting
 #
 # Find the root device.
 #
-#  1.  default to sda.
+#  1.  default to xvda.
 #
 #  2.  If --ide is specified use hda.
 #
-#  3.  Otherwise use a named $disk_device
+#  3.  If --scsi is specified use sda.
 #
-device=sda
+#  4.  Otherwise use a named $disk_device
+#
+device=xvda
 if [ "${ide}" ]; then
     device=hda
+elif [ "${scsi}" ]; then
+    device=sda
 else
     if [ ! -z "${disk_device}" ]; then
         device=`basename $disk_device`

hooks/intrepid/01-disable-daemons

@@ -0,0 +1,54 @@
+#!/bin/sh
+#
+#  This script ensures that daemons will not be started inside our
+# chroot() installation.
+#
+# Steve
+# --
+# http://www.steve.org.uk/
+
+
+prefix=$1
+
+
+#
+#  Source our common functions
+#
+if [ -e /usr/lib/xen-tools/common.sh ]; then
+    . /usr/lib/xen-tools/common.sh
+else
+    . ./hooks/common.sh
+fi
+
+
+#
+# Log our start
+#
+logMessage Script $0 starting
+
+
+#
+#  Make sure we have a directory.
+#
+if [ ! -d "${prefix}/usr/sbin" ]; then
+
+    mkdir -p "${prefix}/usr/sbin"
+
+    logMessage "created missing directory: ${prefix}/usr/sbin"
+fi
+
+
+#
+#  Add the script.
+#
+echo '#!/bin/sh' >  ${prefix}/usr/sbin/policy-rc.d
+echo 'exit 101'  >> ${prefix}/usr/sbin/policy-rc.d
+chmod 755           ${prefix}/usr/sbin/policy-rc.d
+
+
+
+#
+# Log our finish
+#
+logMessage Script $0 finished.
+

hooks/intrepid/05-shadowconfig-on

@@ -0,0 +1,45 @@
+#!/bin/sh
+#
+#  This script enforces the use of a shadow password file.
+#
+# 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
+
+
+#
+# Enable the shadow passwords if the command is found.
+#
+if [ -x ${prefix}/sbin/shadowconfig ]; then
+
+   chroot ${prefix} /sbin/shadowconfig on
+else
+
+   logMessage "/sbin/shadowconfig not found.  skipping."
+fi
+
+
+#
+# Log our finish
+#
+logMessage Script $0 finished.
+

hooks/intrepid/15-disable-hwclock

@@ -0,0 +1,38 @@
+#!/bin/sh
+#
+#  This script disables the hardware clock.
+#
+# 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
+
+
+#
+#  Disable the startup scripts from all runlevels.
+#
+chroot ${prefix} /usr/sbin/update-rc.d -f hwclock.sh remove
+
+#
+# Log our finish
+#
+logMessage Script $0 finished.
+

hooks/intrepid/20-setup-apt

@@ -0,0 +1,106 @@
+#!/bin/sh
+#
+#  This script sets up the /etc/apt/sources.list for APT.
+#
+# Steve
+# --
+#
+
+
+
+
+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
+
+
+#
+#  You will probably need DNS to run "apt-get update"
+#
+cp /etc/resolv.conf ${prefix}/etc
+
+
+#
+# Attempt to auto-magically detect the use of a Proxy for apt-get, and
+# replicate that setup in our new guest.
+#
+#
+#  Process any of the present apt-conf setup lines.
+#
+for i in /etc/apt/apt.conf $(run-parts --list /etc/apt/apt.conf.d) ; do
+
+
+    #
+    # If the file exists.  (Need this in case the literal glob fails.)
+    #
+    if [ -e $i ] ; then
+
+        #
+        # Save the matching line(s) to the proxy guess file.
+        #
+        logMessage The use of a proxy detected.
+
+        grep -v '^//' $i | grep -i HTTP::Proxy >>${prefix}/etc/apt/apt.conf.d/proxy-guess
+    fi
+done
+
+
+
+cat <<E_O_APT > ${prefix}/etc/apt/sources.list
+#
+#  /etc/apt/sources.list
+#
+
+
+#
+# ${dist}
+#
+deb     ${mirror}     ${dist} main restricted universe multiverse
+deb-src ${mirror}     ${dist} main restricted universe
+deb     ${mirror}     ${dist}-updates main restricted universe multiverse
+deb-src ${mirror}     ${dist}-updates main restricted universe
+deb http://security.ubuntu.com/ubuntu ${dist}-security main restricted universe
+deb-src http://security.ubuntu.com/ubuntu ${dist}-security main restricted universe
+
+E_O_APT
+
+
+
+#
+#  Now that the sources have been setup make sure the system is up to date.
+#
+chroot ${prefix} /usr/bin/apt-get update
+
+
+#
+#  Now fixup TLS on non-64bit systems.
+#
+if [ "`uname -m`" = "x86_64" ]; then
+
+    logMessage "Ignoring TLS since we're a 64 bit host."
+
+else
+
+    logMessage "Installing libc6-xen"
+    installDebianPackage ${prefix} libc6-xen
+fi
+
+
+#
+#  Log our finish
+#
+logMessage Script $0 finished

hooks/intrepid/25-generate-locale

@@ -0,0 +1,40 @@
+#!/bin/sh
+#
+#  This script generates a default en_US.UTF-8 locale.
+#
+# Ward
+# --
+
+
+
+prefix=$1
+
+
+#
+#  Source our common functions
+#
+if [ -e /usr/lib/xen-tools/common.sh ]; then
+    . /usr/lib/xen-tools/common.sh
+else
+    . ./hooks/common.sh
+fi
+
+
+#
+# Log our start
+#
+logMessage Script $0 starting
+
+
+#
+# Install the English language pack.
+#
+#  NOTE:  Failure to support your favourite language is *not* a bug.
+#
+installDebianPackage ${prefix} language-pack-en
+
+
+#
+#  Log our finish
+#
+logMessage Script $0 finished

hooks/intrepid/30-disable-gettys

@@ -0,0 +1,60 @@
+#!/bin/sh
+#
+#  This script comments out all virtual terminals which aren't on the
+# first console - that must remain so that 'xm console ...' works
+# correctly.
+#
+
+
+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
+
+#
+#  Remove the links for upstart
+#
+rm ${prefix}/etc/event.d/tty[!1]
+sed -i -e s/tty1/hvc0/ ${prefix}/etc/event.d/tty1
+mv ${prefix}/etc/event.d/tty1 ${prefix}/etc/event.d/hvc0
+[ -f ${prefix}/etc/inittab ] && sed -i -e s/tty1/hvc0/ ${prefix}/etc/inittab
+
+#
+#  Are we using an alternative serial device?
+#
+if [ ! -z "${serial_device}" ]; then
+
+    serial_device=`basename ${serial_device}`
+
+    # Let the user know.
+    logMessage "Replacing default serial device (hvc0) with ${serial_device}"
+
+    # replace existing device.
+    mv ${prefix}/etc/event.d/hvc0  ${prefix}/etc/event.d/${serial_device}
+    sed -i -e s/hvc0/${serial_device}/ ${prefix}/etc/event.d/${serial_device}
+    [ -f ${prefix}/etc/inittab ] && sed -i -e s/hvc0/${serial_device}/ ${prefix}/etc/inittab
+
+
+
+    # make sure that it is allowed to login.
+    echo $serial_device >> ${prefix}/etc/securetty
+fi
+
+
+#
+#  Log our finish
+#
+logMessage Script $0 finished

hooks/intrepid/35-setup-users

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

hooks/intrepid/40-setup-networking

@@ -0,0 +1,145 @@
+#!/bin/sh
+#
+#  This script sets up the /etc/network/interface file for the new
+# image.
+#
+# Steve
+# --
+# http://www.steve.org.uk/
+
+
+prefix=$1
+
+#
+#  Source our common functions
+#
+if [ -e /usr/lib/xen-tools/common.sh ]; then
+    . /usr/lib/xen-tools/common.sh
+else
+    . ./hooks/common.sh
+fi
+
+
+#
+# Log our start
+#
+logMessage Script $0 starting
+
+
+#
+#  Make sure we have an /etc/network directory.
+#
+mkdir -p ${prefix}/etc/network
+
+
+#
+#  A function to setup DHCP for our new image.
+#
+setupDynamicNetworking ()
+{
+    #
+    # The host is using DHCP.
+    #
+    cat <<E_O_DHCP > ${prefix}/etc/network/interfaces
+# This file describes the network interfaces available on your system
+# and how to activate them. For more information, see interfaces(5).
+
+# The loopback network interface
+auto lo
+iface lo inet loopback
+
+# The primary network interface
+auto eth0
+iface eth0 inet dhcp
+# post-up ethtool -K eth0 tx off
+
+#
+# The commented out line above will disable TCP checksumming which
+# might resolve problems for some users.  It is disabled by default
+#
+E_O_DHCP
+}
+
+
+
+#
+#  A function to setup static IP addresses for our new image.
+#
+setupStaticNetworking ()
+{
+    #
+    # broadcast address?
+    #
+    bcast='';
+    if [ ! -z "${broadcast}" ]; then
+      bcast=" broadcast ${broadcast}"
+    fi
+
+    #
+    # We have a static IP address
+    #
+    cat <<E_O_STATIC >${prefix}/etc/network/interfaces
+# This file describes the network interfaces available on your system
+# and how to activate them. For more information, see interfaces(5).
+
+# The loopback network interface
+auto lo
+iface lo inet loopback
+
+# The primary network interface
+auto eth0
+iface eth0 inet static
+ address ${ip1}
+ gateway ${gateway}
+ netmask ${netmask}
+ ${bcast}
+ # post-up  ethtool -K eth0 tx off
+
+#
+# The commented out line above will disable TCP checksumming which
+# might resolve problems for some users.  It is disabled by default
+#
+E_O_STATIC
+
+    interface=1
+    count=2
+
+    while [ "${count}" -le "${ip_count}" ]; do
+
+        value=\$ip${count}
+        value=`eval echo $value`
+
+        logMessage Adding etho:${interface}
+
+        cat <<E_O_STATIC >>${prefix}/etc/network/interfaces
+auto eth0:${interface}
+iface eth0:${interface} inet static
+ address ${value}
+ netmask ${netmask}
+ # post-up  ethtool -K eth0 tx off
+E_O_STATIC
+        count=`expr $count + 1`
+        interface=`expr $interface + 1`
+    done
+}
+
+
+
+
+#
+#  Call the relevant function
+#
+if [ -z "${dhcp}" ]; then
+    logMessage "Setting up static networking"
+    setupStaticNetworking
+
+else
+    logMessage "Setting up DHCP networking"
+    setupDynamicNetworking
+fi
+
+
+#
+#  Log our finish
+#
+logMessage Script $0 finished

hooks/intrepid/50-setup-hostname

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

hooks/intrepid/60-copy-host-files

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

hooks/intrepid/65-copy-user-files

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

hooks/intrepid/70-install-ssh

@@ -0,0 +1,42 @@
+#!/bin/sh
+#
+#  This script installs OpenSSH upon the new system.
+#
+#  It must make sure that the server is not running before it exits 
+# otherwise the temporary mounted directory will not be unmountable.
+#
+# 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 ssh
+#
+installDebianPackage ${prefix} ssh
+
+
+
+#
+#  Log our finish
+#
+logMessage Script $0 finished

hooks/intrepid/75-fixup-securetty

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

hooks/intrepid/80-install-kernel

@@ -0,0 +1,102 @@
+#!/bin/sh
+#
+#  If the pygrub flag is set, this script will install the necessary
+# packages to boot the VM from the dom0 via pygrub. This script installs
+# the kernel and modules and generates a grub menu.lst in the newly
+# created maschine.
+#
+# Dmitry Nedospasov
+# --
+# http://nedos.net
+
+prefix=$1
+
+#
+#  Source our common functions
+#
+
+if [ -e /usr/lib/xen-tools/common.sh ]; then
+    . /usr/lib/xen-tools/common.sh
+else
+    . ./hooks/common.sh
+fi
+
+#
+# Log our start
+#
+
+logMessage Script $0 starting
+
+if [ ${pygrub} ]; then
+
+#
+# Attempt to install a xen kernel, if that fails, then install a normal one
+#
+
+KERNEL_PKG="linux-image-server"
+
+logMessage Attempting to install the $KERNEL_PKG kernel image
+logMessage WARNING: This kernel may not have pvops
+if chroot ${prefix} /usr/bin/apt-cache show $KERNEL_PKG > /dev/null 2>&1; then
+	logMessage Package $KERNEL_PKG is available - installing
+    installDebianPackage ${prefix} initramfs-tools
+    installDebianPackage ${prefix} $KERNEL_PKG
+else
+	logMessage Package $KERNEL_PKG is not available
+	logMessage pygrub set, but kernel could not be installed
+	logMessage Script $0 failed
+	exit 1
+fi
+
+DOMU_KERNEL=$(basename $(ls -1 ${prefix}/boot/vmlinuz* | tail -n 1))
+KERNEL_REV=$(echo $DOMU_KERNEL | sed "s/vmlinuz-//g")
+DOMU_RAMDISK="initrd.img-$KERNEL_REV"
+DOMU_ISSUE=$(sed -re "s/ *\\\.*//g" -e1q < ${prefix}/etc/issue)
+
+#
+# Generate initrd if it does not exist
+#
+
+if [ -f ${prefix}/boot/$DOMU_RAMDISK ]; then
+	logMessage initrd exists, skipping generation
+else
+	logMessage initrd missing, generating
+	chroot ${prefix} update-initramfs -c -k $KERNEL_REV
+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 
+initrd          /boot/$DOMU_RAMDISK
+
+title           $DOMU_ISSUE (Single-User)
+root            (hd0,0)
+kernel          /boot/$DOMU_KERNEL root=/dev/xvda2 ro single
+initrd          /boot/$DOMU_RAMDISK
+
+E_O_MENU
+
+#
+#  Install the module-init-tools package.
+#
+
+installDebianPackage ${prefix} module-init-tools
+
+else
+    logMessage pygrub not set, skipping kernel install
+fi
+
+#
+#  Log our finish
+#
+
+logMessage Script $0 finished

hooks/intrepid/80-install-modules

@@ -0,0 +1,86 @@
+#!/bin/sh
+#
+#  Install modules from the host system into the new image, and
+# ensure that 'module-init-tools' 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.
+#
+# Steve
+# --
+# http://www.steve.org.uk/
+
+
+prefix=$1
+
+
+
+#
+#  Source our common functions
+#
+if [ -e /usr/lib/xen-tools/common.sh ]; then
+    . /usr/lib/xen-tools/common.sh
+else
+    . ./hooks/common.sh
+fi
+
+
+#
+# Log our start
+#
+logMessage Script $0 starting
+
+if [ ${pygrub} ]; then
+    logMessage "pygrub set, skipping module install"
+else
+#
+#  The name of the package containing the correct modules.
+#
+linux_modules_package="linux-modules-$(uname -r)"
+
+#
+#  Attempt to install that package.  This will either work on an Etch
+# system, or fail on a Sarge/custom kernel.
+#
+if [ -n "${modules}" -a -d "${modules}" ]; then
+
+    #
+    # Modules path was specified during install
+    #
+    logMessage "Copying modules from ${modules}"
+
+    mkdir -p ${prefix}/lib/modules
+    cp -au ${modules} ${prefix}/lib/modules
+elif chroot ${prefix} /usr/bin/apt-cache show ${linux_modules_package} >/dev/null 2>/dev/null; then
+
+    logMessage "Package '${linux_modules_package}' is available - installing"
+
+    #
+    # If it worked then we can install the package.
+    #
+    installDebianPackage ${prefix} ${linux_modules_package}
+else
+
+    #
+    # Fall back to copying over modules from the host to the new
+    # system.
+    #
+    logMessage "Package '${linux_modules_package}' is not available"
+    logMessage "Copying modules from /lib/modules/$(uname -r)"
+
+    mkdir -p ${prefix}/lib/modules
+    cp -au /lib/modules/$(uname -r) ${prefix}/lib/modules
+fi
+
+#
+#  Install the module-init-tools package.
+#
+installDebianPackage ${prefix} module-init-tools
+
+fi # if pygrub
+
+#
+#  Log our finish
+#
+logMessage Script $0 finished

hooks/intrepid/90-make-fstab

@@ -0,0 +1,113 @@
+#!/bin/sh
+#
+#  This script is responsible for setting up /etc/fstab upon the
+# new instance.
+#
+#  This should be a simple job, but it is complicated by some of the
+# differences between filesystems - some root filesystems will require
+# the installation of new packages, and we have to handle that here.
+#
+# Steve
+# --
+# http://www.steve.org.uk/
+
+
+prefix=$1
+
+#
+#  Source our common functions
+#
+if [ -e /usr/lib/xen-tools/common.sh ]; then
+    . /usr/lib/xen-tools/common.sh
+else
+    . ./hooks/common.sh
+fi
+
+
+#
+# Log our start
+#
+logMessage Script $0 starting
+
+
+#
+# Find the root device.
+#
+#  1.  default to xvda.
+#
+#  2.  If --ide is specified use hda.
+#
+#  3.  If --scsi is specified use sda.
+#
+#  4.  Otherwise use a named $disk_device
+#
+device=xvda
+if [ "${ide}" ]; then
+    device=hda
+elif [ "${scsi}" ]; then
+    device=sda
+else
+    if [ ! -z "${disk_device}" ]; then
+        device=`basename $disk_device`
+    fi
+fi
+
+logMessage "Root device is /dev/$device"
+
+
+#
+#  Now we have the options we can create the fstab.
+#
+has_xfs=0
+has_reiserfs=0
+cat <<E_O_FSTAB > ${prefix}/etc/fstab
+# /etc/fstab: static file system information.
+#
+# <file system> <mount point>   <type>  <options>       <dump>  <pass>
+proc            /proc           proc    defaults        0       0
+devpts          /dev/pts        devpts  rw,noexec,nosuid,gid=5,mode=620 0  0
+E_O_FSTAB
+for part in `seq 1 ${NUMPARTITIONS}`; do
+    eval "PARTITION=\"\${PARTITION${part}}\""
+    OLDIFS="${IFS}"
+    IFS=:
+    x=0
+    for partdata in ${PARTITION}; do
+        eval "partdata${x}=\"${partdata}\""
+        x=$(( $x+1 ))
+    done
+    IFS="${OLDIFS}"
+
+    case "${partdata2}" in
+        xfs)
+            has_xfs=1
+            ;;
+        reiserfs)
+            has_reiserfs=1
+            ;;
+    esac
+
+    if [ "${partdata2}" = "swap" ]; then
+        echo "/dev/${device}${part} none swap sw 0 0" >> ${prefix}/etc/fstab
+    else
+        echo "/dev/${device}${part} ${partdata3} ${partdata2} ${partdata4} 0 1" >> ${prefix}/etc/fstab
+    fi
+done
+
+
+#
+#  Finally we can install any required packages for the given root
+# filesystem
+#
+if [ $has_xfs -eq 1 ]; then
+    installDebianPackage ${prefix} xfsprogs
+fi
+if [ $has_reiserfs -eq 1 ]; then
+    installDebianPackage ${prefix} reiserfsprogs
+fi
+
+
+#
+#  Log our finish
+#
+logMessage Script $0 finished

hooks/intrepid/99-clean-image

@@ -0,0 +1,38 @@
+#!/bin/sh
+#
+#  This script cleans the newly created image's apt-get archive.
+#
+# Steve
+# --
+# http://www.steve.org.uk/
+
+
+prefix=$1
+
+
+#
+#  Source our common functions
+#
+if [ -e /usr/lib/xen-tools/common.sh ]; then
+    . /usr/lib/xen-tools/common.sh
+else
+    . ./hooks/common.sh
+fi
+
+
+#
+# Log our start
+#
+logMessage Script $0 starting
+
+
+#
+#  Clean the APT package cache for Debian GNU/Linux.
+#
+chroot ${prefix} /usr/bin/apt-get clean
+
+
+#
+#  Log our finish
+#
+logMessage Script $0 finished

hooks/intrepid/99-enable-daemons

@@ -0,0 +1,45 @@
+#!/bin/sh
+#
+#  This script removes the file which prevents daemons from running.
+#
+# 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
+
+
+#
+#  Remove the script if present.
+#
+if [ -x "${prefix}/usr/sbin/policy-rc.d" ]; then
+
+    rm -f "${prefix}/usr/sbin/policy-rc.d"
+
+    logMessage "Removed: ${prefix}/usr/sbin/policy-rc.d"
+
+fi
+
+
+#
+# Log our finish
+#
+logMessage Script $0 finished

hooks/karmic/01-disable-daemons

@@ -0,0 +1,54 @@
+#!/bin/sh
+#
+#  This script ensures that daemons will not be started inside our
+# chroot() installation.
+#
+# Steve
+# --
+# http://www.steve.org.uk/
+
+
+prefix=$1
+
+
+#
+#  Source our common functions
+#
+if [ -e /usr/lib/xen-tools/common.sh ]; then
+    . /usr/lib/xen-tools/common.sh
+else
+    . ./hooks/common.sh
+fi
+
+
+#
+# Log our start
+#
+logMessage Script $0 starting
+
+
+#
+#  Make sure we have a directory.
+#
+if [ ! -d "${prefix}/usr/sbin" ]; then
+
+    mkdir -p "${prefix}/usr/sbin"
+
+    logMessage "created missing directory: ${prefix}/usr/sbin"
+fi
+
+
+#
+#  Add the script.
+#
+echo '#!/bin/sh' >  ${prefix}/usr/sbin/policy-rc.d
+echo 'exit 101'  >> ${prefix}/usr/sbin/policy-rc.d
+chmod 755           ${prefix}/usr/sbin/policy-rc.d
+
+
+
+#
+# Log our finish
+#
+logMessage Script $0 finished.
+

hooks/karmic/05-shadowconfig-on

@@ -0,0 +1,45 @@
+#!/bin/sh
+#
+#  This script enforces the use of a shadow password file.
+#
+# 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
+
+
+#
+# Enable the shadow passwords if the command is found.
+#
+if [ -x ${prefix}/sbin/shadowconfig ]; then
+
+   chroot ${prefix} /sbin/shadowconfig on
+else
+
+   logMessage "/sbin/shadowconfig not found.  skipping."
+fi
+
+
+#
+# Log our finish
+#
+logMessage Script $0 finished.
+

hooks/karmic/15-disable-hwclock

@@ -0,0 +1,38 @@
+#!/bin/sh
+#
+#  This script disables the hardware clock.
+#
+# 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
+
+
+#
+#  Disable the startup scripts from all runlevels.
+#
+chroot ${prefix} /usr/sbin/update-rc.d -f hwclock.sh remove
+
+#
+# Log our finish
+#
+logMessage Script $0 finished.
+

hooks/karmic/20-setup-apt

@@ -0,0 +1,106 @@
+#!/bin/sh
+#
+#  This script sets up the /etc/apt/sources.list for APT.
+#
+# Steve
+# --
+#
+
+
+
+
+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
+
+
+#
+#  You will probably need DNS to run "apt-get update"
+#
+cp /etc/resolv.conf ${prefix}/etc
+
+
+#
+# Attempt to auto-magically detect the use of a Proxy for apt-get, and
+# replicate that setup in our new guest.
+#
+#
+#  Process any of the present apt-conf setup lines.
+#
+for i in /etc/apt/apt.conf $(run-parts --list /etc/apt/apt.conf.d) ; do
+
+
+    #
+    # If the file exists.  (Need this in case the literal glob fails.)
+    #
+    if [ -e $i ] ; then
+
+        #
+        # Save the matching line(s) to the proxy guess file.
+        #
+        logMessage The use of a proxy detected.
+
+        grep -v '^//' $i | grep -i HTTP::Proxy >>${prefix}/etc/apt/apt.conf.d/proxy-guess
+    fi
+done
+
+
+
+cat <<E_O_APT > ${prefix}/etc/apt/sources.list
+#
+#  /etc/apt/sources.list
+#
+
+
+#
+# ${dist}
+#
+deb     ${mirror}     ${dist} main restricted universe multiverse
+deb-src ${mirror}     ${dist} main restricted universe
+deb     ${mirror}     ${dist}-updates main restricted universe multiverse
+deb-src ${mirror}     ${dist}-updates main restricted universe
+deb http://security.ubuntu.com/ubuntu ${dist}-security main restricted universe
+deb-src http://security.ubuntu.com/ubuntu ${dist}-security main restricted universe
+
+E_O_APT
+
+
+
+#
+#  Now that the sources have been setup make sure the system is up to date.
+#
+chroot ${prefix} /usr/bin/apt-get update
+
+
+#
+#  Now fixup TLS on non-64bit systems.
+#
+if [ "`uname -m`" = "x86_64" ]; then
+
+    logMessage "Ignoring TLS since we're a 64 bit host."
+
+else
+
+    logMessage "Installing libc6-xen"
+    installDebianPackage ${prefix} libc6-xen
+fi
+
+
+#
+#  Log our finish
+#
+logMessage Script $0 finished

hooks/karmic/25-generate-locale

@@ -0,0 +1,40 @@
+#!/bin/sh
+#
+#  This script generates a default en_US.UTF-8 locale.
+#
+# Ward
+# --
+
+
+
+prefix=$1
+
+
+#
+#  Source our common functions
+#
+if [ -e /usr/lib/xen-tools/common.sh ]; then
+    . /usr/lib/xen-tools/common.sh
+else
+    . ./hooks/common.sh
+fi
+
+
+#
+# Log our start
+#
+logMessage Script $0 starting
+
+
+#
+# Install the English language pack.
+#
+#  NOTE:  Failure to support your favourite language is *not* a bug.
+#
+installDebianPackage ${prefix} language-pack-en
+
+
+#
+#  Log our finish
+#
+logMessage Script $0 finished

hooks/karmic/30-disable-gettys

@@ -0,0 +1,60 @@
+#!/bin/sh
+#
+#  This script comments out all virtual terminals which aren't on the
+# first console - that must remain so that 'xm console ...' works
+# correctly.
+#
+
+
+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
+
+#
+#  Remove the links for upstart
+#
+rm ${prefix}/etc/init/tty[!1].conf
+sed -i -e s/tty1/hvc0/ ${prefix}/etc/init/tty1.conf
+mv ${prefix}/etc/init/tty1.conf  ${prefix}/etc/init/hvc0.conf
+
+
+#
+#  Are we using an alternative serial device?
+#
+if [ ! -z "${serial_device}" ]; then
+
+    serial_device=`basename ${serial_device}`
+
+    # Let the user know.
+    logMessage "Replacing default serial device (tty1) with ${serial_device}"
+
+    # replace existing device.
+    mv ${prefix}/etc/init/hvc0.conf  ${prefix}/etc/init/${serial_device}.conf
+    sed -i -e s/hvc0/${serial_device}/ ${prefix}/etc/init/${serial_device}.conf
+    [ -f ${prefix}/etc/inittab ] && sed -i -e s/hvc0/${serial_device}/ ${prefix}/etc/inittab
+
+
+
+    # make sure that it is allowed to login.
+    echo $serial_device >> ${prefix}/etc/securetty
+fi
+
+
+#
+#  Log our finish
+#
+logMessage Script $0 finished

hooks/karmic/35-setup-users

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

hooks/karmic/40-setup-networking

@@ -0,0 +1,145 @@
+#!/bin/sh
+#
+#  This script sets up the /etc/network/interface file for the new
+# image.
+#
+# Steve
+# --
+# http://www.steve.org.uk/
+
+
+prefix=$1
+
+#
+#  Source our common functions
+#
+if [ -e /usr/lib/xen-tools/common.sh ]; then
+    . /usr/lib/xen-tools/common.sh
+else
+    . ./hooks/common.sh
+fi
+
+
+#
+# Log our start
+#
+logMessage Script $0 starting
+
+
+#
+#  Make sure we have an /etc/network directory.
+#
+mkdir -p ${prefix}/etc/network
+
+
+#
+#  A function to setup DHCP for our new image.
+#
+setupDynamicNetworking ()
+{
+    #
+    # The host is using DHCP.
+    #
+    cat <<E_O_DHCP > ${prefix}/etc/network/interfaces
+# This file describes the network interfaces available on your system
+# and how to activate them. For more information, see interfaces(5).
+
+# The loopback network interface
+auto lo
+iface lo inet loopback
+
+# The primary network interface
+auto eth0
+iface eth0 inet dhcp
+# post-up ethtool -K eth0 tx off
+
+#
+# The commented out line above will disable TCP checksumming which
+# might resolve problems for some users.  It is disabled by default
+#
+E_O_DHCP
+}
+
+
+
+#
+#  A function to setup static IP addresses for our new image.
+#
+setupStaticNetworking ()
+{
+    #
+    # broadcast address?
+    #
+    bcast='';
+    if [ ! -z "${broadcast}" ]; then
+      bcast=" broadcast ${broadcast}"
+    fi
+
+    #
+    # We have a static IP address
+    #
+    cat <<E_O_STATIC >${prefix}/etc/network/interfaces
+# This file describes the network interfaces available on your system
+# and how to activate them. For more information, see interfaces(5).
+
+# The loopback network interface
+auto lo
+iface lo inet loopback
+
+# The primary network interface
+auto eth0
+iface eth0 inet static
+ address ${ip1}
+ gateway ${gateway}
+ netmask ${netmask}
+ ${bcast}
+ # post-up  ethtool -K eth0 tx off
+
+#
+# The commented out line above will disable TCP checksumming which
+# might resolve problems for some users.  It is disabled by default
+#
+E_O_STATIC
+
+    interface=1
+    count=2
+
+    while [ "${count}" -le "${ip_count}" ]; do
+
+        value=\$ip${count}
+        value=`eval echo $value`
+
+        logMessage Adding etho:${interface}
+
+        cat <<E_O_STATIC >>${prefix}/etc/network/interfaces
+auto eth0:${interface}
+iface eth0:${interface} inet static
+ address ${value}
+ netmask ${netmask}
+ # post-up  ethtool -K eth0 tx off
+E_O_STATIC
+        count=`expr $count + 1`
+        interface=`expr $interface + 1`
+    done
+}
+
+
+
+
+#
+#  Call the relevant function
+#
+if [ -z "${dhcp}" ]; then
+    logMessage "Setting up static networking"
+    setupStaticNetworking
+
+else
+    logMessage "Setting up DHCP networking"
+    setupDynamicNetworking
+fi
+
+
+#
+#  Log our finish
+#
+logMessage Script $0 finished

hooks/karmic/50-setup-hostname

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

hooks/karmic/60-copy-host-files

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