1
0
mirror of synced 2026-02-07 16:21:24 +00:00

Allow --install-method=cdebootstrap

It's just a shortcut for
--install-method=debootstrap --debootstrap-cmd=cdebootstrap
This commit is contained in:
Axel Beckert
2010-08-03 15:22:51 +02:00
parent 467c6a8828
commit 03968fd18c

View File

@@ -182,6 +182,7 @@ xen-create-image - Easily create new Xen instances with networking and OpenSSH.
Specify the installation method to use. Valid methods are:
* debootstrap
* cdebootstrap
* rinse
* rpmstrap (deprecated)
* tar (needs --install-source=tarball.tar)
@@ -387,7 +388,7 @@ Create a Xen configuration file in so that xm can start the new domain.
#
# Installation method:
# One of "copy", "debootstrap", "rinse", "rpmstrap", or "tar".
# One of "copy", "debootstrap", "cdebootstrap", "rinse", "rpmstrap", or "tar".
#
install-method = debootstrap
@@ -563,7 +564,7 @@ Create a Xen configuration file in so that xm can start the new domain.
The new guest images may be installed in several different ways:
1. Using the debootstrap command, which must be installed and present.
1. Using the [c]debootstrap command, which must be installed and present.
2. Using the rpmstrap command, which must be installed and present.
3. using the rinse command, which must be installed and present.
4. By copying an existing installation.
@@ -1951,12 +1952,22 @@ sub checkArguments
if ( defined( $CONFIG{ 'install-method' } ) )
{
foreach my $recognised (
qw/ copy debootstrap rinse rpmstrap tar /)
qw/ copy debootstrap cdebootstrap rinse rpmstrap tar /)
{
$valid = 1
if ( lc( $CONFIG{ 'install-method' } ) eq lc($recognised) );
}
#
# If we have "cdebootstrap", set it to "debootstrap" and set
# debootstrap-cmd to cdebootstrap instead.
#
if ( lc( $CONFIG{ 'install-method' } ) eq 'cdebootstrap' )
{
$CONFIG{ 'install-method' } = 'debootstrap';
$CONFIG{ 'debootstrap-cmd' } = 'cdebootstrap';
}
#
# If we have "copy", or "tar" method then make sure we have a source.
#