Merge pull request #3299 from stgraber/master

doc/lxc-user-nic.sgml.in

@@ -86,7 +86,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
       <filename>@LXC_USERNIC_DB@</filename>.  It ensures that the calling
       user is privileged over the network namespace to which the interface
       will be attached.
-      <command>lxc-user-nic</command> also allows to delete network devices.
+      <command>lxc-user-nic</command> also allows one to delete network devices.
       Currently only ovs ports can be deleted.
     </para>
 

templates/lxc-busybox.in

@@ -236,7 +236,7 @@ lxc.cap.drop = sys_module mac_admin mac_override sys_time
 #lxc.apparmor.profile = unconfined
 
 lxc.mount.auto = cgroup:mixed proc:mixed sys:mixed
-lxc.mount.entry = shm dev/shm tmpfs defaults 0 0
+lxc.mount.entry = shm dev/shm tmpfs defaults,create=dir 0 0
 EOF
 
   libdirs="\