From 0d42b3e9e0e8d35d44d8fb6f0f7ead1ab522dce8 Mon Sep 17 00:00:00 2001
From: steve <none@none>
Date: Sun, 19 Nov 2006 19:41:36 +0000
Subject: [PATCH] 2006-11-19 19:41:34 by steve   Fixups for test cases.

---
 Makefile                  | 4 ++--
 bin/xen-create-image      | 6 +++---
 bin/xen-delete-image      | 6 +++---
 bin/xen-list-images       | 6 +++---
 bin/xen-update-image      | 6 +++---
 bin/xt-create-xen-config  | 6 +++---
 bin/xt-customize-image    | 6 +++---
 bin/xt-install-image      | 6 +++---
 hooks/debian/20-setup-apt | 6 +++---
 tests/hook-inittab.t      | 5 ++++-
 10 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/Makefile b/Makefile
index e72b280..c25dd8a 100644
--- a/Makefile
+++ b/Makefile
@@ -7,14 +7,14 @@
 # --
 # http://www.steve.org.uk/
 #
-# $Id: Makefile,v 1.83 2006-10-24 09:22:22 steve Exp $
+# $Id: Makefile,v 1.84 2006-11-19 19:41:34 steve Exp $
 
 
 #
 #  Only used to build distribution tarballs.
 #
 DIST_PREFIX = /tmp
-VERSION     = 2.8
+VERSION     = 2.9
 BASE        = xen-tools
 
 
diff --git a/bin/xen-create-image b/bin/xen-create-image
index ca430d9..8519ff6 100755
--- a/bin/xen-create-image
+++ b/bin/xen-create-image
@@ -498,7 +498,7 @@ Install an X11 server, using VNC and XDM
  --
  http://www.steve.org.uk/
 
- $Id: xen-create-image,v 1.102 2006-11-15 14:25:50 steve Exp $
+ $Id: xen-create-image,v 1.103 2006-11-19 19:41:34 steve Exp $
 
 =cut
 
@@ -545,7 +545,7 @@ my $MOUNT_POINT = undef;
 #
 # Release number.
 #
-my $RELEASE = '2.8';
+my $RELEASE = '2.9';
 
 
 
