Compare commits
3 Commits
debian-4.2
...
domaindir
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2ca9232fe9 | ||
|
|
7d9ee76da3 | ||
|
|
aba94e4c73 |
13
KNOWN_BUGS
13
KNOWN_BUGS
@@ -1,13 +0,0 @@
|
||||
KNOWN BUGS in xen-tools
|
||||
|
||||
Bugs to fix before a 4.2 release
|
||||
--------------------------------
|
||||
|
||||
* xen-delete-image doesn't remove all logical volumes if --partitions is used.
|
||||
|
||||
See the link below for details how to reproduce. Reproducable at
|
||||
least with --lvm. Thanks to Antoine Benkemoun for reporting.
|
||||
|
||||
http://xen-tools.org/pipermail/xen-tools-discuss/2010-May/000757.html
|
||||
|
||||
* xen-delete-image ignores extension setting
|
||||
4
Makefile
4
Makefile
@@ -14,7 +14,7 @@
|
||||
#
|
||||
TMP ?= /tmp
|
||||
DIST_PREFIX = ${TMP}
|
||||
VERSION = 4.2beta1
|
||||
VERSION = 4.2rc1
|
||||
DEBVERSION = $(shell echo $(VERSION)|sed 's/\(rc\|pre\|beta\|alpha\)/~\1/')
|
||||
BASE = xen-tools
|
||||
VCS = $(shell if git st > /dev/null; then echo git; \
|
||||
@@ -313,4 +313,4 @@ update-modules:
|
||||
# at the top of this file. Steve-Specific?
|
||||
#
|
||||
update-version:
|
||||
perl -pi.bak -e "s/RELEASE = '[0-9]\.[0-9][^']*';/RELEASE = '${VERSION}';/g" bin/*-*[!~]
|
||||
perl -pi.bak -e "s/RELEASE = '[0-9]\.[0-9][^']*';/RELEASE = '${VERSION}';/g" bin/*-*[^~]
|
||||
|
||||
16
TODO
16
TODO
@@ -1,10 +1,8 @@
|
||||
TODO
|
||||
====
|
||||
|
||||
See KNOWN_BUGS for real bugs.
|
||||
|
||||
Minor bugs to fix and features to add before a 4.2 release
|
||||
----------------------------------------------------------
|
||||
Bugs to fix and Features to add before a 4.2 release
|
||||
----------------------------------------------------
|
||||
|
||||
* xen-create-image man page overhaul:
|
||||
|
||||
@@ -24,12 +22,22 @@ Minor bugs to fix and features to add before a 4.2 release
|
||||
in the domU, it's key fingerprint should be echo'd in a way that
|
||||
can easily be grep'ed into other scripts.
|
||||
|
||||
|
||||
* Test and support more file system types.
|
||||
|
||||
Actually this should be pretty simple now that the parameters are
|
||||
stored in the configuration hash. The only issue is that trailing
|
||||
whitespace is missing from the "make_fs_foo" option.
|
||||
|
||||
* xen-delete-image doesn't remove all logical volumes if --partitions is used.
|
||||
|
||||
See the link below for details how to reproduce. Reproducable at
|
||||
least with --lvm. Thanks to Antoine Benkemoun for reporting.
|
||||
|
||||
http://xen-tools.org/pipermail/xen-tools-discuss/2010-May/000757.html
|
||||
|
||||
* xen-delete-image ignores extension setting
|
||||
|
||||
* xen-create-image should check all integer options on non-digits.
|
||||
|
||||
* Test suite should pass
|
||||
|
||||
@@ -216,19 +216,35 @@ xen-create-image - Easily create new Xen instances with networking and OpenSSH.
|
||||
|
||||
Mandatory options:
|
||||
|
||||
--domaindir=dir
|
||||
--dir=dir Specify where the output images should go.
|
||||
Subdirectories will be created for each guest
|
||||
If you do not wish to use loopback images specify --lvm
|
||||
or --evms. (These three options are mutually exclusive.)
|
||||
Subdirectories will be created for each guest.
|
||||
|
||||
Using --dir will create subdirectory domains as before
|
||||
for backwards compatibility, e.g. if you use
|
||||
--dir=foo, the default disk image will go to
|
||||
foo/domains/$hostname/disk.img.
|
||||
|
||||
Using --domaindir will create direct subdirectories
|
||||
named after the hostname as discussed in
|
||||
http://bugs.debian.org/477238, e.g. if you use
|
||||
--domaindir=foo, the default disk image will go to
|
||||
foo/$hostname/disk.img.
|
||||
|
||||
If you do not wish to use loopback images specify
|
||||
--lvm or --evms. (These three respectively four
|
||||
options are mutually exclusive.)
|
||||
|
||||
--lvm=vg Specify the volume group to save images within.
|
||||
If you do not wish to use LVM specify --dir or --evms.
|
||||
(These three options are mutually exclusive.)
|
||||
If you do not wish to use LVM specify --evms. or
|
||||
--dir/--domaindir (These three respectively four
|
||||
options are mutually exclusive.)
|
||||
|
||||
--evms=lvm2/container
|
||||
Specify the container to save images within, i.e. '--evms
|
||||
lvm2/mycontainer'. If you do not wish to use EVMS specify
|
||||
--dir or --lvm. (These three options are mutually exclusive.)
|
||||
--dir/--domaindir or --lvm. (These three respectively
|
||||
four options are mutually exclusive.)
|
||||
|
||||
--hostname=host.example.org
|
||||
Set the hostname of the new guest system. Ideally
|
||||
@@ -754,7 +770,7 @@ my $FAIL = 0;
|
||||
#
|
||||
# Release number.
|
||||
#
|
||||
my $RELEASE = '4.2beta1';
|
||||
my $RELEASE = '4.2rc1';
|
||||
|
||||
|
||||
|
||||
@@ -862,7 +878,7 @@ checkBinariesPresent();
|
||||
if ( !$#PARTITIONS )
|
||||
{
|
||||
populatePartitionsData()
|
||||
if ( ( $CONFIG{ 'dir' } ) ||
|
||||
if ( ( $CONFIG{ 'domaindir' } ) ||
|
||||
( $CONFIG{ 'evms' } ) ||
|
||||
( $CONFIG{ 'lvm' } ) );
|
||||
}
|
||||
@@ -878,7 +894,7 @@ showSummary();
|
||||
#
|
||||
# Create and format the images if we're using loopback filesystems.
|
||||
#
|
||||
if ( $CONFIG{ 'dir' } )
|
||||
if ( $CONFIG{ 'domaindir' } )
|
||||
{
|
||||
|
||||
#
|
||||
@@ -1447,6 +1463,7 @@ sub parseCommandLineArguments
|
||||
my %install;
|
||||
$install{ 'evms' } = undef;
|
||||
$install{ 'dir' } = undef;
|
||||
$install{ 'domaindir' } = undef;
|
||||
$install{ 'lvm' } = undef;
|
||||
$install{ 'image-dev' } = undef;
|
||||
|
||||
@@ -1469,6 +1486,7 @@ sub parseCommandLineArguments
|
||||
|
||||
# Locations
|
||||
"dir=s", \$install{ 'dir' },
|
||||
"domaindir=s", \$install{ 'domaindir' },
|
||||
"evms=s", \$install{ 'evms' },
|
||||
"kernel=s", \$CONFIG{ 'kernel' },
|
||||
"initrd=s", \$CONFIG{ 'initrd' },
|
||||
@@ -1557,12 +1575,22 @@ sub parseCommandLineArguments
|
||||
|
||||
|
||||
#
|
||||
# Now make ensure that the command line setting of '--lvm', '--evms'
|
||||
# and '--dir=x' override anything specified in the configuration file.
|
||||
# Now make ensure that the command line setting of '--lvm', '--evms',
|
||||
# '--domaindir=x' and '--dir=x' override anything specified in the
|
||||
# configuration file.
|
||||
#
|
||||
if ( $install{ 'dir' } )
|
||||
{
|
||||
$CONFIG{ 'dir' } = $install{ 'dir' };
|
||||
$CONFIG{ 'dir' } = undef;
|
||||
$CONFIG{ 'domaindir' } = $install{ 'dir' }.'/domains';
|
||||
$CONFIG{ 'evms' } = undef;
|
||||
$CONFIG{ 'lvm' } = undef;
|
||||
$CONFIG{ 'image-dev' } = undef;
|
||||
}
|
||||
if ( $install{ 'domaindir' } )
|
||||
{
|
||||
$CONFIG{ 'dir' } = undef;
|
||||
$CONFIG{ 'domaindir' } = $install{ 'domaindir' };
|
||||
$CONFIG{ 'evms' } = undef;
|
||||
$CONFIG{ 'lvm' } = undef;
|
||||
$CONFIG{ 'image-dev' } = undef;
|
||||
@@ -1570,6 +1598,7 @@ sub parseCommandLineArguments
|
||||
if ( $install{ 'evms' } )
|
||||
{
|
||||
$CONFIG{ 'dir' } = undef;
|
||||
$CONFIG{ 'domaindir' } = undef;
|
||||
$CONFIG{ 'evms' } = $install{ 'evms' };
|
||||
$CONFIG{ 'lvm' } = undef;
|
||||
$CONFIG{ 'image-dev' } = undef;
|
||||
@@ -1577,6 +1606,7 @@ sub parseCommandLineArguments
|
||||
if ( $install{ 'lvm' } )
|
||||
{
|
||||
$CONFIG{ 'dir' } = undef;
|
||||
$CONFIG{ 'domaindir' } = undef;
|
||||
$CONFIG{ 'evms' } = undef;
|
||||
$CONFIG{ 'lvm' } = $install{ 'lvm' };
|
||||
$CONFIG{ 'image-dev' } = undef;
|
||||
@@ -1584,6 +1614,7 @@ sub parseCommandLineArguments
|
||||
if ( $install{ 'image-dev' } )
|
||||
{
|
||||
$CONFIG{ 'dir' } = undef;
|
||||
$CONFIG{ 'domaindir' } = undef;
|
||||
$CONFIG{ 'evms' } = undef;
|
||||
$CONFIG{ 'lvm' } = undef;
|
||||
$CONFIG{ 'image-dev' } = $install{ 'image-dev' };
|
||||
@@ -1709,7 +1740,7 @@ sub checkArguments
|
||||
my $err = <<E_OR;
|
||||
|
||||
We are trying to configure an installation of $CONFIG{'dist'} in
|
||||
$CONFIG{'dir'} - but there is no hook directory for us to use.
|
||||
$CONFIG{'domaindir'} - but there is no hook directory for us to use.
|
||||
|
||||
This means we do not know how to configure this installation.
|
||||
|
||||
@@ -2107,7 +2138,7 @@ sub checkBinariesPresent
|
||||
#
|
||||
# Image type specific binaries
|
||||
#
|
||||
if ( defined( $CONFIG{ 'dir' } ) )
|
||||
if ( defined( $CONFIG{ 'domaindir' } ) )
|
||||
{
|
||||
|
||||
# loopback image
|
||||
@@ -2642,7 +2673,7 @@ sub createLoopbackImages
|
||||
#
|
||||
# Make sure we have the relevant output directory.
|
||||
#
|
||||
my $output = $CONFIG{ 'dir' } . "/domains/" . $CONFIG{ 'hostname' };
|
||||
my $output = $CONFIG{ 'domaindir' } . '/' . $CONFIG{ 'hostname' };
|
||||
|
||||
if ( !-d $output )
|
||||
{
|
||||
@@ -2666,7 +2697,7 @@ sub createLoopbackImages
|
||||
foreach my $partition (@PARTITIONS)
|
||||
{
|
||||
my $disk =
|
||||
$CONFIG{ 'dir' } . '/domains/' . $CONFIG{ 'hostname' } . '/' .
|
||||
$CONFIG{ 'domaindir' } . '/' . $CONFIG{ 'hostname' } . '/' .
|
||||
$partition->{ 'name' } . '.img';
|
||||
|
||||
if ( -e $disk )
|
||||
@@ -2685,7 +2716,7 @@ sub createLoopbackImages
|
||||
foreach my $partition (@PARTITIONS)
|
||||
{
|
||||
my $disk =
|
||||
$CONFIG{ 'dir' } . '/domains/' . $CONFIG{ 'hostname' } . '/' .
|
||||
$CONFIG{ 'domaindir' } . '/' . $CONFIG{ 'hostname' } . '/' .
|
||||
$partition->{ 'name' } . '.img';
|
||||
|
||||
#
|
||||
|
||||
@@ -130,7 +130,7 @@ $CONFIG{ 'template' } = '/etc/xen-tools/xm-nfs.tmpl';
|
||||
#
|
||||
# Release number.
|
||||
#
|
||||
my $RELEASE = '4.2beta1';
|
||||
my $RELEASE = '4.2rc1';
|
||||
|
||||
|
||||
# store version number away.
|
||||
|
||||
@@ -15,9 +15,12 @@ xen-delete-image - Delete previously created Xen instances.
|
||||
--verbose Show diagnostic output.
|
||||
|
||||
General options:
|
||||
--dir Specify the output directory where images were previously saved.
|
||||
--lvm Specify the LVM volume to use.
|
||||
--evms Specify the EVMS container to use.
|
||||
--dir Specify the output directory where images were previously
|
||||
saved. (old style)
|
||||
--domaindir Specify the output directory where images were previously
|
||||
saved. (new style)
|
||||
--lvm Specify the LVM volume to use.
|
||||
--evms Specify the EVMS container to use.
|
||||
|
||||
Specifying hosts:
|
||||
--hostname Specify the image name to delete.
|
||||
@@ -33,7 +36,14 @@ xen-delete-image - Delete previously created Xen instances.
|
||||
=over 8
|
||||
|
||||
=item B<--dir>
|
||||
Specify the output directory where images were previously saved.
|
||||
Specify the output directory where images were previously saved. Looks
|
||||
for directories named after the hostname in a subdirectory
|
||||
"domains". (old style, see xen-create-image(1) for details)
|
||||
|
||||
=item B<--domaindir>
|
||||
Specify the output directory where images were previously saved. Looks
|
||||
for directories named after the hostname directorly in this
|
||||
directory. (new style, see xen-create-image(1) for details)
|
||||
|
||||
=item B<--evms>
|
||||
Specify the EVMS container where images were previously saved.
|
||||
@@ -169,7 +179,7 @@ my %CONFIG;
|
||||
#
|
||||
# Release number.
|
||||
#
|
||||
my $RELEASE = '4.2beta1';
|
||||
my $RELEASE = '4.2rc1';
|
||||
|
||||
|
||||
|
||||
@@ -345,6 +355,7 @@ sub parseCommandLineArguments
|
||||
# Parse options.
|
||||
#
|
||||
GetOptions( "dir=s", \$CONFIG{ 'dir' },
|
||||
"domaindir=s", \$CONFIG{ 'domaindir' },
|
||||
"dry-run", \$CONFIG{ 'dry-run' },
|
||||
"lvm=s", \$CONFIG{ 'lvm' },
|
||||
"evms=s", \$CONFIG{ 'evms' },
|
||||
@@ -359,7 +370,6 @@ sub parseCommandLineArguments
|
||||
pod2usage(1) if $HELP;
|
||||
pod2usage( -verbose => 2 ) if $MANUAL;
|
||||
|
||||
|
||||
if ($VERSION)
|
||||
{
|
||||
my $REVISION = '$Revision: 1.41 $';
|
||||
@@ -373,6 +383,11 @@ sub parseCommandLineArguments
|
||||
exit;
|
||||
|
||||
}
|
||||
|
||||
if ($CONFIG{ 'dir' }) {
|
||||
$CONFIG{ 'domaindir' } = $CONFIG{ 'dir' }.'/domains';
|
||||
$CONFIG{ 'dir' } = undef;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -401,7 +416,7 @@ sub checkArguments
|
||||
# Make sure we got one and only one installation method.
|
||||
#
|
||||
my $count = 0;
|
||||
foreach my $type (qw/dir lvm evms/)
|
||||
foreach my $type (qw/dir domaindir lvm evms/)
|
||||
{
|
||||
$count += 1 if defined( $CONFIG{ $type } );
|
||||
}
|
||||
@@ -414,6 +429,7 @@ sub checkArguments
|
||||
{
|
||||
print "Please select one and only one of the installation methods:\n";
|
||||
print " --dir\n";
|
||||
print " --domaindir\n";
|
||||
print " --evms\n";
|
||||
print " --lvm\n";
|
||||
exit;
|
||||
@@ -504,9 +520,9 @@ sub deleteXenImage
|
||||
}
|
||||
|
||||
|
||||
if ( defined( $CONFIG{ 'dir' } ) )
|
||||
if ( defined( $CONFIG{ 'domaindir' } ) )
|
||||
{
|
||||
my $prefix = $CONFIG{ 'dir' } . "/domains/";
|
||||
my $prefix = $CONFIG{ 'domaindir' } . '/';
|
||||
|
||||
#
|
||||
# Now remove the directory.
|
||||
|
||||
@@ -102,7 +102,7 @@ $CONFIG{ 'prefix' } = "/etc/xen";
|
||||
#
|
||||
# Release number.
|
||||
#
|
||||
my $RELEASE = '4.2beta1';
|
||||
my $RELEASE = '4.2rc1';
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -15,10 +15,11 @@ xen-resize-guest - Resize a loopback or LVM based xen guest.
|
||||
--verbose Show diagnostic output.
|
||||
|
||||
General Options:
|
||||
--add Specify the amount of space to add, e.g. --add=1gb
|
||||
--dir Specify the path to the loopback image root.
|
||||
--force Force the resize to happen without a last-chance delay.
|
||||
--hostname Specify the hostname of the guest to resize.
|
||||
--add Specify the amount of space to add, e.g. --add=1gb
|
||||
--dir Specify the path to the loopback image root. (old style)
|
||||
--domaindir Specify the path to the loopback image root. (new style)
|
||||
--force Force the resize to happen without a last-chance delay.
|
||||
--hostname Specify the hostname of the guest to resize.
|
||||
|
||||
=cut
|
||||
|
||||
@@ -28,10 +29,14 @@ xen-resize-guest - Resize a loopback or LVM based xen guest.
|
||||
=over 8
|
||||
|
||||
=item B<--add>
|
||||
Specify the amount of storage to add to the primary disk.
|
||||
Specify the amount of storage to add to the primary disk. Looks
|
||||
for directories named after the hostname in a subdirectory
|
||||
"domains". (old style, see xen-create-image(1) for details)
|
||||
|
||||
=item B<--dir>
|
||||
Specify the directory where the loopback files are based.
|
||||
=item B<--domaindir>
|
||||
Specify the directory where the loopback files are based. Looks
|
||||
for directories named after the hostname directorly in this
|
||||
directory. (new style, see xen-create-image(1) for details)
|
||||
|
||||
=item B<--force>
|
||||
Don't pause for 10 seconds prior to commencing.
|
||||
@@ -116,7 +121,7 @@ my %CONFIG;
|
||||
#
|
||||
# Release number.
|
||||
#
|
||||
my $RELEASE = '4.2beta1';
|
||||
my $RELEASE = '4.2rc1';
|
||||
|
||||
|
||||
|
||||
@@ -143,14 +148,14 @@ testArguments();
|
||||
#
|
||||
my $path = undef;
|
||||
|
||||
if ( $CONFIG{ 'dir' } )
|
||||
if ( $CONFIG{ 'domaindir' } )
|
||||
{
|
||||
|
||||
#
|
||||
# Make sure we can find the disk
|
||||
#
|
||||
$path =
|
||||
$CONFIG{ 'dir' } . "/domains/" . $CONFIG{ 'hostname' } . "/disk.img";
|
||||
$CONFIG{ 'domaindir' } . '/' . $CONFIG{ 'hostname' } . "/disk.img";
|
||||
if ( !-e $path )
|
||||
{
|
||||
print <<EOF;
|
||||
@@ -392,6 +397,7 @@ sub parseCommandLineArguments
|
||||
# Misc. options
|
||||
"add=s", \$CONFIG{ 'add' },
|
||||
"dir=s", \$install{ 'dir' },
|
||||
"domaindir=s",\$install{ 'domaindir' },
|
||||
"lvm=s", \$install{ 'lvm' },
|
||||
"hostname=s", \$CONFIG{ 'hostname' },
|
||||
"force", \$CONFIG{ 'force' },
|
||||
@@ -426,7 +432,15 @@ sub parseCommandLineArguments
|
||||
}
|
||||
if ( $install{ 'dir' } )
|
||||
{
|
||||
$CONFIG{ 'dir' } = $install{ 'dir' };
|
||||
$CONFIG{ 'domaindir' } = $install{ 'dir' }.'/domains';
|
||||
$CONFIG{ 'dir' } = undef;
|
||||
$CONFIG{ 'lvm' } = undef;
|
||||
delete $CONFIG{ 'lvm' };
|
||||
}
|
||||
if ( $install{ 'domaindir' } )
|
||||
{
|
||||
$CONFIG{ 'domaindir' } = $install{ 'domaindir' };
|
||||
$CONFIG{ 'dir' } = undef;
|
||||
$CONFIG{ 'lvm' } = undef;
|
||||
delete $CONFIG{ 'lvm' };
|
||||
}
|
||||
@@ -493,18 +507,20 @@ EOF
|
||||
if ( defined( $CONFIG{ 'lvm' } ) && length( $CONFIG{ 'lvm' } ) );
|
||||
$options += 1
|
||||
if ( defined( $CONFIG{ 'dir' } ) && length( $CONFIG{ 'dir' } ) );
|
||||
$options += 1
|
||||
if ( defined( $CONFIG{ 'domaindir' } ) && length( $CONFIG{ 'domaindir' } ) );
|
||||
|
||||
#
|
||||
# Report
|
||||
#
|
||||
if ( $options == 0 )
|
||||
{
|
||||
print "Please specify one of --lvm or --dir\n";
|
||||
print "Please specify one of --lvm, --domaindir or --dir\n";
|
||||
exit 1;
|
||||
}
|
||||
if ( $options > 1 )
|
||||
{
|
||||
print "Please specify only one of --lvm or --dir - not both!\n";
|
||||
print "Please specify only one of --lvm, --domaindir or --dir - not several of them!\n";
|
||||
exit 1;
|
||||
}
|
||||
|
||||
|
||||
@@ -14,7 +14,8 @@ xen-update-image - Update the software installed upon offline Xen images.
|
||||
--version Show the version number and exit.
|
||||
|
||||
General Options:
|
||||
--dir Specify the directory which contains the image(s).
|
||||
--dir Specify the directory which contains the image(s). (old style)
|
||||
--domaindir Specify the directory which contains the image(s). (new style)
|
||||
--lvm Specify the LVM volume group which contains the image(s).
|
||||
--evms Specify the EVMS container which contains the image(s).
|
||||
|
||||
@@ -27,7 +28,14 @@ xen-update-image - Update the software installed upon offline Xen images.
|
||||
=over 8
|
||||
|
||||
=item B<--dir>
|
||||
Specify the directory which contains the image(s).
|
||||
Specify the directory which contains the image(s). Looks
|
||||
for directories named after the hostname in a subdirectory
|
||||
"domains". (old style, see xen-create-image(1) for details)
|
||||
|
||||
=item B<--domaindir>
|
||||
Specify the directory which contains the image(s). Looks
|
||||
for directories named after the hostname directorly in this
|
||||
directory. (new style, see xen-create-image(1) for details)
|
||||
|
||||
=item B<--evms>
|
||||
Specify the EVMS container which contains the image(s).
|
||||
@@ -120,7 +128,7 @@ my %CONFIG;
|
||||
#
|
||||
# Release number.
|
||||
#
|
||||
my $RELEASE = '4.2beta1';
|
||||
my $RELEASE = '4.2rc1';
|
||||
|
||||
|
||||
#
|
||||
@@ -214,7 +222,7 @@ sub updateXenImage
|
||||
{
|
||||
|
||||
# The loopback image.
|
||||
$img = $CONFIG{ 'dir' } . "/domains/" . $name . "/disk.img";
|
||||
$img = $CONFIG{ 'domaindir' } . '/' . $name . "/disk.img";
|
||||
|
||||
if ( !-e $img )
|
||||
{
|
||||
@@ -438,6 +446,7 @@ sub parseCommandLineArguments
|
||||
# Parse options.
|
||||
#
|
||||
GetOptions( "dir=s", \$CONFIG{ 'dir' }, "lvm=s", \$CONFIG{ 'lvm' },
|
||||
"domaindir=s", \$CONFIG{ 'dir' },
|
||||
"evms=s", \$CONFIG{ 'evms' }, "help", \$HELP,
|
||||
"manual", \$MANUAL, "version", \$VERSION
|
||||
);
|
||||
@@ -457,6 +466,11 @@ sub parseCommandLineArguments
|
||||
exit;
|
||||
|
||||
}
|
||||
|
||||
if ($CONFIG{ 'dir' }) {
|
||||
$CONFIG{ 'domaindir' } = $CONFIG{ 'dir' }.'/domains';
|
||||
$CONFIG{ 'dir' } = undef;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -477,7 +491,7 @@ sub checkArguments
|
||||
# Make sure we got one and only one installation method.
|
||||
#
|
||||
my $count = 0;
|
||||
foreach my $type (qw/dir lvm evms/)
|
||||
foreach my $type (qw/dir domaindir lvm evms/)
|
||||
{
|
||||
$count += 1 if defined( $CONFIG{ $type } );
|
||||
}
|
||||
@@ -490,6 +504,7 @@ sub checkArguments
|
||||
{
|
||||
print "Please select one and only one of the installation methods:\n";
|
||||
print " --dir\n";
|
||||
print " --domaindir\n";
|
||||
print " --evms\n";
|
||||
print " --lvm\n";
|
||||
exit;
|
||||
|
||||
@@ -156,7 +156,7 @@ $CONFIG{ 'template' } = '/etc/xen-tools/xm.tmpl';
|
||||
#
|
||||
# Release number.
|
||||
#
|
||||
my $RELEASE = '4.2beta1';
|
||||
my $RELEASE = '4.2rc1';
|
||||
|
||||
|
||||
|
||||
@@ -419,7 +419,7 @@ sub createXenConfig
|
||||
}
|
||||
else
|
||||
{
|
||||
$ENV{ 'image_prefix' } = "file:$ENV{'dir'}/domains/$ENV{'hostname'}/";
|
||||
$ENV{ 'image_prefix' } = "file:$ENV{'domaindir'}/$ENV{'hostname'}/";
|
||||
$ENV{ 'image_suffix' } = '.img';
|
||||
importPartitionsFromEnvironment();
|
||||
}
|
||||
|
||||
@@ -97,7 +97,7 @@ my %CONFIG;
|
||||
#
|
||||
# Release number.
|
||||
#
|
||||
my $RELEASE = '4.2beta1';
|
||||
my $RELEASE = '4.2rc1';
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -73,7 +73,7 @@ use strict;
|
||||
#
|
||||
# Release number.
|
||||
#
|
||||
my $RELEASE = '4.2beta1';
|
||||
my $RELEASE = '4.2rc1';
|
||||
|
||||
# Init
|
||||
my $mirror = '';
|
||||
|
||||
@@ -116,7 +116,7 @@ my %CONFIG;
|
||||
#
|
||||
# Release number.
|
||||
#
|
||||
my $RELEASE = '4.2beta1';
|
||||
my $RELEASE = '4.2rc1';
|
||||
|
||||
|
||||
#
|
||||
|
||||
4
debian/NEWS
vendored
4
debian/NEWS
vendored
@@ -1,4 +1,4 @@
|
||||
xen-tools (4.2~beta1-1) unstable; urgency=low
|
||||
xen-tools (4.2~rc1-1) unstable; urgency=low
|
||||
|
||||
If the DomU hangs with "Waiting for root file system" despite
|
||||
/dev/xvd* is used as disk device, adding "xen-blkfront" to
|
||||
@@ -14,5 +14,5 @@ xen-tools (4.2~beta1-1) unstable; urgency=low
|
||||
/etc/apt/sources.list (if it exists) and taking the first entry with
|
||||
path ending in /debian/ there.
|
||||
|
||||
-- Axel Beckert <abe@debian.org> Sun, 30 May 2010 22:36:16 +0200
|
||||
-- Axel Beckert <abe@debian.org> Sat, 15 May 2010 18:04:14 +0200
|
||||
|
||||
|
||||
9
debian/changelog
vendored
9
debian/changelog
vendored
@@ -1,8 +1,8 @@
|
||||
xen-tools (4.2~beta1-1) unstable; urgency=low
|
||||
xen-tools (4.2~rc1-1) UNRELEASED; urgency=low
|
||||
|
||||
* New maintainer and upstream authors
|
||||
* Reintroduction into Debian Unstable (Closes: #566714)
|
||||
* New upstream beta version
|
||||
* New upstream release candidate
|
||||
- Needs dependency on libfile-slurp-perl
|
||||
- Supports for more recent versions of Fedora, Ubuntu and Debian
|
||||
(Closes: #499477)
|
||||
@@ -41,7 +41,8 @@ xen-tools (4.2~beta1-1) unstable; urgency=low
|
||||
- Checks for debootstrap and cdebootstrap, uses debootstrap if both
|
||||
are installed (Changed "Depends: debootstrap" to "Depends:
|
||||
debootstrap | cdebootstrap" in debian/control)
|
||||
- Added new files TODO and KNOWN_BUGS to debian/docs.
|
||||
- Introduces the --domaindir option as alternative to --dir which
|
||||
always appends "/domains/" to the path. (Closes: #477238)
|
||||
* Removal of /etc/bash_completion.d/xm from the package since
|
||||
bash-completion ships a more elaborate version of that file. (Closes:
|
||||
#566683, #550590, LP: #538917, #484098)
|
||||
@@ -66,7 +67,7 @@ xen-tools (4.2~beta1-1) unstable; urgency=low
|
||||
the Git repository.
|
||||
* Overhauled package description
|
||||
|
||||
-- Axel Beckert <abe@debian.org> Sun, 30 May 2010 22:32:30 +0200
|
||||
-- Axel Beckert <abe@debian.org> Mon, 17 May 2010 13:32:04 +0200
|
||||
|
||||
xen-tools (4.1-1) unstable; urgency=low
|
||||
|
||||
|
||||
1
debian/copyright
vendored
1
debian/copyright
vendored
@@ -5,7 +5,6 @@ It was downloaded from http://xen-tools.org/software/xen-tools/
|
||||
|
||||
Copyright 2005-2009: Steve Kemp <steve@steve.org.uk>
|
||||
Copyright 2010: Axel Beckert <abe@deuxchevaux.org>
|
||||
Copyright 2010: Dmitry Nedospasov <dmitry@nedos.net>
|
||||
|
||||
License:
|
||||
|
||||
|
||||
3
debian/docs
vendored
3
debian/docs
vendored
@@ -2,5 +2,4 @@ AUTHORS
|
||||
README
|
||||
SUPPORT
|
||||
BUGS
|
||||
TODO
|
||||
KNOWN_BUGS
|
||||
TODO
|
||||
80
t/modules.t
Executable file
80
t/modules.t
Executable file
@@ -0,0 +1,80 @@
|
||||
#!/usr/bin/perl -w -I..
|
||||
#
|
||||
# Test that all the Perl modules we require are available.
|
||||
#
|
||||
# This list is automatically generated by modules.sh
|
||||
#
|
||||
# Steve
|
||||
# --
|
||||
#
|
||||
|
||||
use Test::More qw( no_plan );
|
||||
|
||||
BEGIN{ use_ok( 'Carp' ); }
|
||||
require_ok( 'Carp' );
|
||||
|
||||
|
||||
BEGIN{ use_ok( 'Config' ); }
|
||||
require_ok( 'Config' );
|
||||
|
||||
|
||||
BEGIN{ use_ok( 'Digest::MD5' ); }
|
||||
require_ok( 'Digest::MD5' );
|
||||
|
||||
|
||||
BEGIN{ use_ok( 'English' ); }
|
||||
require_ok( 'English' );
|
||||
|
||||
|
||||
BEGIN{ use_ok( 'Env' ); }
|
||||
require_ok( 'Env' );
|
||||
|
||||
|
||||
BEGIN{ use_ok( 'File::Copy' ); }
|
||||
require_ok( 'File::Copy' );
|
||||
|
||||
|
||||
BEGIN{ use_ok( 'File::Find' ); }
|
||||
require_ok( 'File::Find' );
|
||||
|
||||
|
||||
BEGIN{ use_ok( 'File::Path' ); }
|
||||
require_ok( 'File::Path' );
|
||||
|
||||
|
||||
BEGIN{ use_ok( 'File::Slurp' ); }
|
||||
require_ok( 'File::Slurp' );
|
||||
|
||||
|
||||
BEGIN{ use_ok( 'File::Spec' ); }
|
||||
require_ok( 'File::Spec' );
|
||||
|
||||
|
||||
BEGIN{ use_ok( 'File::Temp' ); }
|
||||
require_ok( 'File::Temp' );
|
||||
|
||||
|
||||
BEGIN{ use_ok( 'Getopt::Long' ); }
|
||||
require_ok( 'Getopt::Long' );
|
||||
|
||||
|
||||
BEGIN{ use_ok( 'Pod::Usage' ); }
|
||||
require_ok( 'Pod::Usage' );
|
||||
|
||||
|
||||
BEGIN{ use_ok( 'strict' ); }
|
||||
require_ok( 'strict' );
|
||||
|
||||
|
||||
BEGIN{ use_ok( 'Test::More' ); }
|
||||
require_ok( 'Test::More' );
|
||||
|
||||
|
||||
BEGIN{ use_ok( 'Text::Template' ); }
|
||||
require_ok( 'Text::Template' );
|
||||
|
||||
|
||||
BEGIN{ use_ok( 'warnings' ); }
|
||||
require_ok( 'warnings' );
|
||||
|
||||
|
||||
Reference in New Issue
Block a user