Commit 1222b5a9 authored by Steve Langasek's avatar Steve Langasek
Browse files

Merge fix for bug #1075717

parents 1970ee87 b995d11d
......@@ -7,6 +7,8 @@ description "Populate /dev filesystem"
start on mounted MOUNTPOINT=/dev
env MOUNTPOINT=/dev
env container
env LIBVIRT_LXC_UUID
task
......@@ -18,6 +20,10 @@ script
if [ "${TYPE}" != "devtmpfs" ]
then
cd "${MOUNTPOINT}"
/sbin/MAKEDEV std console fd ppp tun
/sbin/MAKEDEV std fd ppp tun
# lxc and libvirt containers have set up their own console and ttys
if [ -z "$container" -a -z "$LIBVIRT_LXC_UUID" ]; then
/sbin/MAKEDEV console
fi
fi
end script
mountall (2.45) UNRELEASED; urgency=low
* mounted-dev.conf: leave consoles alone in a lxc or libvirt container
(LP: #1075717)
-- Serge Hallyn <serge.hallyn@ubuntu.com> Wed, 28 Nov 2012 15:26:29 -0600
mountall (2.44) unstable; urgency=low
* conf/{checkfs,checkroot-bootclean,checkroot,mountall-bootclean}.sh.conf,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment