Commit 70b77f88 authored by Leigh B Stoller's avatar Leigh B Stoller

Download the correct MFS.

Use CP instead of MV when setting up pxeboot.
parent 58514c0d
......@@ -6,7 +6,9 @@ use libinstall;
use installvars;
use emutil;
my $MFSTARBALL = "tftpboot-elabinelab.tar.gz";
my $MFSTARBALL = ($ELABINELAB ?
"tftpboot-elabinelab.tar.gz" :
"tftpboot-latest.tar.gz");
my $MFSURL = "http://www.emulab.net/downloads/$MFSTARBALL";
my $MFSCONSOLE = $NODECONSOLE;
my $MFSDESCRIPTORS = "$TOP_SRCDIR/install/descriptors-mfs.xml";
......@@ -60,10 +62,10 @@ sub Install($$$)
if (! -e "$TFTP_DIR/$pdir/pxeboot.emu-${cons}") {
$cons = "sio";
}
Phase "pxemv", "Using ${cons} version of pxeboot", sub {
Phase "pxemv", "Using ${cons} version of $pdir", sub {
DoneIfExists("$TFTP_DIR/pxeboot.emu");
ExecQuietFatal("cd $TFTP_DIR; ".
"$MV $pdir/pxeboot.emu-${cons} pxeboot.emu");
"$CP -p $pdir/pxeboot.emu-${cons} pxeboot.emu");
};
Phase "freemv", "Using freebsd${fv} version of admin MFS", sub {
DoneIfExists("$TFTP_DIR/freebsd");
......
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