From bf7d76cf3ae180820c0a29e0bfbaa97c20ce6a3d Mon Sep 17 00:00:00 2001
From: Serge Hallyn <serge.hallyn@ubuntu.com>
Date: Thu, 4 Oct 2012 13:54:00 -0500
Subject: [PATCH] templates: mount devtmpfs in ubuntu containers

That way /dev/disk/ exists, and update-grub can succeed.

Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/grub2/+bug/1060404
---
 templates/lxc-ubuntu-cloud.in | 4 ++++
 templates/lxc-ubuntu.in       | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/templates/lxc-ubuntu-cloud.in b/templates/lxc-ubuntu-cloud.in
index 349830999..26bc53a88 100644
--- a/templates/lxc-ubuntu-cloud.in
+++ b/templates/lxc-ubuntu-cloud.in
@@ -94,6 +94,10 @@ EOF
     cat <<EOF > $path/fstab
 proc            proc         proc    nodev,noexec,nosuid 0 0
 sysfs           sys          sysfs defaults  0 0
+EOF
+    if grep devtmpfs /proc/filesystems > /dev/null 2>&1; then
+cat <<EOF >> $path/fstab
+devtmpfs        dev          devtmpfs defaults 0 0
 EOF
 
     # rmdir /dev/shm for containers that have /run/shm
diff --git a/templates/lxc-ubuntu.in b/templates/lxc-ubuntu.in
index aca211843..af36ffaf1 100644
--- a/templates/lxc-ubuntu.in
+++ b/templates/lxc-ubuntu.in
@@ -352,6 +352,10 @@ EOF
     cat <<EOF > $path/fstab
 proc            proc         proc    nodev,noexec,nosuid 0 0
 sysfs           sys          sysfs defaults  0 0
+EOF
+    if grep devtmpfs /proc/filesystems > /dev/null 2>&1; then
+cat <<EOF >> $path/fstab
+devtmpfs        dev          devtmpfs defaults 0 0
 EOF
 
     if [ $? -ne 0 ]; then