Package: xen-tools
Tags: Patch

I stumbled over the bin/ls check after install, which seems to be new.
As I use xen-tools in some situations only for creatinf my xen config
files, this is not helpful in some situations.

here's a patch to add a noinstall option (against cvs version of some hours ago)


[EMAIL PROTECTED]:/hier/sources/xen-tools/xen-tools-cvs$ cvs diff -u
bin/xen-create-image
cvs diff: CVS password file /home/henning/.cvspass does not exist -
creating a new file
Index: bin/xen-create-image
===================================================================
RCS file: /home/cvs/xen-tools/bin/xen-create-image,v
retrieving revision 1.110
diff -u -r1.110 xen-create-image
--- bin/xen-create-image        5 Dec 2006 15:04:31 -0000       1.110
+++ bin/xen-create-image        9 Dec 2006 13:19:55 -0000
@@ -693,17 +703,21 @@
#
#  Call xt-install-image to perform the actual install.
#
-installSystem();
+if ( $CONFIG{'noinstall'} ne 1 )
+{
+       installSystem();
+}
+


#
-#  Make sure the installation succeeded.
+#  Make sure the installation succeeded - only if install was run
#
-if ( ! -x $MOUNT_POINT . "/bin/ls" )
-{
-    logprint( "System installation failed.  Aborting\n");
-    exit;
-}
+if ( $CONFIG{'noinstall'} ne 1 && ! -x $MOUNT_POINT . "/bin/ls" )
+       {
+           logprint( "System installation failed.  Aborting\n");
+           exit;
+       }



@@ -711,7 +725,10 @@
#  Call xt-customise-image to setup networking, and run any
# distributuion-specific hooks.
#
-runCustomisationHooks();
+if ( $CONFIG{'noinstall'} ne 1 )
+{
+       runCustomisationHooks();
+}


#
@@ -1367,6 +1384,14 @@
        logprint( "WARNING:  No netmaks address specified!\n" )
          unless( defined( $CONFIG{'netmask'} ) );
    }
+
+    # if config noinstall isn't set set it to exact 0 explicitly
+    if  ( !  $CONFIG{'noinstall'} || $CONFIG{'noinstall'} eq 0 ){
+        $CONFIG{'noinstall'} = 0;
+    } else {
+       $CONFIG{'noinstall'} = 1;
+    }
+
}


--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to