1
0
mirror of synced 2026-01-31 05:22:01 +00:00

2006-03-11 21:37:04 by steve

BUGFIX:  .deb file caching now works as expected.
This commit is contained in:
steve
2006-03-11 21:37:04 +00:00
parent e2ba4f42d0
commit a704612219

View File

@@ -402,7 +402,7 @@ Install an X11 server, using VNC and XDM
--
http://www.steve.org.uk/
$Id: xen-create-image,v 1.105 2006-03-11 20:57:12 steve Exp $
$Id: xen-create-image,v 1.106 2006-03-11 21:37:04 steve Exp $
=cut
@@ -764,6 +764,24 @@ my $debootstrap = "debootstrap $CONFIG{'debootstrap'} $CONFIG{'dist'} $dir $CONF
runCommandWithProgress( $debootstrap );
#
# Copy the newly installed files from the virtual image to the host,
# these will then be copied back the next time an image is created.
#
# Big win.
#
# NOTE: We do before running any hook or role scripts. This might
# not be ideal, but it avoids problems if any of those scripts run
# "apt-get clean" inside the new instance.
#
if ( $CONFIG{'cache'} eq "yes" )
{
print "\n\nCaching debootstrap files to the host system\n";
copyDebFiles( "$dir/var/cache/apt/archives", "/var/cache/apt/archives/" );
printWideMessage( "\rDone" );
}
#
# Now run any hook scripts post-install. These will be the ones
# we ship to setup the new image, or any local additions.
@@ -789,22 +807,6 @@ if ( $CONFIG{'role'} )
#
# Copy the newly installed files from the virtual image to the host,
# these will then be copied back the next time an image is created.
#
# Big win.
#
# NOTE: We do this after running any hook or role scripts, to ensure
# that any packages installed by either may be cached successfully.
#
if ( $CONFIG{'cache'} eq "yes" )
{
print "\n\nCaching debootstrap files to the host system\n";
copyDebFiles( "$dir/var/cache/apt/archives", "/var/cache/apt/archives/" );
printWideMessage( "\rDone" );
}
#
# We can not run this through hooks since it's interactive
@@ -1005,7 +1007,7 @@ sub parseCommandLineArguments
if ( $VERSION )
{
my $REVISION = '$Revision: 1.105 $';
my $REVISION = '$Revision: 1.106 $';
if ( $REVISION =~ /1.([0-9.]+) / )
{