Commit 5b55ea1d authored by Mike Hibler's avatar Mike Hibler

Make sure that directories for *-64-MFS osids exist.

We no longer support 32-bit MFSes, so symlink frisbee/freebsd MFS
dirs to frisbee-64/freebsd-64 dirs. We used to just move the latter
to the former, which broke the 64-bit osids.

Thanks to Chuck Cranor for pointing this out.
parent 479cf37c
......@@ -121,9 +121,19 @@ sub Install($$$)
ExecQuietFatal("cd $TFTP_DIR; ".
"$CP -p $pdir/pxeboot.emu-${cons} pxeboot.emu");
};
#
# XXX conventionally, "freebsd" and "frisbee" were 32-bit versions
# of MFSes and "freebsd<vers>-64" and "frisbee<vers>-64" were 64-bit
# versions. We had different sets of OS descriptors for each.
# But we really don't support 32-bit machines anymore, so both
# versions are 64-bit. Since the paths are still different for the
# descriptors, we symlink "frisbee<vers>-64" to "frisbee" and
# similarly for "freebsd".
#
Phase "freemv", "Using freebsd${fv} version of admin MFS", sub {
DoneIfExists("$TFTP_DIR/freebsd");
ExecQuietFatal("cd $TFTP_DIR; $MV freebsd${fv} freebsd");
ExecQuietFatal("cd $TFTP_DIR; ln -s freebsd${fv} freebsd");
# find the best MFS kernel to use
if (!$kernelvers) {
if (-x "$TFTP_DIR/freebsd/boot/kernel10") {
......@@ -135,7 +145,7 @@ sub Install($$$)
};
Phase "frismv", "Using frisbee${fv} version of disk load MFS", sub {
DoneIfExists("$TFTP_DIR/frisbee");
ExecQuietFatal("cd $TFTP_DIR; $MV frisbee${fv} frisbee");
ExecQuietFatal("cd $TFTP_DIR; ln -s frisbee${fv} frisbee");
# find the best MFS kernel to use
if (!$kernelvers) {
if (-x "$TFTP_DIR/frisbee/boot/kernel10") {
......@@ -152,7 +162,7 @@ sub Install($$$)
Phase "newnode", "Using freebsd${fv} version of newnode MFS", sub {
DoneIfExists("$TFTP_DIR/freebsd.newnode");
ExecQuietFatal("cd $TFTP_DIR; ".
"$MV freebsd${fv}.newnode freebsd.newnode");
"ln -s freebsd${fv}.newnode freebsd.newnode");
# find the best MFS kernel to use
if (!$kernelvers) {
if (-x "$TFTP_DIR/freebsd.newnode/boot/kernel10") {
......
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