Merge branch 'master' into febootstrap

AUTHORS

@@ -53,6 +53,9 @@ Contributions
   Gordon Messmer <gmessmer [at] edu.washington.u>
    - Supplied .spec file for building .rpm packages.
 
+  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.
 

bin/xen-create-image

@@ -93,6 +93,8 @@ xen-create-image - Easily create new Xen instances with networking and OpenSSH.
 
    --role=role  Run the specified role script(s) post-install.
                 Role scripts are discussed later in this manpage.
+                Can be an absolute path. Otherwise it's relative to the
+                value of --roledir.
 
    --role-args="--arg1 --arg2"
                 Pass the named string literally to any role script.
@@ -125,6 +127,14 @@ xen-create-image - Easily create new Xen instances with networking and OpenSSH.
 
    --scsi       Use SCSI names for virtual devices (i.e. sda not xvda)
 
+   --disk_device=diskname
+                Use specified device name for virtual devices instead of
+                the default value "xvda".
+
+   --serial_device=serialname
+                Install a getty on the specified serial device instead
+                of the default device.
+
 
   Installation options:
 
@@ -1410,6 +1420,9 @@ sub parseCommandLineArguments
             "lvm=s",       \$install{ 'lvm' },
             "image-dev=s", \$install{ 'image-dev' },
             "swap-dev=s",  \$install{ 'swap-dev' },
+            "serial_device=s", \$CONFIG{ 'serial_device' },
+            "disk_device=s", \$CONFIG{ 'disk_device' },
+          
 
             # Host options
             "no-hosts", \$CONFIG{ 'nohosts' },
@@ -3494,7 +3507,8 @@ sub runRoleScript
     #
     #  The complete path to the role script
     #
-    my $file = $roleDir . "/" . $role;
+    my $file = $role;
+    $file = $roleDir . "/" . $file unless $file =~ /\//;
 
     if ( -x $file )
     {

bin/xt-install-image

@@ -900,7 +900,7 @@ sub do_image_server
 
 =begin doc
 
-  Install a new distribution of GNU/Linux using the rpmstrap tool.
+  Install a new distribution of GNU/Linux using the rinse tool.
 
 =end doc
 

debian/README.source

@@ -1,9 +1,21 @@
-How to build xen-tools directly from the Mercurial repository?
-==============================================================
+How to build xen-tools directly from the Git repository?
+========================================================
 
-$ hg clone http://noone.org/hg/xen-tools/
+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
-$ make orig-tar-gz
-$ debuild -i'^\.hg'
 
- -- Axel Beckert <abe@debian.org>, Fri,  9 Apr 2010 02:06:24 +0200
+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,6 +1,6 @@
 xen-tools (4.2~rc1-1) UNRELEASED; urgency=low
 
-  * New maintainer and upstream author
+  * New maintainer and upstream authors
   * Reintroduction into Debian Unstable (Closes: #566714)
   * New upstream release candidate
     - Needs dependency on libfile-slurp-perl
@@ -48,9 +48,9 @@ xen-tools (4.2~rc1-1) UNRELEASED; urgency=low
     - [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 Mercurial repository.
+    the Git repository.
 
- -- Axel Beckert <abe@debian.org>  Fri, 09 Apr 2010 01:30:49 +0200
+ -- Axel Beckert <abe@debian.org>  Mon, 17 May 2010 13:32:04 +0200
 
 xen-tools (4.1-1) unstable; urgency=low
 

hooks/common.sh

@@ -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/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/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/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/intrepid/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/karmic/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