Skip to content

Commit

Permalink
Minor install page fixes (#1048)
Browse files Browse the repository at this point in the history
* Update content perf metadata field

* WSL-installation doc: corrected position of note (#1043)

Corrected note about conversion-time of WSL-upgrade, which was placed in the wrong section.

Solves #1042

* Fix wsl 2 update step title

Co-authored-by: Elmar Jansen <elmar@elmarjansen.nl>
  • Loading branch information
mattwojo and ElmarJ committed Jan 6, 2021
1 parent c92245a commit f5b1463
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 15 deletions.
4 changes: 2 additions & 2 deletions WSL/compare-versions.md
Expand Up @@ -60,8 +60,8 @@ WSL 2 is only available in Windows 10, Version 1903, Build 18362 or higher. Chec

WSL 2 is a major overhaul of the underlying architecture and uses virtualization technology and a Linux kernel to enable new features. The primary goals of this update are to increase file system performance and add full system call compatibility.

- [WSL 2 system requirements](./install-win10.md#step-2---update-to-wsl-2)
- [Update from WSL 1 to WSL 2](./install-win10.md#step-2---update-to-wsl-2)
- [WSL 2 system requirements](./install-win10.md#step-2--check-requirements-for-running-wsl-2)
- [Update from WSL 1 to WSL 2](./install-win10.md#set-your-distribution-version-to-wsl-1-or-wsl-2)
- [Frequently Asked Questions about WSL 2](./wsl2-faq.md)

### WSL 2 architecture
Expand Down
3 changes: 2 additions & 1 deletion WSL/index.md
Expand Up @@ -24,7 +24,8 @@ The Windows Subsystem for Linux lets developers run a GNU/Linux environment -- i
## Get started

* [Install WSL1](install-win10.md)
* [Update to WSL2](install-win10.md#step-2---update-to-wsl-2)
* [Check requirements for WSL2](./install-win10.md#step-2--check-requirements-for-running-wsl-2)
* [Update from WSL 1 to WSL 2](./install-win10.md#set-your-distribution-version-to-wsl-1-or-wsl-2)
* [Install Linux on Windows Server](install-on-server.md)
* [Create a user account and password for your new Linux distribution](user-support.md)

Expand Down
7 changes: 5 additions & 2 deletions WSL/install-manual.md
Expand Up @@ -15,7 +15,7 @@ In these cases, while WSL itself is available, how do you download and install L

> Note: **Command-line shell environments including Cmd, PowerShell, and Linux/WSL distros are not permitted to run on Windows 10 S Mode**. This restriction exists in order to ensure the integrity and safety goals that S Mode delivers: Read [this post](https://blogs.msdn.microsoft.com/commandline/2017/05/18/will-linux-distros-run-on-windows-10-s/) for more information.
## Downloading distros
## Downloading distributions

If the Microsoft Store app is not available, you can download and manually install Linux distros by clicking these links:
* [Ubuntu 20.04](https://aka.ms/wslubuntu2004)
Expand All @@ -32,9 +32,11 @@ If the Microsoft Store app is not available, you can download and manually insta
This will cause the `<distro>.appx` packages to download to a folder of your choosing. Follow the [installation instructions](#installing-your-distro) to install your downloaded distro(s).

## Downloading distros via the command line

If you prefer, you can also download your preferred distro(s) via the command line:

### Download using PowerShell

To download distros using PowerShell, use the [Invoke-WebRequest](/powershell/module/microsoft.powershell.utility/invoke-webrequest) cmdlet. Here's a sample instruction to download Ubuntu 16.04.

```powershell
Expand All @@ -56,11 +58,12 @@ In the above example, `curl.exe` is executed (not just `curl`) to ensure that, i
> Note: Using `curl` might be preferable if you have to invoke/script download steps using Cmd shell and/or `.bat` / `.cmd` scripts.
## Installing your distro

If you're using Windows 10 you can install your distro with PowerShell. Simply navigate to folder containing the distro downloaded from above, and in that directory run the following command where `app_name` is the name of your distro .appx file.
```Powershell
Add-AppxPackage .\app_name.appx
```

If you are using Windows server you can find the install instructions on the [Windows Server](install-on-server.md) documentation page.

Once your distribution is installed, follow the normal instructions to [update to WSL 2](./install-win10.md#step-2---update-to-wsl-2) or [create a new user account and password](./user-support.md).
Once your distribution is installed, follow the normal instructions to * [Update from WSL 1 to WSL 2](./install-win10.md#set-your-distribution-version-to-wsl-1-or-wsl-2) or [create a new user account and password](./user-support.md).
18 changes: 8 additions & 10 deletions WSL/install-win10.md
Expand Up @@ -67,12 +67,10 @@ dism.exe /online /enable-feature /featurename:Microsoft-Windows-Subsystem-Linux

We recommend now moving on to step #2, updating to WSL 2, but if you wish to only install WSL 1, you can now **restart** your machine and move on to [Step 6 - Install your Linux distribution of choice](./install-win10.md#step-6---install-your-linux-distribution-of-choice). To update to WSL 2, **wait to restart** your machine and move on to the next step.

## Step 2 - Update to WSL 2
## Step 2 - Check requirements for running WSL 2

To update to WSL 2, you must be running Windows 10.

### Requirements

- For x64 systems: **Version 1903** or higher, with **Build 18362** or higher.
- For ARM64 systems: **Version 2004** or higher, with **Build 19041** or higher.
- Builds lower than 18362 do not support WSL 2. Use the [Windows Update Assistant](https://www.microsoft.com/software-download/windows10) to update your version of Windows.
Expand Down Expand Up @@ -117,13 +115,6 @@ Open PowerShell and run this command to set WSL 2 as the default version when in
wsl --set-default-version 2
```

> [!NOTE]
> The update from WSL 1 to WSL 2 may take several minutes to complete depending on the size of your targeted distribution. If you are running an older (legacy) installation of WSL 1 from Windows 10 Anniversary Update or Creators Update, you may encounter an update error. Follow these instructions to [uninstall and remove any legacy distributions](./install-legacy.md#uninstallingremoving-the-legacy-distro).
>
> If `wsl --set-default-version` results as an invalid command, enter `wsl --help`. If the `--set-default-version` is not listed, it means that your OS doesn't support it and you need to update to version 1903, Build 18362 or higher.
>
> If you see this message after running the command: `WSL 2 requires an update to its kernel component. For information please visit https://aka.ms/wsl2kernel`. You still need to install the MSI Linux kernel update package.
## Step 6 - Install your Linux distribution of choice

1. Open the [Microsoft Store](https://aka.ms/wslstore) and select your favorite Linux distribution.
Expand Down Expand Up @@ -181,6 +172,13 @@ wsl --set-version <distribution name> <versionNumber>

Make sure to replace `<distribution name>` with the actual name of your distribution and `<versionNumber>` with the number '1' or '2'. You can change back to WSL 1 at anytime by running the same command as above but replacing the '2' with a '1'.

> [!NOTE]
> The update from WSL 1 to WSL 2 may take several minutes to complete depending on the size of your targeted distribution. If you are running an older (legacy) installation of WSL 1 from Windows 10 Anniversary Update or Creators Update, you may encounter an update error. Follow these instructions to [uninstall and remove any legacy distributions](./install-legacy.md#uninstallingremoving-the-legacy-distro).
>
> If `wsl --set-default-version` results as an invalid command, enter `wsl --help`. If the `--set-default-version` is not listed, it means that your OS doesn't support it and you need to update to version 1903, Build 18362 or higher.
>
> If you see this message after running the command: `WSL 2 requires an update to its kernel component. For information please visit https://aka.ms/wsl2kernel`. You still need to install the MSI Linux kernel update package.
Additionally, if you want to make WSL 2 your default architecture you can do so with this command:

```powershell
Expand Down

0 comments on commit f5b1463

Please sign in to comment.