1
0
mirror of synced 2026-04-25 03:54:31 +00:00

2007-07-16 00:22:55 by steve

*Minimal* support for the `rinse` utility.  Not yet tested.
This commit is contained in:
steve
2007-07-16 00:22:57 +00:00
parent 792fd155df
commit 7cd1d94055
3 changed files with 50 additions and 9 deletions

View File

@@ -277,7 +277,8 @@ Create a configuration file in /etc/xen so that xm can create the new image.
#
# Installation method, one of "copy", "debootstrap", "rpmstrap", "tar".
# Installation method:
# One of "copy", "debootstrap", "rinse", "rpmstrap", "tar".
#
install-method = debootstrap
@@ -461,8 +462,9 @@ Create a configuration file in /etc/xen so that xm can create the new image.
1. Using the debootstrap command, which must be installed and present.
2. Using the rpmstrap command, which must be installed and present.
3. By copying an existing installation.
4. By untarring a file containing a previous installation.
3. using the rinse command, which must be installed and present.
4. By copying an existing installation.
5. By untarring a file containing a previous installation.
These different methods can be selected by either the command line
arguments, or settings in the configuration file. Only one installation
@@ -592,7 +594,7 @@ Install an X11 server, using VNC and XDM
--
http://www.steve.org.uk/
$Id: xen-create-image,v 1.166 2007-07-10 19:36:24 steve Exp $
$Id: xen-create-image,v 1.167 2007-07-16 00:22:55 steve Exp $
=cut
@@ -1372,7 +1374,7 @@ sub parseCommandLineArguments
if ( $VERSION )
{
my $REVISION = '$Revision: 1.166 $';
my $REVISION = '$Revision: 1.167 $';
if ( $REVISION =~ /1.([0-9.]+) / )
{
$REVISION = $1;
@@ -1548,7 +1550,7 @@ E_OR
my $valid = 0;
if ( defined( $CONFIG{'install-method'} ) )
{
foreach my $recognised ( qw/ copy debootstrap image-server rpmstrap tar / )
foreach my $recognised ( qw/ copy debootstrap image-server rinse rpmstrap tar / )
{
$valid = 1 if ( lc($CONFIG{'install-method'}) eq lc($recognised) );
}
@@ -1581,6 +1583,7 @@ E_OR
--install-method=copy --install-source=/some/path
--install-method=debootstrap
--install-method=rinse
--install-method=rpmstrap
--install-method=tar --install-source=/some/file.tar

View File

@@ -63,6 +63,9 @@ Install the distribution specified by the B<--dist> argument using the debootstr
=item B<copy>
Copy the given directory recursively. This local directory is assumed to contain a complete installation. Specify the directory to copy with the B<--install-source> argument.
=item B<rinse>
Install the distribution specified by B<--dist> using the rinse command.
=item B<rpmstrap>
Install the distribution specified by B<--dist> using the rpmstrap command.
@@ -80,7 +83,7 @@ Untar a .tar file into the new installation location. This tarfile is assumed t
--
http://www.steve.org.uk/
$Id: xt-install-image,v 1.61 2007-07-10 19:36:25 steve Exp $
$Id: xt-install-image,v 1.62 2007-07-16 00:22:56 steve Exp $
=cut
@@ -144,6 +147,11 @@ my %dispatch =
sub => \&do_image_server,
needURL => 1,
},
"rinse" =>
{
sub => \&do_rinse,
needBinary => "/usr/bin/rinse",
},
"rpmstrap" =>
{
sub => \&do_rpmstrap,
@@ -430,7 +438,7 @@ sub parseCommandLineArguments
if ( $VERSION )
{
my $REVISION = '$Revision: 1.61 $';
my $REVISION = '$Revision: 1.62 $';
if ( $REVISION =~ /1.([0-9.]+) / )
{
$REVISION = $1;
@@ -903,6 +911,35 @@ sub do_image_server
=begin doc
Install a new distribution of GNU/Linux using the rpmstrap tool.
=end doc
=cut
sub do_rinse
{
#
# The command we're going to run.
#
my $command = "rinse --distribution=$CONFIG{'dist'} --directory=$CONFIG{'location'}";
#
# Propogate the verbosity setting.
#
if ( $CONFIG{'verbose'} )
{
$command .= " --verbose";
}
runCommand( $command );
}
=begin doc
Install a new distribution of GNU/Linux using the rpmstrap tool.