revert devtmpfs in ubuntu templates

devtmpfs is shared between host and containers, and it messes up
lucid containers too.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>

diff --git a/templates/lxc-ubuntu-cloud.in b/templates/lxc-ubuntu-cloud.in
index 25d30817f4276d15c050af7f54e9b6fdb6ba45e5..34983099900680552c73f7fbf8c2b523ccd721df 100644 (file)
--- a/templates/lxc-ubuntu-cloud.in
+++ b/templates/lxc-ubuntu-cloud.in
@@ -95,11 +95,6 @@ EOF
 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
-    fi
 
     # rmdir /dev/shm for containers that have /run/shm
     # I'm afraid of doing rm -rf $rootfs/dev/shm, in case it did

diff --git a/templates/lxc-ubuntu.in b/templates/lxc-ubuntu.in
index 04813792a5aacc470a768bb1beba029f173d1ce6..aca211843a32c16c2794875b0c59ca14abb5eb53 100644 (file)
--- a/templates/lxc-ubuntu.in
+++ b/templates/lxc-ubuntu.in
@@ -353,11 +353,6 @@ EOF
 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
-    fi
 
     if [ $? -ne 0 ]; then
         echo "Failed to add configuration"