← Back to branch summary

~serge-hallyn/ubuntu/natty/lxc/lxc-fix-3bugs

« back to all changes in this revision

Viewing changes to scripts/lxc-debian.in

  • Committer: Bazaar Package Importer
  • Author(s): Guido Trotter, Stéphane Graber, Guido Trotter
  • Date: 2010-01-10 10:40:21 UTC
  • mfrom: (1.1.2 upstream) (3.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20100110104021-z8rj5zw5mlvra08l
Tags: 0.6.4-1
[ Stéphane Graber ]
* Upgrade standards-version to 3.8.3
* Drop the copy of etc/* from rules as "etc" is no longer in the tarball

[ Guido Trotter ]
* New Upstream Version
* Update libcap2-dev dependency to libcap-dev
* Install upstream-built man pages via debian/lxc.manpages
* Drop unneeded docbook-utils build dependency

Show diffs side-by-side

added added

removed removed

Lines of Context:
scripts/lxc-debian.in
136
136
lxc.network.link = br0
137
137
lxc.network.name = eth0
138
138
lxc.network.mtu = $MTU
139
 
lxc.mount = $TMPMNTFILE
140
139
lxc.rootfs = $ROOTFS
141
140
lxc.cgroup.devices.deny = a
142
141
# /dev/null and zero
155
154
# rtc
156
155
lxc.cgroup.devices.allow = c 254:0 rwm
157
156
EOF
 
157
 
 
158
        if [ ! -z "$TMPMNTFILE" ]; then
 
159
                cat $TMPMNTFILE >> $CONFFILE
 
160
        fi
158
161
}
159
162
 
160
163
write_lxc_mounts() {
161
164
 
162
 
    TMPMNTFILE=$(mktemp lxc.XXXXXXXXXX)
163
 
 
164
165
    if [ ! -z "$MNTFILE" ]; then
165
 
        cp $MNTFILE $TMPMNTFILE
 
166
        TMPMNTFILE=$(mktemp lxc.$NAME.XXXXXXXXXX)
 
167
        sed -e 's/^\(.*\)/lxc.mount.entry=&/' $MNTFILE >$TMPMNTFILE
166
168
    fi
167
169
}
168
170