diff --git a/bin/xen-create-image b/bin/xen-create-image
index 9f877ff..7042baf 100755
--- a/bin/xen-create-image
+++ b/bin/xen-create-image
@@ -591,7 +591,7 @@ Install an X11 server, using VNC and XDM
  --
  http://www.steve.org.uk/
 
- $Id: xen-create-image,v 1.185 2007-10-10 08:56:32 steve Exp $
+ $Id: xen-create-image,v 1.186 2007-10-16 21:27:37 steve Exp $
 
 =cut
 
@@ -710,6 +710,22 @@ if ( $CONFIG{'config'} )
 }
 
 
+#
+#  Process --debug
+#
+if ( $CONFIG{'debug'} )
+{
+    foreach my $key ( sort keys %CONFIG )
+    {
+        print $key;
+        print " : " . $CONFIG{$key} if ( $CONFIG{$key} );
+        print  "\n";
+    }
+    exit;
+}
+
+
+
 #
 #  Check the environment - after parsing arguments.
 #
@@ -867,7 +883,7 @@ if ( $CONFIG{'install'} )
 #
 #  Run any specified role scripts.
 #
-runRoleScripts();
+runRoleScripts( $CONFIG{'role'} );
 
 
 #
@@ -1362,7 +1378,7 @@ sub parseCommandLineArguments
                "template=s",   \$CONFIG{'template'},
 
                # Help options
-               "debug",        \$CONFIG{'verbose'},
+               "debug",        \$CONFIG{'debug'},
                "help",         \$HELP,
                "manual",       \$MANUAL,
                "verbose",      \$CONFIG{'verbose'},
@@ -1375,7 +1391,7 @@ sub parseCommandLineArguments
 
     if ( $VERSION )
     {
-        my $REVISION      = '$Revision: 1.185 $';
+        my $REVISION      = '$Revision: 1.186 $';
         if ( $REVISION =~ /1.([0-9.]+) / )
         {
             $REVISION = $1;