Skip to content

Commit 7f4b5c9

Browse files
committed
merge m-series docs with rest of installation
1 parent e593388 commit 7f4b5c9

File tree

2 files changed

+11
-188
lines changed

2 files changed

+11
-188
lines changed

_docs/developer/getting_started/vm_install_using_vagrant.md

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ If you using an Intel-based Mac, you will follow the instructions below._
124124

125125
* [Ruby](https://www.ruby-lang.org/en/downloads)
126126
* [Git](https://git-scm.com/downloads)
127-
* [VirtualBox](https://www.virtualbox.org/wiki/Download_Old_Builds_6_1)
127+
* [VirtualBox](https://www.virtualbox.org/wiki/Download_Old_Builds_6_1) (or [QEMU](https://www.qemu.org) instead for M-series macOS)
128128
* [Vagrant](https://www.vagrantup.com)
129129

130130

@@ -133,9 +133,9 @@ If you using an Intel-based Mac, you will follow the instructions below._
133133
install [Homebrew](http://brew.sh/), if you don't have it, and then run:
134134

135135
```
136-
brew install --cask virtualbox
137136
brew install --cask vagrant
138-
vagrant plugin install vagrant-timezone
137+
brew install --cask virtualbox # if on Intel chip
138+
brew install qemu && vagrant plugin install vagrant-qemu # if on M-series chip
139139
```
140140
141141
* **Windows**
@@ -234,7 +234,7 @@ If you using an Intel-based Mac, you will follow the instructions below._
234234
If you have an AMD processor you can choose to download a pre-made
235235
VM that is created weekly OR you can create the VM from scratch
236236
(which will take substantially more time). If you have an ARM chip
237-
(e.g., the Apple Silicon Mac M1/M2/M3), you must create the VM from
237+
(such as Apple M-series), you must create the VM from
238238
scratch.
239239
240240
@@ -248,9 +248,15 @@ If you using an Intel-based Mac, you will follow the instructions below._
248248
use a pre-packaged Submitty VM. This will have all of Submitty
249249
already setup. Vagrant will build your VM for you.
250250
251+
To create the virtual machine, run:
251252
```
252-
vagrant up
253+
vagrant up --provider=virtualbox
253254
```
255+
Replace `virtualbox` with `qemu` if on M-series macOS.
256+
257+
***Note:** The vagrant up command provisions the virtual machine on the first run.
258+
For subsequent runs, you do not need to append the `--provider` flag as the VM is
259+
already created.*
254260
255261
If you wish to use a specific version of the pre-packaged Submitty VM, on Linux or Mac type:
256262
```

_docs/developer/getting_started/vm_install_using_vagrant_apple_silicon.md

Lines changed: 0 additions & 183 deletions
This file was deleted.

0 commit comments

Comments
 (0)