@@ -1020,7 +1020,7 @@ sub parseCommandLineArguments
 
     if ( $VERSION )
     {
-        my $REVISION      = '$Revision: 1.102 $';
+        my $REVISION      = '$Revision: 1.103 $';
         if ( $REVISION =~ /1.([0-9.]+) / )
         {
             $REVISION = $1;
diff --git a/bin/xen-delete-image b/bin/xen-delete-image
index a18bd9c..9d2994e 100755
--- a/bin/xen-delete-image
+++ b/bin/xen-delete-image
@@ -124,7 +124,7 @@ Specify the EVMS container where images were previously saved.
  --
  http://www.steve.org.uk/
 
- $Id: xen-delete-image,v 1.22 2006-10-24 09:22:22 steve Exp $
+ $Id: xen-delete-image,v 1.23 2006-11-19 19:41:34 steve Exp $
 
 =cut
 
@@ -159,7 +159,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '2.8';
+my $RELEASE = '2.9';
 
 
 
@@ -314,7 +314,7 @@ sub parseCommandLineArguments
 
     if ( $VERSION )
     {
-       my $REVISION      = '$Revision: 1.22 $';
+       my $REVISION      = '$Revision: 1.23 $';
 
        if ( $REVISION =~ /1.([0-9.]+) / )
        {
diff --git a/bin/xen-list-images b/bin/xen-list-images
index 5af9623..354cd77 100755
--- a/bin/xen-list-images
+++ b/bin/xen-list-images
@@ -67,7 +67,7 @@ Show the version number and exit.
  --
  http://www.steve.org.uk/
 
- $Id: xen-list-images,v 1.18 2006-10-24 09:22:22 steve Exp $
+ $Id: xen-list-images,v 1.19 2006-11-19 19:41:34 steve Exp $
 
 =cut
 
@@ -107,7 +107,7 @@ $CONFIG{'prefix'} = "/etc/xen";
 #
 # Release number.
 #
-my $RELEASE = '2.8';
+my $RELEASE = '2.9';
 
 
 
@@ -240,7 +240,7 @@ sub parseCommandLineArguments
 
     if ( $VERSION )
     {
-        my $REVISION      = '$Revision: 1.18 $';
+        my $REVISION      = '$Revision: 1.19 $';
         if ( $REVISION =~ /1.([0-9.]+) / )
         {
             $REVISION = $1;
diff --git a/bin/xen-update-image b/bin/xen-update-image
index 8dbe1a4..add7b66 100755
--- a/bin/xen-update-image
+++ b/bin/xen-update-image
@@ -86,7 +86,7 @@ Specify the EVMS container which contains the image(s).
  --
  http://www.steve.org.uk/
 
- $Id: xen-update-image,v 1.15 2006-10-24 09:22:22 steve Exp $
+ $Id: xen-update-image,v 1.16 2006-11-19 19:41:34 steve Exp $
 
 =cut
 
@@ -121,7 +121,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '2.8';
+my $RELEASE = '2.9';
 
 
 #
@@ -383,7 +383,7 @@ sub parseCommandLineArguments
 
     if ( $VERSION )
     {
-       my $REVISION      = '$Revision: 1.15 $';
+       my $REVISION      = '$Revision: 1.16 $';
 
        if ( $REVISION =~ /1.([0-9.]+) / )
        {
diff --git a/bin/xt-create-xen-config b/bin/xt-create-xen-config
index e215c39..debe843 100755
--- a/bin/xt-create-xen-config
+++ b/bin/xt-create-xen-config
@@ -96,7 +96,7 @@ xt-create-config - Create a Xen configuration file for a new guest
  --
  http://www.steve.org.uk/
 
- $Id: xt-create-xen-config,v 1.23 2006-10-24 09:22:22 steve Exp $
+ $Id: xt-create-xen-config,v 1.24 2006-11-19 19:41:34 steve Exp $
 
 =cut
 
@@ -137,7 +137,7 @@ $CONFIG{'template'} = '/etc/xen-tools/xm.tmpl';
 #
 # Release number.
 #
-my $RELEASE = '2.8';
+my $RELEASE = '2.9';
 
 
 
@@ -203,7 +203,7 @@ sub parseCommandLineArguments
 
     if ( $VERSION )
     {
-       my $REVISION      = '$Revision: 1.23 $';
+       my $REVISION      = '$Revision: 1.24 $';
        if ( $REVISION =~ /1.([0-9.]+) / )
        {
            $REVISION = $1;
diff --git a/bin/xt-customize-image b/bin/xt-customize-image
index 3d9d846..e463036 100755
--- a/bin/xt-customize-image
+++ b/bin/xt-customize-image
@@ -66,7 +66,7 @@ xt-customize-image - Customize a freshly installed copy of GNU/Linux
  --
  http://www.steve.org.uk/
 
- $Id: xt-customize-image,v 1.21 2006-10-24 09:22:22 steve Exp $
+ $Id: xt-customize-image,v 1.22 2006-11-19 19:41:34 steve Exp $
 
 =cut
 
@@ -99,7 +99,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '2.8';
+my $RELEASE = '2.9';
 
 
 
@@ -165,7 +165,7 @@ sub parseCommandLineArguments
 
     if ( $VERSION )
     {
-       my $REVISION      = '$Revision: 1.21 $';
+       my $REVISION      = '$Revision: 1.22 $';
        if ( $REVISION =~ /1.([0-9.]+) / )
        {
            $REVISION = $1;
diff --git a/bin/xt-install-image b/bin/xt-install-image
index ca21159..76f04cf 100755
--- a/bin/xt-install-image
+++ b/bin/xt-install-image
@@ -80,7 +80,7 @@ Install the distribution specified by the B<--dist> argument using the debootstr
  --
  http://www.steve.org.uk/
 
- $Id: xt-install-image,v 1.39 2006-10-24 09:22:22 steve Exp $
+ $Id: xt-install-image,v 1.40 2006-11-19 19:41:34 steve Exp $
 
 =cut
 
@@ -112,7 +112,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '2.8';
+my $RELEASE = '2.9';
 
 
 
@@ -377,7 +377,7 @@ sub parseCommandLineArguments
 
     if ( $VERSION )
     {
-        my $REVISION      = '$Revision: 1.39 $';
+        my $REVISION      = '$Revision: 1.40 $';
         if ( $REVISION =~ /1.([0-9.]+) / )
         {
             $REVISION = $1;
diff --git a/hooks/debian/20-setup-apt b/hooks/debian/20-setup-apt
index 50a7c60..2401135 100755
--- a/hooks/debian/20-setup-apt
+++ b/hooks/debian/20-setup-apt
@@ -102,12 +102,12 @@ if [ "`uname -m`" = "x86_64" ]; then
 else
 
     case "${dist}" in
-	etch|sid)
+        etch|sid)
             logMessage "Installing xen-aware libc6"
-	    
+    
             installDebianPackage ${prefix} libc6-xen
             ;;
-	*)
+        *)
             logMessage "Disabling TLS"
             mv ${prefix}/lib/tls ${prefix}/lib/tls.disabled
             mkdir ${prefix}/lib/tls
diff --git a/tests/hook-inittab.t b/tests/hook-inittab.t
index 24924ec..0ac8443 100644
--- a/tests/hook-inittab.t
+++ b/tests/hook-inittab.t
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# $Id: hook-inittab.t,v 1.6 2006-08-17 12:32:19 steve Exp $
+# $Id: hook-inittab.t,v 1.7 2006-11-19 19:41:36 steve Exp $
 #
 
 use strict;
@@ -33,6 +33,9 @@ foreach my $dir ( glob( "hooks/*" ) )
     if ( $dir =~ /hooks\/(.*)/ )
     {
         my $dist = $1;
+
+        next if ( $dist =~ /ubuntu/i );
+
         testHook( $dist );
     }
 }