Commit 912c0fa5 authored by Mike Hibler's avatar Mike Hibler
Browse files

If copying a system image over from ops, remove the ops copy when done.

parent c1c60ef8
#!/usr/bin/perl -w #!/usr/bin/perl -w
# #
# Copyright (c) 2014 University of Utah and the Flux Group. # Copyright (c) 2014-2015 University of Utah and the Flux Group.
# #
# {{{EMULAB-LICENSE # {{{EMULAB-LICENSE
# #
...@@ -55,6 +55,7 @@ my $TB = "@prefix@"; ...@@ -55,6 +55,7 @@ my $TB = "@prefix@";
my $FSNODE = "@FSNODE@"; my $FSNODE = "@FSNODE@";
my $PROJROOT = "@PROJROOT_DIR@"; my $PROJROOT = "@PROJROOT_DIR@";
my $IMAGEVALIDATE = "$TB/sbin/imagevalidate"; my $IMAGEVALIDATE = "$TB/sbin/imagevalidate";
my $SSH = "/usr/bin/ssh";
my $SCP = "/usr/bin/scp"; my $SCP = "/usr/bin/scp";
my $SUDO = "/usr/local/bin/sudo"; my $SUDO = "/usr/local/bin/sudo";
...@@ -227,6 +228,17 @@ if ($image->Release()) { ...@@ -227,6 +228,17 @@ if ($image->Release()) {
$image->Unlock(); $image->Unlock();
fatal("Could not mark image as released!"); fatal("Could not mark image as released!");
} }
# If everything worked, remove the copies on ops to avoid unsightly clutter
if (defined($copytofile)) {
my $hfile = $copyfromfile . ".sha1";
if (!$quiet) {
print "Removing temporary copy on $FSNODE\n";
}
system("$SUDO $SSH ${FSNODE} rm -f $copyfromfile $copyfromsig $hfile");
}
$image->Unlock(); $image->Unlock();
exit(0); exit(0);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment