From 3129d0737a60fb14ff3af7aa47ab467269baaa0d Mon Sep 17 00:00:00 2001
From: Misty Stanley-Jones <misty@apache.org>
Date: Mon, 9 Jan 2017 10:21:14 -0800
Subject: [PATCH 1/2] Add prereqs to AUFS configuration steps

Fixes #1061
---
 engine/userguide/storagedriver/aufs-driver.md | 63 ++++++++++++-------
 1 file changed, 39 insertions(+), 24 deletions(-)

diff --git a/engine/userguide/storagedriver/aufs-driver.md b/engine/userguide/storagedriver/aufs-driver.md
index 96979ad829..8d6212c19e 100644
--- a/engine/userguide/storagedriver/aufs-driver.md
+++ b/engine/userguide/storagedriver/aufs-driver.md
@@ -97,43 +97,58 @@ back to a "copy and unlink" strategy.
 
 ## Configure Docker with AUFS
 
+### Prerequisites
+
 You can only use the AUFS storage driver on Linux systems with AUFS installed.
 Use the following command to determine if your system supports AUFS.
 
-    $ grep aufs /proc/filesystems
+```bash
+$ grep aufs /proc/filesystems
 
-    nodev   aufs
+nodev   aufs
+```
 
-This output indicates the system supports AUFS. Once you've verified your
-system supports AUFS, you can must instruct the Docker daemon to use it. You do
-this from the command line with the `dockerd` command:
+This output indicates the system supports AUFS. If you get no output, your system does
+not support AUFS. You can address this by upgrading your host system's kernel to 3.13
+or higher. It is recommended to intall the kernel headers when you upgrade.
 
-    $ sudo dockerd --storage-driver=aufs &
+### Configuration
 
+When you have verified that you meet the prerequisites, instruct the Docker daemon to use
+AUFS by starting the Docker daemon with the flag `--storage-driver=aufs`:
 
-Alternatively, you can edit the Docker config file and add the
+```bash
+$ sudo dockerd --storage-driver=aufs &
+```
+
+To make the change permanent, you can edit the Docker configuration file and add the
 `--storage-driver=aufs` option to the `DOCKER_OPTS` line.
 
-    # Use DOCKER_OPTS to modify the daemon startup options.
-    DOCKER_OPTS="--storage-driver=aufs"
+```none
+# Use DOCKER_OPTS to modify the daemon startup options.
+DOCKER_OPTS="--storage-driver=aufs"
+```
 
-Once your daemon is running, verify the storage driver with the `docker info`
-command.
+After the daemon starts, verify the default storage driver using the `docker info`
+command:
 
-    $ sudo docker info
+```bash
+$ sudo docker info
 
-    Containers: 1
-    Images: 4
-    Storage Driver: aufs
-     Root Dir: /var/lib/docker/aufs
-     Backing Filesystem: extfs
-     Dirs: 6
-     Dirperm1 Supported: false
-    Execution Driver: native-0.2
-    ...output truncated...
+Containers: 1
+Images: 4
+Storage Driver: aufs
+ Root Dir: /var/lib/docker/aufs
+ Backing Filesystem: extfs
+ Dirs: 6
+ Dirperm1 Supported: false
+Execution Driver: native-0.2
+...output truncated...
+```
 
-The output above shows that the Docker daemon is running the AUFS storage
-driver on top of an existing `ext4` backing filesystem.
+Look for the `Storage Driver` line. If its value is `aufs`, the Docker daemon is
+using the AUFS storage driver on top of the filesystem listed on the
+`Backing Filesystem` line.
 
 ## Local storage and AUFS
 
@@ -227,4 +242,4 @@ needs to detect its failure and fall back to a "copy and unlink" strategy.
 * [Understand images, containers, and storage drivers](imagesandcontainers.md)
 * [Select a storage driver](selectadriver.md)
 * [Btrfs storage driver in practice](btrfs-driver.md)
-* [Device Mapper storage driver in practice](device-mapper-driver.md)
\ No newline at end of file
+* [Device Mapper storage driver in practice](device-mapper-driver.md)

From a49449e1cf0b33750eaf2468566c48cd2999a97c Mon Sep 17 00:00:00 2001
From: Misty Stanley-Jones <misty@apache.org>
Date: Mon, 9 Jan 2017 12:57:14 -0800
Subject: [PATCH 2/2] Add the info about the linux-image-extra packages

---
 engine/userguide/storagedriver/aufs-driver.md | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/engine/userguide/storagedriver/aufs-driver.md b/engine/userguide/storagedriver/aufs-driver.md
index 8d6212c19e..dd948afc77 100644
--- a/engine/userguide/storagedriver/aufs-driver.md
+++ b/engine/userguide/storagedriver/aufs-driver.md
@@ -109,8 +109,18 @@ nodev   aufs
 ```
 
 This output indicates the system supports AUFS. If you get no output, your system does
-not support AUFS. You can address this by upgrading your host system's kernel to 3.13
-or higher. It is recommended to intall the kernel headers when you upgrade.
+not support AUFS. To address this:
+
+- Upgrade your host system's kernel to 3.13 or higher. It is recommended to intall the
+  kernel headers when you upgrade.
+
+- **Ubuntu or Debian**: In addition to updating the kernel if necessary, install the
+  `linux-image-extra-*` packages:
+  
+  ```bash
+  $ sudo apt-get install linux-image-extra-$(uname -r) \
+                         linux-image-extra-virtual
+  ```
 
 ### Configuration