Skip to content

Commit

Permalink
fix the mirror select
Browse files Browse the repository at this point in the history
  • Loading branch information
laffer1 committed Nov 14, 2020
1 parent 0aebfeb commit 02531f4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 13 deletions.
6 changes: 3 additions & 3 deletions release/scripts/box.ovf
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<Description>Logical network used by this appliance.</Description>
</Network>
</NetworkSection>
<VirtualSystem ovf:id="freebsd">
<VirtualSystem ovf:id="midnightbsd">
<Info>A virtual machine</Info>
<OperatingSystemSection ovf:id="78">
<Info>The kind of installed guest operating system</Info>
Expand All @@ -25,7 +25,7 @@
<System>
<vssd:ElementName>Virtual Hardware Family</vssd:ElementName>
<vssd:InstanceID>0</vssd:InstanceID>
<vssd:VirtualSystemIdentifier>freebsd</vssd:VirtualSystemIdentifier>
<vssd:VirtualSystemIdentifier>midnightbsd</vssd:VirtualSystemIdentifier>
<vssd:VirtualSystemType>virtualbox-2.2</vssd:VirtualSystemType>
</System>
<Item>
Expand Down Expand Up @@ -83,7 +83,7 @@
<rasd:ResourceType>10</rasd:ResourceType>
</Item>
</VirtualHardwareSection>
<vbox:Machine ovf:required="false" version="1.12-macosx" uuid="{8b837be7-fa96-48fc-b119-e90cfa144456}" name="freebsd" OSType="MidnightBSD_64" snapshotFolder="Snapshots" lastStateChange="2014-03-13T13:50:05Z">
<vbox:Machine ovf:required="false" version="1.12-macosx" uuid="{8b837be7-fa96-48fc-b119-e90cfa144456}" name="midnightbsd" OSType="MidnightBSD_64" snapshotFolder="Snapshots" lastStateChange="2014-03-13T13:50:05Z">
<ovf:Info>Complete VirtualBox machine configuration in VirtualBox format</ovf:Info>
<ExtraData>
<ExtraDataItem name="GUI/LastGuestSizeHint" value="720,400"/>
Expand Down
12 changes: 2 additions & 10 deletions usr.sbin/bsdinstall/scripts/mirrorselect
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,9 @@ MIRROR_BUTTON=$?
exec 3>&-

_UNAME_R=`uname -r`
RELDIR="releases"

case ${_UNAME_R} in
*-CURRENT|*-STABLE|*-PRERELEASE)
RELDIR="snapshots"
;;
*)
RELDIR="releases"
;;
esac

BSDINSTALL_DISTSITE="$MIRROR/pub/MidnightBSD/${RELDIR}/`uname -m`/`uname -p`/${_UNAME_R}"
BSDINSTALL_DISTSITE="$MIRROR/pub/MidnightBSD/${RELDIR}/`uname -p`/${_UNAME_R}"

case $MIRROR_BUTTON in
$DIALOG_CANCEL)
Expand Down

0 comments on commit 02531f4

Please sign in to comment.