github.com/xen-tools.xen-tools
1
0
Fork 0
mirror of synced 2026-02-18 12:56:55 +00:00
Code Releases Activity

2006-12-05 15:04:31 by steve

Browse Source 
kernel + initrd are no longer mandatory, and they will only be
 in the build xen configuration file if specified.
This commit is contained in:
steve
2006-12-05 15:04:32 +00:00
parent 5438a2519a
commit 75e6b78318
2 changed files with 15 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
bin/xen-create-image
View File

@@ -507,7 +507,7 @@ Install an X11 server, using VNC and XDM
--
http://www.steve.org.uk/
$Id: xen-create-image,v 1.109 2006-11-29 23:29:48 steve Exp $
$Id: xen-create-image,v 1.110 2006-12-05 15:04:31 steve Exp $
=cut
@@ -846,7 +846,7 @@ sub setupDefaultOptions
#
$CONFIG{'dir'} = '';
$CONFIG{'xm'} = '/usr/sbin/xm';
$CONFIG{'kernel'} = '/boot/vmlinuz-2.6.16-1-xen-686';
$CONFIG{'kernel'} = '';
$CONFIG{'initrd'} = '';
#
@@ -1069,7 +1069,7 @@ sub parseCommandLineArguments
if ( $VERSION )
{
my $REVISION = '$Revision: 1.109 $';
my $REVISION = '$Revision: 1.110 $';
if ( $REVISION =~ /1.([0-9.]+) / )
{
$REVISION = $1;
@@ -1277,29 +1277,6 @@ E_OR
$CONFIG{'image'} = "full" if ( $CONFIG{'lvm'} ||
$CONFIG{'evms'} );
#
# The kernel + initrd images should exist.
#
if ( defined( $CONFIG{'kernel'} ) &&
length( $CONFIG{'kernel'} ) &&
! -e $CONFIG{'kernel'} )
{
logprint( "The kernel image we're trying to use does not exist.\n" );
logprint( "The image is - $CONFIG{'kernel'}\n" );
logprint( "Aborting\n" );
exit;
}
if ( defined( $CONFIG{'initrd'} ) &&
length( $CONFIG{'initrd'} ) &&
! -e $CONFIG{'initrd'} )
{
logprint( "The initial ramdisk we're trying to use does not exist.\n" );
logprint( "The image is - $CONFIG{'initrd'}\n" );
logprint( "Aborting\n" );
exit;
}
#
# Make sure we have one, and only one, installation method.
#
@@ -1498,10 +1475,13 @@ sub showSummery
logprint( "Swap size : $CONFIG{'swap'}\n" ) unless ( $CONFIG{'noswap' } );
logprint( "Image type : $CONFIG{'image'}\n" );
logprint( "Memory size : $CONFIG{'memory'}\n" );
logprint( "Kernel path : $CONFIG{'kernel'}\n" );
if ( defined( $CONFIG{'initrd'} ) &&
length( $CONFIG{'initrd'} ) )
if ( defined( $CONFIG{'kernel'} ) && length( $CONFIG{'kernel'} ) )
{
logprint( "Kernel path : $CONFIG{'kernel'}\n" );
}
if ( defined( $CONFIG{'initrd'} ) && length( $CONFIG{'initrd'} ) )
{
logprint( "Initrd path : $CONFIG{'initrd'}\n" );
}

7
etc/xm.tmpl
View File

@@ -7,7 +7,12 @@
#
# Kernel + memory size
#
kernel = '{$kernel}'
{ if ( $kernel )
{
$OUT.= "kernel = '$kernel'\n";
}
}
{ if ( $initrd )
{
$OUT.= "ramdisk = '$initrd'\n";