Ubuntu
mountall package

Merge lp:~serge-hallyn/ubuntu/raring/mountall/mountall-lxc into lp:ubuntu/raring/mountall

  1. Raring (13.04)
  2. mountall-lxc
  3. Merge into raring
Proposed by Serge Hallyn
Status: Merged
Merged at revision: 426
Proposed branch: lp:~serge-hallyn/ubuntu/raring/mountall/mountall-lxc
Merge into: lp:ubuntu/raring/mountall
Diff against target: 39 lines (+14/-1)
2 files modified
conf/mounted-dev.conf (+7/-1)
debian/changelog (+7/-0)
To merge this branch: bzr merge lp:~serge-hallyn/ubuntu/raring/mountall/mountall-lxc
Reviewer Review Type Date Requested Status
Steve Langasek Pending
Review via email: mp+136799@code.launchpad.net
To post a comment you must log in.
lp:~serge-hallyn/ubuntu/raring/mountall/mountall-lxc updated
427. By Serge Hallyn

mounted-dev: declare 'env LIBVIRT_LXC_UUID' since we check for it

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'conf/mounted-dev.conf'
2--- conf/mounted-dev.conf 2011-07-14 07:07:05 +0000
3+++ conf/mounted-dev.conf 2012-11-28 22:17:21 +0000
4@@ -7,6 +7,8 @@
5
6 start on mounted MOUNTPOINT=/dev
7 env MOUNTPOINT=/dev
8+env container
9+env LIBVIRT_LXC_UUID
10
11 task
12
13@@ -18,6 +20,10 @@
14 if [ "${TYPE}" != "devtmpfs" ]
15 then
16 cd "${MOUNTPOINT}"
17- /sbin/MAKEDEV std console fd ppp tun
18+ /sbin/MAKEDEV std fd ppp tun
19+ # lxc and libvirt containers have set up their own console and ttys
20+ if [ -z "$container" -a -z "$LIBVIRT_LXC_UUID" ]; then
21+ /sbin/MAKEDEV console
22+ fi
23 fi
24 end script
25
26=== modified file 'debian/changelog'
27--- debian/changelog 2012-11-16 01:34:05 +0000
28+++ debian/changelog 2012-11-28 22:17:21 +0000
29@@ -1,3 +1,10 @@
30+mountall (2.44ubuntu1) raring; urgency=low
31+
32+ * mounted-dev.conf: leave consoles alone in a lxc or libvirt container
33+ (LP: #1075717)
34+
35+ -- Serge Hallyn <serge.hallyn@ubuntu.com> Wed, 28 Nov 2012 15:26:29 -0600
36+
37 mountall (2.44) unstable; urgency=low
38
39 * conf/{checkfs,checkroot-bootclean,checkroot,mountall-bootclean}.sh.conf,

Subscribers

People subscribed via source and target branches

to all changes: