Ubuntu
lxc package

Merge lp:~ubuntu-branches/ubuntu/precise/lxc/precise-201110260744 into lp:ubuntu/precise/lxc

  1. Precise (12.04)
  2. precise-201110260744
  3. Merge into precise
Proposed by Ubuntu Package Importer
Status: Rejected
Rejected by: James Westby
Proposed branch: lp:~ubuntu-branches/ubuntu/precise/lxc/precise-201110260744
Merge into: lp:ubuntu/precise/lxc
Diff against target: 949 lines (+826/-0) (has conflicts)
21 files modified
debian/local/lxc (+46/-0)
debian/local/lxc-backup (+49/-0)
debian/local/lxc-list (+32/-0)
debian/local/lxc-restore (+51/-0)
debian/lxc-dev.install (+3/-0)
debian/patches/01-lxc-libdir.patch (+68/-0)
debian/patches/02-lxc-distclean.patch (+25/-0)
debian/patches/03-lxc-configuration-path.patch (+18/-0)
debian/patches/04-debian-module-init-tools.patch (+14/-0)
debian/patches/05-debian-architecture.patch (+29/-0)
debian/patches/06-debian-ppc-architecture.patch (+23/-0)
debian/patches/07-debian-umount.patch (+15/-0)
debian/patches/08-debian-locales.patch (+28/-0)
debian/patches/09-debian-runlevel.patch (+15/-0)
debian/patches/10-debian-update-rcd.patch (+40/-0)
debian/patches/11-doc-ip-address.patch (+173/-0)
debian/patches/12-debian-config.patch (+88/-0)
debian/patches/13-lxc-create.patch (+17/-0)
debian/po/POTFILES.in (+1/-0)
debian/po/de.po (+46/-0)
debian/po/templates.pot (+45/-0)
Path conflict: <deleted> / debian/local/lxc-is-container
Path conflict: <deleted> / debian/local/lxc-start-ephemeral
Conflict adding file debian/local.  Moved existing file to debian/local.moved.
Conflict adding file debian/lxc-dev.install.  Moved existing file to debian/lxc-dev.install.moved.
Conflict adding file debian/patches/01-lxc-libdir.patch.  Moved existing file to debian/patches/01-lxc-libdir.patch.moved.
Conflict adding file debian/patches/02-lxc-distclean.patch.  Moved existing file to debian/patches/02-lxc-distclean.patch.moved.
Conflict adding file debian/patches/03-lxc-configuration-path.patch.  Moved existing file to debian/patches/03-lxc-configuration-path.patch.moved.
Conflict adding file debian/patches/04-debian-module-init-tools.patch.  Moved existing file to debian/patches/04-debian-module-init-tools.patch.moved.
Conflict adding file debian/patches/05-debian-architecture.patch.  Moved existing file to debian/patches/05-debian-architecture.patch.moved.
Conflict adding file debian/patches/06-debian-ppc-architecture.patch.  Moved existing file to debian/patches/06-debian-ppc-architecture.patch.moved.
Conflict adding file debian/patches/07-debian-umount.patch.  Moved existing file to debian/patches/07-debian-umount.patch.moved.
Conflict adding file debian/patches/08-debian-locales.patch.  Moved existing file to debian/patches/08-debian-locales.patch.moved.
Conflict adding file debian/patches/09-debian-runlevel.patch.  Moved existing file to debian/patches/09-debian-runlevel.patch.moved.
Conflict adding file debian/patches/10-debian-update-rcd.patch.  Moved existing file to debian/patches/10-debian-update-rcd.patch.moved.
Conflict adding file debian/patches/11-doc-ip-address.patch.  Moved existing file to debian/patches/11-doc-ip-address.patch.moved.
Conflict adding file debian/patches/12-debian-config.patch.  Moved existing file to debian/patches/12-debian-config.patch.moved.
Conflict adding file debian/patches/13-lxc-create.patch.  Moved existing file to debian/patches/13-lxc-create.patch.moved.
Conflict adding file debian/po.  Moved existing file to debian/po.moved.
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/precise/lxc/precise-201110260744
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+80429@code.launchpad.net

Description of the change

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/precise/lxc reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/precise/lxc/precise-201110260744. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

To post a comment you must log in.

Unmerged revisions

40. By Stéphane Graber

releasing version 0.7.5-3ubuntu1

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'debian/local'
2=== renamed directory 'debian/local' => 'debian/local.moved'
3=== added file 'debian/local/lxc'
4--- debian/local/lxc 1970-01-01 00:00:00 +0000
5+++ debian/local/lxc 2011-10-26 07:50:28 +0000
6@@ -0,0 +1,46 @@
7+#!/bin/sh
8+
9+set -e
10+
11+_COMMAND="${1}"
12+
13+if [ -n "${_COMMAND}" ]
14+then
15+ shift
16+else
17+ echo "Usage: ${0} COMMAND CONTAINER"
18+ exit 1
19+fi
20+
21+if [ ! -x "$(which lxc-${_COMMAND} 2>/dev/null)" ]
22+then
23+ echo "E: lxc-${_COMMAND} - no such command"
24+ exit 1
25+fi
26+
27+_CONTAINER="${1}"
28+
29+if [ -n "${_CONTAINER}" ]
30+then
31+ shift
32+
33+ if ! lxc-ls | grep -qs ^${_CONTAINER}$
34+ then
35+ echo "E: ${_CONTAINER} - no such container"
36+ exit 1
37+ fi
38+
39+ _OPTIONS="--name ${_CONTAINER}"
40+else
41+ case "${_COMMAND}" in
42+ backup|list|restore)
43+ ;;
44+
45+ *)
46+ echo "Usage: ${0} COMMAND CONTAINER"
47+ exit 1
48+ ;;
49+ esac
50+fi
51+
52+lxc-${_COMMAND} ${_OPTIONS} ${@}
53
54=== added file 'debian/local/lxc-backup'
55--- debian/local/lxc-backup 1970-01-01 00:00:00 +0000
56+++ debian/local/lxc-backup 2011-10-26 07:50:28 +0000
57@@ -0,0 +1,49 @@
58+#!/bin/sh
59+
60+set -e
61+
62+_CONTAINER="${1}"
63+
64+if [ -n "${_CONTAINER}" ]
65+then
66+ shift
67+else
68+ echo "Usage: ${0} CONTAINER [BACKUP_NUMBER]"
69+ exit 1
70+fi
71+
72+if [ ! -x "$(which rsync 2>/dev/null)" ]
73+then
74+ echo "E: rsync - no such file"
75+ exit 1
76+fi
77+
78+if [ ! -x "$(which lxc-info 2>/dev/null)" ]
79+then
80+ echo "E: lxc-info - no such file"
81+ exit 1
82+fi
83+
84+if ! lxc-info -n ${_CONTAINER} 2>&1 | grep -qs "STOPPED"
85+then
86+ echo "E: ${_CONTAINER} - not stopped"
87+ exit 1
88+fi
89+
90+# FIXME: Assumption of /var/lib/lxc
91+if [ -e /var/lib/lxc/${_CONTAINER}/rootfs ]
92+then
93+ if [ -n "${2}" ]
94+ then
95+ _BACKUP="${2}"
96+ else
97+ _BACKUP="1"
98+
99+ while [ -e "/var/lib/lxc/${_CONTAINER}/rootfs.backup${_BACKUP}" ]
100+ do
101+ _BACKUP="$((${_BACKUP} + 1))"
102+ done
103+ fi
104+
105+ rsync -aPHv --delete --progress /var/lib/lxc/${_CONTAINER}/rootfs/ /var/lib/lxc/${_CONTAINER}/rootfs.backup${_BACKUP}
106+fi
107
108=== added file 'debian/local/lxc-list'
109--- debian/local/lxc-list 1970-01-01 00:00:00 +0000
110+++ debian/local/lxc-list 2011-10-26 07:50:28 +0000
111@@ -0,0 +1,32 @@
112+#!/bin/sh
113+
114+set -e
115+
116+if [ ! -x "$(which lxc-info 2>/dev/null)" ]
117+then
118+ echo "E: lxc-info - no such file"
119+ exit 1
120+fi
121+
122+for _STATUS in RUNNING STOPPED
123+do
124+ echo ${_STATUS}
125+
126+ for _CONTAINER in $(lxc-ls | sort -u)
127+ do
128+ if lxc-info -n ${_CONTAINER} 2>&1 | grep -qs "${_STATUS}"
129+ then
130+ echo -n " ${_CONTAINER}"
131+
132+ if [ -e /etc/lxc/auto/${_CONTAINER} ] ||
133+ [ -e /etc/lxc/auto/${_CONTAINER}.conf ]
134+ then
135+ echo " (auto)"
136+ else
137+ echo
138+ fi
139+ fi
140+ done
141+
142+ echo
143+done
144
145=== added file 'debian/local/lxc-restore'
146--- debian/local/lxc-restore 1970-01-01 00:00:00 +0000
147+++ debian/local/lxc-restore 2011-10-26 07:50:28 +0000
148@@ -0,0 +1,51 @@
149+#!/bin/sh
150+
151+set -e
152+
153+_CONTAINER="${1}"
154+
155+if [ -n "${_CONTAINER}" ]
156+then
157+ shift
158+else
159+ echo "Usage: ${0} CONTAINER [BACKUP_NUMBER]"
160+ exit 1
161+fi
162+
163+if [ ! -x "$(which rsync 2>/dev/null)" ]
164+then
165+ echo "E: rsync - no such file"
166+ exit 1
167+fi
168+
169+if [ ! -x "$(which lxc-info 2>/dev/null)" ]
170+then
171+ echo "E: lxc-info - no such file"
172+ exit 1
173+fi
174+
175+if ! lxc-info -n ${_CONTAINER} 2>&1 | grep -qs "STOPPED"
176+then
177+ echo "E: ${_CONTAINER} - not stopped"
178+ exit 1
179+fi
180+
181+# FIXME: Assumption of /var/lib/lxc
182+if ls /var/lib/lxc/${_CONTAINER}/rootfs.backup* > /dev/null 2>&1
183+then
184+ if [ -n "${2}" ]
185+ then
186+ _BACKUP="${2}"
187+ else
188+ _BACKUP="1"
189+
190+ while [ -e "/var/lib/lxc/${_CONTAINER}/rootfs.backup${_BACKUP}" ]
191+ do
192+ _BACKUP="$((${_BACKUP} + 1))"
193+ done
194+
195+ _BACKUP="$((${_BACKUP} - 1))"
196+ fi
197+
198+ rsync -aPHv --delete --progress /var/lib/lxc/${_CONTAINER}/rootfs.backup${_BACKUP}/ /var/lib/lxc/${_CONTAINER}/rootfs
199+fi
200
201=== added file 'debian/lxc-dev.install'
202--- debian/lxc-dev.install 1970-01-01 00:00:00 +0000
203+++ debian/lxc-dev.install 2011-10-26 07:50:28 +0000
204@@ -0,0 +1,3 @@
205+usr/include
206+usr/lib/lxc/*.so
207+usr/share/pkgconfig
208
209=== renamed file 'debian/lxc-dev.install' => 'debian/lxc-dev.install.moved'
210=== added file 'debian/patches/01-lxc-libdir.patch'
211--- debian/patches/01-lxc-libdir.patch 1970-01-01 00:00:00 +0000
212+++ debian/patches/01-lxc-libdir.patch 2011-10-26 07:50:28 +0000
213@@ -0,0 +1,68 @@
214+Author: Guido Trotter <ultrotter@debian.org>
215+Description: Fix too deep lib dir.
216+
217+diff -Naurp lxc.orig/configure lxc/configure
218+--- lxc.orig/configure 2011-07-12 16:20:56.361291375 +0200
219++++ lxc/configure 2011-07-12 16:52:45.382757699 +0200
220+@@ -4719,7 +4719,7 @@ fi
221+
222+
223+ EXP_VAR=LXCINITDIR
224+- FROM_VAR=$libdir/lxc
225++ FROM_VAR=$libdir
226+
227+ prefix_save=$prefix
228+ exec_prefix_save=$exec_prefix
229+@@ -4747,7 +4747,7 @@ fi
230+
231+
232+ EXP_VAR=LXCTEMPLATEDIR
233+- FROM_VAR=$libdir/lxc/templates
234++ FROM_VAR=$libdir/templates
235+
236+ prefix_save=$prefix
237+ exec_prefix_save=$exec_prefix
238+diff -Naurp lxc.orig/configure.ac lxc/configure.ac
239+--- lxc.orig/configure.ac 2011-07-12 16:20:56.361291375 +0200
240++++ lxc/configure.ac 2011-07-12 16:52:45.382757699 +0200
241+@@ -56,8 +56,8 @@ AS_AC_EXPAND(LXC_GENERATE_DATE, "$(date)
242+
243+ AS_AC_EXPAND(LXCPATH, "${with_config_path}")
244+ AS_AC_EXPAND(LXCROOTFSMOUNT, "${with_rootfs_path}")
245+-AS_AC_EXPAND(LXCINITDIR, $libdir/lxc)
246+-AS_AC_EXPAND(LXCTEMPLATEDIR, $libdir/lxc/templates)
247++AS_AC_EXPAND(LXCINITDIR, $libdir)
248++AS_AC_EXPAND(LXCTEMPLATEDIR, $libdir/templates)
249+ AH_TEMPLATE([LXCPATH], [lxc configuration repository])
250+ AH_TEMPLATE([LXCINITDIR], [lxc-init directory location])
251+ AH_TEMPLATE([LXCROOTFSMOUNT], [lxc default rootfs mount point])
252+diff -Naurp lxc.orig/src/lxc/Makefile.am lxc/src/lxc/Makefile.am
253+--- lxc.orig/src/lxc/Makefile.am 2011-07-12 16:20:56.365291402 +0200
254++++ lxc/src/lxc/Makefile.am 2011-07-12 16:52:45.382757699 +0200
255+@@ -14,6 +14,7 @@ pkginclude_HEADERS = \
256+ state.h
257+
258+ sodir=$(libdir)
259++pkglibdir = $(libdir)
260+ # use PROGRAMS to avoid complains from automake
261+ so_PROGRAMS = liblxc.so
262+
263+diff -Naurp lxc.orig/src/lxc/Makefile.in lxc/src/lxc/Makefile.in
264+--- lxc.orig/src/lxc/Makefile.in 2011-07-12 16:20:56.365291402 +0200
265++++ lxc/src/lxc/Makefile.in 2011-07-12 16:52:45.382757699 +0200
266+@@ -20,7 +20,6 @@
267+ VPATH = @srcdir@
268+ pkgdatadir = $(datadir)/@PACKAGE@
269+ pkgincludedir = $(includedir)/@PACKAGE@
270+-pkglibdir = $(libdir)/@PACKAGE@
271+ pkglibexecdir = $(libexecdir)/@PACKAGE@
272+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
273+ install_sh_DATA = $(install_sh) -c -m 644
274+@@ -198,6 +197,7 @@ HEADERS = $(pkginclude_HEADERS)
275+ ETAGS = etags
276+ CTAGS = ctags
277+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
278++pkglibdir = $(libdir)
279+ ACLOCAL = @ACLOCAL@
280+ AMTAR = @AMTAR@
281+ AUTOCONF = @AUTOCONF@
282
283=== renamed file 'debian/patches/01-lxc-libdir.patch' => 'debian/patches/01-lxc-libdir.patch.moved'
284=== added file 'debian/patches/02-lxc-distclean.patch'
285--- debian/patches/02-lxc-distclean.patch 1970-01-01 00:00:00 +0000
286+++ debian/patches/02-lxc-distclean.patch 2011-10-26 07:50:28 +0000
287@@ -0,0 +1,25 @@
288+Author: Daniel Baumann <daniel.baumann@progress-technologies.net>
289+Description:
290+ Temporarily renaming distclean target until fixed upstream,
291+ it removes too many files and causes FTBFS when build twice
292+ in a row (Closes: #615485).
293+
294+diff -Naurp lxc.orig/config/Makefile.am lxc/config/Makefile.am
295+--- lxc.orig/config/Makefile.am 2011-07-12 17:57:02.445883846 +0200
296++++ lxc/config/Makefile.am 2011-07-12 17:56:17.257659771 +0200
297+@@ -1,2 +1,2 @@
298+-distclean:
299++maintainerclean:
300+ @$(RM) -f compile config.guess config.sub depcomp install-sh ltmain.sh missing Makefile.in Makefile
301+diff -Naurp lxc.orig/config/Makefile.in lxc/config/Makefile.in
302+--- lxc.orig/config/Makefile.in 2011-07-12 17:57:02.445883846 +0200
303++++ lxc/config/Makefile.in 2011-07-12 17:56:48.241813412 +0200
304+@@ -335,7 +335,7 @@ uninstall-am:
305+ maintainer-clean maintainer-clean-generic mostlyclean \
306+ mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
307+
308+-distclean:
309++maintainerclean:
310+ @$(RM) -f compile config.guess config.sub depcomp install-sh ltmain.sh missing Makefile.in Makefile
311+
312+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
313
314=== renamed file 'debian/patches/02-lxc-distclean.patch' => 'debian/patches/02-lxc-distclean.patch.moved'
315=== added file 'debian/patches/03-lxc-configuration-path.patch'
316--- debian/patches/03-lxc-configuration-path.patch 1970-01-01 00:00:00 +0000
317+++ debian/patches/03-lxc-configuration-path.patch 2011-10-26 07:50:28 +0000
318@@ -0,0 +1,18 @@
319+Author: Daniel Baumann <daniel.baumann@progress-technologies.net>
320+Description: Removing double check for configuration path in lxc-create (Closes: #633996).
321+
322+diff -Naurp lxc.orig/src/lxc/lxc-create.in lxc/src/lxc/lxc-create.in
323+--- lxc.orig/src/lxc/lxc-create.in 2011-07-15 21:02:53.537046871 +0200
324++++ lxc/src/lxc/lxc-create.in 2011-07-15 21:03:47.241046873 +0200
325+@@ -102,11 +102,6 @@ if [ "$(id -u)" != "0" ]; then
326+ exit 1
327+ fi
328+
329+-if [ ! -r $lxc_path ]; then
330+- echo "no configuration path defined !"
331+- exit 1
332+-fi
333+-
334+ if [ -d "$lxc_path/$lxc_name" ]; then
335+ echo "'$lxc_name' already exists"
336+ exit 1
337
338=== renamed file 'debian/patches/03-lxc-configuration-path.patch' => 'debian/patches/03-lxc-configuration-path.patch.moved'
339=== added file 'debian/patches/04-debian-module-init-tools.patch'
340--- debian/patches/04-debian-module-init-tools.patch 1970-01-01 00:00:00 +0000
341+++ debian/patches/04-debian-module-init-tools.patch 2011-10-26 07:50:28 +0000
342@@ -0,0 +1,14 @@
343+Author: Daniel Baumann <daniel.baumann@progress-technologies.net>
344+Description: Also disable module-init-tools initscript in containers.
345+
346+diff -Naurp lxc.orig/templates/lxc-debian.in lxc/templates/lxc-debian.in
347+--- lxc.orig/templates/lxc-debian.in 2011-07-12 21:16:56.120636058 +0200
348++++ lxc/templates/lxc-debian.in 2011-07-12 21:28:23.596636003 +0200
349+@@ -88,6 +88,7 @@ EOF
350+ chroot $rootfs /usr/sbin/update-rc.d -f umountfs remove
351+ chroot $rootfs /usr/sbin/update-rc.d -f hwclock.sh remove
352+ chroot $rootfs /usr/sbin/update-rc.d -f hwclockfirst.sh remove
353++ chroot $rootfs /usr/sbin/update-rc.d -f module-init-tools remove
354+
355+ echo "root:root" | chroot $rootfs chpasswd
356+ echo "Root password is 'root', please change !"
357
358=== renamed file 'debian/patches/04-debian-module-init-tools.patch' => 'debian/patches/04-debian-module-init-tools.patch.moved'
359=== added file 'debian/patches/05-debian-architecture.patch'
360--- debian/patches/05-debian-architecture.patch 1970-01-01 00:00:00 +0000
361+++ debian/patches/05-debian-architecture.patch 2011-10-26 07:50:28 +0000
362@@ -0,0 +1,29 @@
363+Author: Daniel Baumann <daniel.baumann@progress-technologies.net>
364+Description:
365+ Don't use dpkg --print-architecture unconditionally to allow bootstrapping
366+ Debian containers on non-Debian systems.
367+
368+diff -Naurp lxc.orig/templates/lxc-debian.in lxc/templates/lxc-debian.in
369+--- lxc.orig/templates/lxc-debian.in 2011-08-22 11:12:36.261413046 +0200
370++++ lxc/templates/lxc-debian.in 2011-08-22 11:12:20.085332842 +0200
371+@@ -158,7 +158,19 @@ install_debian()
372+ return 1
373+ fi
374+
375+- arch=$(dpkg --print-architecture)
376++ # Code taken from debootstrap
377++ if [ -x /usr/bin/dpkg ] && /usr/bin/dpkg --print-architecture >/dev/null 2>&1; then
378++ arch=`/usr/bin/dpkg --print-architecture`
379++ elif type udpkg >/dev/null 2>&1 && udpkg --print-architecture >/dev/null 2>&1; then
380++ arch=`/usr/bin/udpkg --print-architecture`
381++ else
382++ arch=$(arch)
383++ if [ "$arch" = "i686" ]; then
384++ arch="i386"
385++ elif [ "$arch" = "x86_64" ]; then
386++ arch="amd64"
387++ fi
388++ fi
389+
390+ echo "Checking cache download in $cache/rootfs-$SUITE-$arch ... "
391+ if [ ! -e "$cache/rootfs-$SUITE-$arch" ]; then
392
393=== renamed file 'debian/patches/05-debian-architecture.patch' => 'debian/patches/05-debian-architecture.patch.moved'
394=== added file 'debian/patches/06-debian-ppc-architecture.patch'
395--- debian/patches/06-debian-ppc-architecture.patch 1970-01-01 00:00:00 +0000
396+++ debian/patches/06-debian-ppc-architecture.patch 2011-10-26 07:50:28 +0000
397@@ -0,0 +1,23 @@
398+Author: Daniel Baumann <daniel.baumann@progress-technologies.net>
399+Description: Extending architecture static fallback list for powerpc.
400+
401+diff -Naurp lxc.orig/templates/lxc-debian.in lxc/templates/lxc-debian.in
402+--- lxc.orig/templates/lxc-debian.in 2011-08-22 11:19:26.155445602 +0200
403++++ lxc/templates/lxc-debian.in 2011-08-22 11:20:46.107842061 +0200
404+@@ -166,11 +166,11 @@ install_debian()
405+ arch=`/usr/bin/udpkg --print-architecture`
406+ else
407+ arch=$(arch)
408+- if [ "$arch" = "i686" ]; then
409+- arch="i386"
410+- elif [ "$arch" = "x86_64" ]; then
411+- arch="amd64"
412+- fi
413++ case $arch in
414++ 686) arch="i386";;
415++ x86_64) arch="amd64";;
416++ ppc) arch="powerpc";;
417++ esac
418+ fi
419+
420+ echo "Checking cache download in $cache/rootfs-$SUITE-$arch ... "
421
422=== renamed file 'debian/patches/06-debian-ppc-architecture.patch' => 'debian/patches/06-debian-ppc-architecture.patch.moved'
423=== added file 'debian/patches/07-debian-umount.patch'
424--- debian/patches/07-debian-umount.patch 1970-01-01 00:00:00 +0000
425+++ debian/patches/07-debian-umount.patch 2011-10-26 07:50:28 +0000
426@@ -0,0 +1,15 @@
427+Author: Daniel Baumann <daniel.baumann@progress-technologies.net>
428+Description:
429+ Adding patch to disable unneeded umountroot initscript (Closes: #611972).
430+
431+diff -Naurp lxc.orig/templates/lxc-debian.in lxc/templates/lxc-debian.in
432+--- lxc.orig/templates/lxc-debian.in 2011-08-07 10:36:51.066968148 +0200
433++++ lxc/templates/lxc-debian.in 2011-08-07 10:36:36.226894562 +0200
434+@@ -86,6 +86,7 @@ EOF
435+ # remove pointless services in a container
436+ chroot $rootfs /usr/sbin/update-rc.d -f checkroot.sh remove
437+ chroot $rootfs /usr/sbin/update-rc.d -f umountfs remove
438++ chroot $rootfs /usr/sbin/update-rc.d -f umountroot remove
439+ chroot $rootfs /usr/sbin/update-rc.d -f hwclock.sh remove
440+ chroot $rootfs /usr/sbin/update-rc.d -f hwclockfirst.sh remove
441+ chroot $rootfs /usr/sbin/update-rc.d -f module-init-tools remove
442
443=== renamed file 'debian/patches/07-debian-umount.patch' => 'debian/patches/07-debian-umount.patch.moved'
444=== added file 'debian/patches/08-debian-locales.patch'
445--- debian/patches/08-debian-locales.patch 1970-01-01 00:00:00 +0000
446+++ debian/patches/08-debian-locales.patch 2011-10-26 07:50:28 +0000
447@@ -0,0 +1,28 @@
448+Author: Sylvain Ferriol <ferriol@gate.cnrs.fr>
449+Description: Correct locales generation in debian template (Closes: #607273).
450+
451+diff -Naurp lxc.orig/templates/lxc-debian.in lxc/templates/lxc-debian.in
452+--- lxc.orig/templates/lxc-debian.in 2011-08-07 10:43:26.172927376 +0200
453++++ lxc/templates/lxc-debian.in 2011-08-07 10:44:55.385369748 +0200
454+@@ -75,13 +75,14 @@ $hostname
455+ EOF
456+
457+ # reconfigure some services
458+- if [ -z "$LANG" ]; then
459+- chroot $rootfs locale-gen en_US.UTF-8 UTF-8
460+- chroot $rootfs update-locale LANG=en_US.UTF-8
461+- else
462+- chroot $rootfs locale-gen $LANG $(echo $LANG | cut -d. -f2)
463+- chroot $rootfs update-locale LANG=$LANG
464+- fi
465++ LANG="${LANG:-en_US.UTF-8}"
466++
467++ locale="$LANG $(echo $LANG | cut -d. -f2)"
468++ chroot $rootfs echo "locales locales/default_environment_locale select $LANG" | chroot $rootfs sh -c "LANG=C debconf-set-selections"
469++ chroot $rootfs echo "locales locales/default_environment_locale seen true" | chroot $rootfs sh -c "LANG=C debconf-set-selections"
470++ chroot $rootfs echo "locales locales/locales_to_be_generated seen true" | chroot $rootfs sh -c "LANG=C debconf-set-selections"
471++ chroot $rootfs sed -i -e "0,/^[# ]*$locale *$/ s/^[# ]*$locale *$/$locale/" /etc/locale.gen
472++ chroot $rootfs sh -c "LANG=C dpkg-reconfigure locales -f noninteractive"
473+
474+ # remove pointless services in a container
475+ chroot $rootfs /usr/sbin/update-rc.d -f checkroot.sh remove
476
477=== renamed file 'debian/patches/08-debian-locales.patch' => 'debian/patches/08-debian-locales.patch.moved'
478=== added file 'debian/patches/09-debian-runlevel.patch'
479--- debian/patches/09-debian-runlevel.patch 1970-01-01 00:00:00 +0000
480+++ debian/patches/09-debian-runlevel.patch 2011-10-26 07:50:28 +0000
481@@ -0,0 +1,15 @@
482+Author: Daniel Baumann <daniel.baumann@progress-technologies.net>
483+Description: Setting default runlevel to 2 instead of 3.
484+
485+diff -Naurp lxc.orig/templates/lxc-debian.in lxc/templates/lxc-debian.in
486+--- lxc.orig/templates/lxc-debian.in 2011-08-07 10:50:50.367130017 +0200
487++++ lxc/templates/lxc-debian.in 2011-08-07 10:50:23.130994958 +0200
488+@@ -38,7 +38,7 @@ configure_debian()
489+
490+ # configure the inittab
491+ cat <<EOF > $rootfs/etc/inittab
492+-id:3:initdefault:
493++id:2:initdefault:
494+ si::sysinit:/etc/init.d/rcS
495+ l0:0:wait:/etc/init.d/rc 0
496+ l1:1:wait:/etc/init.d/rc 1
497
498=== renamed file 'debian/patches/09-debian-runlevel.patch' => 'debian/patches/09-debian-runlevel.patch.moved'
499=== added file 'debian/patches/10-debian-update-rcd.patch'
500--- debian/patches/10-debian-update-rcd.patch 1970-01-01 00:00:00 +0000
501+++ debian/patches/10-debian-update-rcd.patch 2011-10-26 07:50:28 +0000
502@@ -0,0 +1,40 @@
503+Author: Daniel Baumann <daniel.baumann@progress-technologies.net>
504+Description:
505+ Disable services in debian template upgrade proof (Closes: #636851).
506+
507+diff -Naurp lxc.orig/templates/lxc-debian.in lxc/templates/lxc-debian.in
508+--- lxc.orig/templates/lxc-debian.in 2011-08-07 10:54:11.356126665 +0200
509++++ lxc/templates/lxc-debian.in 2011-08-07 11:09:54.924805575 +0200
510+@@ -85,12 +85,26 @@ EOF
511+ chroot $rootfs sh -c "LANG=C dpkg-reconfigure locales -f noninteractive"
512+
513+ # remove pointless services in a container
514+- chroot $rootfs /usr/sbin/update-rc.d -f checkroot.sh remove
515+- chroot $rootfs /usr/sbin/update-rc.d -f umountfs remove
516+- chroot $rootfs /usr/sbin/update-rc.d -f umountroot remove
517+- chroot $rootfs /usr/sbin/update-rc.d -f hwclock.sh remove
518+- chroot $rootfs /usr/sbin/update-rc.d -f hwclockfirst.sh remove
519+- chroot $rootfs /usr/sbin/update-rc.d -f module-init-tools remove
520++ chroot $rootfs /usr/sbin/update-rc.d -f checkroot.sh remove # S
521++ chroot $rootfs /usr/sbin/update-rc.d checkroot.sh stop 09 S .
522++
523++ chroot $rootfs /usr/sbin/update-rc.d -f umountfs remove # 0 6
524++ chroot $rootfs /usr/sbin/update-rc.d umountfs start 09 0 6 .
525++
526++ chroot $rootfs /usr/sbin/update-rc.d -f umountroot remove # 0 6
527++ chroot $rootfs /usr/sbin/update-rc.d umountroot start 10 0 6 .
528++
529++ # The following initscripts don't provide an empty start or stop block.
530++ # To prevent them being enabled on upgrades, we leave a start link on
531++ # runlevel 3.
532++ chroot $rootfs /usr/sbin/update-rc.d -f hwclock.sh remove # S 0 6
533++ chroot $rootfs /usr/sbin/update-rc.d hwclock.sh start 10 3 .
534++
535++ chroot $rootfs /usr/sbin/update-rc.d -f hwclockfirst.sh remove # S
536++ chroot $rootfs /usr/sbin/update-rc.d hwclockfirst start 08 3 .
537++
538++ chroot $rootfs /usr/sbin/update-rc.d -f module-init-tools remove # S
539++ chroot $rootfs /usr/sbin/update-rc.d module-init-tools start 10 3 .
540+
541+ echo "root:root" | chroot $rootfs chpasswd
542+ echo "Root password is 'root', please change !"
543
544=== renamed file 'debian/patches/10-debian-update-rcd.patch' => 'debian/patches/10-debian-update-rcd.patch.moved'
545=== added file 'debian/patches/11-doc-ip-address.patch'
546--- debian/patches/11-doc-ip-address.patch 1970-01-01 00:00:00 +0000
547+++ debian/patches/11-doc-ip-address.patch 2011-10-26 07:50:28 +0000
548@@ -0,0 +1,173 @@
549+Author: Daniel Baumann <daniel.baumann@progress-technologies.net>
550+Description:
551+ Use non-routed, private IPv4 address in documentation examples (Closes: #571525).
552+
553+diff -Naurp lxc.orig/doc/examples/lxc-complex.conf lxc/doc/examples/lxc-complex.conf
554+--- lxc.orig/doc/examples/lxc-complex.conf 2011-09-09 16:32:11.821390993 +0200
555++++ lxc/doc/examples/lxc-complex.conf 2011-09-20 23:56:27.777134985 +0200
556+@@ -5,19 +5,19 @@ lxc.network.type = veth
557+ lxc.network.flags = up
558+ lxc.network.link = br0
559+ lxc.network.hwaddr = 4a:49:43:49:79:bf
560+-lxc.network.ipv4 = 1.2.3.5/24
561++lxc.network.ipv4 = 10.2.3.5/24
562+ lxc.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3597
563+
564+ lxc.network.type = macvlan
565+ lxc.network.flags = up
566+ lxc.network.link = eth0
567+ lxc.network.hwaddr = 4a:49:43:49:79:bd
568+-lxc.network.ipv4 = 1.2.3.4/24
569++lxc.network.ipv4 = 10.2.3.4/24
570+ lxc.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3596
571+
572+ lxc.network.type = phys
573+ lxc.network.flags = up
574+ lxc.network.link = dummy0
575+ lxc.network.hwaddr = 4a:49:43:49:79:ff
576+-lxc.network.ipv4 = 1.2.3.6/24
577++lxc.network.ipv4 = 10.2.3.6/24
578+ lxc.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3297
579+diff -Naurp lxc.orig/doc/examples/lxc-complex.conf.in lxc/doc/examples/lxc-complex.conf.in
580+--- lxc.orig/doc/examples/lxc-complex.conf.in 2011-09-09 16:32:11.821390993 +0200
581++++ lxc/doc/examples/lxc-complex.conf.in 2011-09-20 23:56:41.425201779 +0200
582+@@ -5,19 +5,19 @@ lxc.network.type = veth
583+ lxc.network.flags = up
584+ lxc.network.link = br0
585+ lxc.network.hwaddr = 4a:49:43:49:79:bf
586+-lxc.network.ipv4 = 1.2.3.5/24
587++lxc.network.ipv4 = 10.2.3.5/24
588+ lxc.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3597
589+
590+ lxc.network.type = macvlan
591+ lxc.network.flags = up
592+ lxc.network.link = eth0
593+ lxc.network.hwaddr = 4a:49:43:49:79:bd
594+-lxc.network.ipv4 = 1.2.3.4/24
595++lxc.network.ipv4 = 10.2.3.4/24
596+ lxc.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3596
597+
598+ lxc.network.type = phys
599+ lxc.network.flags = up
600+ lxc.network.link = dummy0
601+ lxc.network.hwaddr = 4a:49:43:49:79:ff
602+-lxc.network.ipv4 = 1.2.3.6/24
603++lxc.network.ipv4 = 10.2.3.6/24
604+ lxc.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3297
605+diff -Naurp lxc.orig/doc/examples/lxc-macvlan.conf lxc/doc/examples/lxc-macvlan.conf
606+--- lxc.orig/doc/examples/lxc-macvlan.conf 2011-09-09 16:32:11.821390993 +0200
607++++ lxc/doc/examples/lxc-macvlan.conf 2011-09-20 23:57:25.901425757 +0200
608+@@ -4,5 +4,5 @@ lxc.network.type = macvlan
609+ lxc.network.flags = up
610+ lxc.network.link = eth0
611+ lxc.network.hwaddr = 4a:49:43:49:79:bd
612+-lxc.network.ipv4 = 1.2.3.4/24
613++lxc.network.ipv4 = 10.2.3.4/24
614+ lxc.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3596
615+diff -Naurp lxc.orig/doc/examples/lxc-macvlan.conf.in lxc/doc/examples/lxc-macvlan.conf.in
616+--- lxc.orig/doc/examples/lxc-macvlan.conf.in 2011-09-09 16:32:11.821390993 +0200
617++++ lxc/doc/examples/lxc-macvlan.conf.in 2011-09-20 23:57:23.845415375 +0200
618+@@ -4,5 +4,5 @@ lxc.network.type = macvlan
619+ lxc.network.flags = up
620+ lxc.network.link = eth0
621+ lxc.network.hwaddr = 4a:49:43:49:79:bd
622+-lxc.network.ipv4 = 1.2.3.4/24
623++lxc.network.ipv4 = 10.2.3.4/24
624+ lxc.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3596
625+diff -Naurp lxc.orig/doc/examples/lxc-phys.conf lxc/doc/examples/lxc-phys.conf
626+--- lxc.orig/doc/examples/lxc-phys.conf 2011-09-09 16:32:11.821390993 +0200
627++++ lxc/doc/examples/lxc-phys.conf 2011-09-20 23:57:28.117436890 +0200
628+@@ -5,5 +5,5 @@ lxc.network.type = phys
629+ lxc.network.flags = up
630+ lxc.network.link = eth0
631+ lxc.network.hwaddr = 4a:49:43:49:79:ff
632+-lxc.network.ipv4 = 1.2.3.6/24
633++lxc.network.ipv4 = 10.2.3.6/24
634+ lxc.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3297
635+diff -Naurp lxc.orig/doc/examples/lxc-phys.conf.in lxc/doc/examples/lxc-phys.conf.in
636+--- lxc.orig/doc/examples/lxc-phys.conf.in 2011-09-09 16:32:11.821390993 +0200
637++++ lxc/doc/examples/lxc-phys.conf.in 2011-09-20 23:57:19.497394305 +0200
638+@@ -5,5 +5,5 @@ lxc.network.type = phys
639+ lxc.network.flags = up
640+ lxc.network.link = eth0
641+ lxc.network.hwaddr = 4a:49:43:49:79:ff
642+-lxc.network.ipv4 = 1.2.3.6/24
643++lxc.network.ipv4 = 10.2.3.6/24
644+ lxc.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3297
645+diff -Naurp lxc.orig/doc/examples/lxc-veth.conf lxc/doc/examples/lxc-veth.conf
646+--- lxc.orig/doc/examples/lxc-veth.conf 2011-09-09 16:32:11.821390993 +0200
647++++ lxc/doc/examples/lxc-veth.conf 2011-09-20 23:56:46.513226093 +0200
648+@@ -5,5 +5,5 @@ lxc.network.type = veth
649+ lxc.network.flags = up
650+ lxc.network.link = br0
651+ lxc.network.hwaddr = 4a:49:43:49:79:bf
652+-lxc.network.ipv4 = 1.2.3.5/24
653++lxc.network.ipv4 = 10.2.3.5/24
654+ lxc.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3597
655+diff -Naurp lxc.orig/doc/examples/lxc-veth.conf.in lxc/doc/examples/lxc-veth.conf.in
656+--- lxc.orig/doc/examples/lxc-veth.conf.in 2011-09-09 16:32:11.821390993 +0200
657++++ lxc/doc/examples/lxc-veth.conf.in 2011-09-20 23:56:17.505087055 +0200
658+@@ -5,5 +5,5 @@ lxc.network.type = veth
659+ lxc.network.flags = up
660+ lxc.network.link = br0
661+ lxc.network.hwaddr = 4a:49:43:49:79:bf
662+-lxc.network.ipv4 = 1.2.3.5/24
663++lxc.network.ipv4 = 10.2.3.5/24
664+ lxc.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3597
665+diff -Naurp lxc.orig/doc/examples/lxc-vlan.conf lxc/doc/examples/lxc-vlan.conf
666+--- lxc.orig/doc/examples/lxc-vlan.conf 2011-09-09 16:32:11.821390993 +0200
667++++ lxc/doc/examples/lxc-vlan.conf 2011-09-20 23:57:31.533454612 +0200
668+@@ -5,5 +5,5 @@ lxc.network.vlan.id = 1234
669+ lxc.network.flags = up
670+ lxc.network.link = eth0
671+ lxc.network.hwaddr = 4a:49:43:49:79:bd
672+-lxc.network.ipv4 = 1.2.3.4/24
673++lxc.network.ipv4 = 10.2.3.4/24
674+ lxc.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3596
675+diff -Naurp lxc.orig/doc/examples/lxc-vlan.conf.in lxc/doc/examples/lxc-vlan.conf.in
676+--- lxc.orig/doc/examples/lxc-vlan.conf.in 2011-09-09 16:32:11.821390993 +0200
677++++ lxc/doc/examples/lxc-vlan.conf.in 2011-09-20 23:57:21.629404927 +0200
678+@@ -5,5 +5,5 @@ lxc.network.vlan.id = 1234
679+ lxc.network.flags = up
680+ lxc.network.link = eth0
681+ lxc.network.hwaddr = 4a:49:43:49:79:bd
682+-lxc.network.ipv4 = 1.2.3.4/24
683++lxc.network.ipv4 = 10.2.3.4/24
684+ lxc.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3596
685+diff -Naurp lxc.orig/doc/lxc.conf.sgml.in lxc/doc/lxc.conf.sgml.in
686+--- lxc.orig/doc/lxc.conf.sgml.in 2011-09-15 11:01:01.165397074 +0200
687++++ lxc/doc/lxc.conf.sgml.in 2011-09-20 23:56:57.261283643 +0200
688+@@ -590,7 +590,7 @@ Foundation, Inc., 59 Temple Place, Suite
689+ lxc.network.link = br0
690+ lxc.network.name = eth0
691+ lxc.network.hwaddr = 4a:49:43:49:79:bf
692+- lxc.network.ipv4 = 1.2.3.5/24 1.2.3.255
693++ lxc.network.ipv4 = 10.2.3.5/24 10.2.3.255
694+ lxc.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3597
695+ </programlisting>
696+ </refsect2>
697+@@ -621,21 +621,21 @@ Foundation, Inc., 59 Temple Place, Suite
698+ lxc.network.flags = up
699+ lxc.network.link = br0
700+ lxc.network.hwaddr = 4a:49:43:49:79:bf
701+- lxc.network.ipv4 = 1.2.3.5/24 1.2.3.255
702++ lxc.network.ipv4 = 10.2.3.5/24 10.2.3.255
703+ lxc.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3597
704+ lxc.network.ipv6 = 2003:db8:1:0:214:5432:feab:3588
705+ lxc.network.type = macvlan
706+ lxc.network.flags = up
707+ lxc.network.link = eth0
708+ lxc.network.hwaddr = 4a:49:43:49:79:bd
709+- lxc.network.ipv4 = 1.2.3.4/24
710++ lxc.network.ipv4 = 10.2.3.4/24
711+ lxc.network.ipv4 = 192.168.10.125/24
712+ lxc.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3596
713+ lxc.network.type = phys
714+ lxc.network.flags = up
715+ lxc.network.link = dummy0
716+ lxc.network.hwaddr = 4a:49:43:49:79:ff
717+- lxc.network.ipv4 = 1.2.3.6/24
718++ lxc.network.ipv4 = 10.2.3.6/24
719+ lxc.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3297
720+ lxc.cgroup.cpuset.cpus = 0,1
721+ lxc.cgroup.cpu.shares = 1234
722
723=== renamed file 'debian/patches/11-doc-ip-address.patch' => 'debian/patches/11-doc-ip-address.patch.moved'
724=== added file 'debian/patches/12-debian-config.patch'
725--- debian/patches/12-debian-config.patch 1970-01-01 00:00:00 +0000
726+++ debian/patches/12-debian-config.patch 2011-10-26 07:50:28 +0000
727@@ -0,0 +1,88 @@
728+Author: Daniel Baumann <daniel.baumann@progress-technologies.net>
729+Description: Improving debian default container config.
730+
731+diff -Naurp lxc.orig/templates/lxc-debian.in lxc/templates/lxc-debian.in
732+--- lxc.orig/templates/lxc-debian.in 2011-09-21 13:27:35.402467356 +0200
733++++ lxc/templates/lxc-debian.in 2011-09-21 13:29:11.658935664 +0200
734+@@ -217,30 +217,58 @@ copy_configuration()
735+ rootfs=$2
736+ name=$3
737+
738+- cat <<EOF >> $path/config
739+-lxc.tty = 4
740+-lxc.pts = 1024
741+-lxc.rootfs = $rootfs
742+-lxc.cgroup.devices.deny = a
743+-# /dev/null and zero
744+-lxc.cgroup.devices.allow = c 1:3 rwm
745+-lxc.cgroup.devices.allow = c 1:5 rwm
746+-# consoles
747+-lxc.cgroup.devices.allow = c 5:1 rwm
748+-lxc.cgroup.devices.allow = c 5:0 rwm
749+-lxc.cgroup.devices.allow = c 4:0 rwm
750+-lxc.cgroup.devices.allow = c 4:1 rwm
751++ cat >> $path/config << EOF
752++# $path/config
753++
754++## Container
755++lxc.utsname = $name
756++lxc.rootfs = $rootfs
757++lxc.tty = 4
758++lxc.pts = 1024
759++#lxc.console = /var/log/lxc/$name.console
760++
761++## Capabilities
762++lxc.cap.drop = sys_admin
763++
764++## Devices
765++#lxc.cgroup.devices.allow = a
766++lxc.cgroup.devices.deny = a
767++# /dev/null
768++lxc.cgroup.devices.allow = c 1:3 rwm
769++# /dev/zero
770++lxc.cgroup.devices.allow = c 1:5 rwm
771++# /dev/tty[1-4] consoles
772++lxc.cgroup.devices.allow = c 5:1 rwm
773++lxc.cgroup.devices.allow = c 5:0 rwm
774++lxc.cgroup.devices.allow = c 4:0 rwm
775++lxc.cgroup.devices.allow = c 4:1 rwm
776+ # /dev/{,u}random
777+-lxc.cgroup.devices.allow = c 1:9 rwm
778+-lxc.cgroup.devices.allow = c 1:8 rwm
779+-lxc.cgroup.devices.allow = c 136:* rwm
780+-lxc.cgroup.devices.allow = c 5:2 rwm
781+-# rtc
782+-lxc.cgroup.devices.allow = c 254:0 rwm
783+-
784+-# mounts point
785+-lxc.mount.entry=proc $rootfs/proc proc nodev,noexec,nosuid 0 0
786+-lxc.mount.entry=sysfs $rootfs/sys sysfs defaults 0 0
787++lxc.cgroup.devices.allow = c 1:9 rwm
788++lxc.cgroup.devices.allow = c 1:8 rwm
789++lxc.cgroup.devices.allow = c 136:* rwm
790++lxc.cgroup.devices.allow = c 5:2 rwm
791++# /dev/rtc
792++lxc.cgroup.devices.allow = c 254:0 rwm
793++
794++## Limits
795++#lxc.cgroup.cpu.shares = 1024
796++#lxc.cgroup.cpuset.cpus = 0
797++#lxc.cgroup.memory.limit_in_bytes = 256M
798++#lxc.cgroup.memory.memsw.limit_in_bytes = 1G
799++
800++## Filesystem
801++lxc.mount.entry = proc $rootfs/proc proc nodev,noexec,nosuid 0 0
802++lxc.mount.entry = sysfs $rootfs/sys sysfs defaults,ro 0 0
803++#lxc.mount.entry = /srv/$name $rootfs/srv/$name none defaults,bind 0 0
804++
805++## Network
806++lxc.network.type = veth
807++lxc.network.flags = up
808++lxc.network.hwaddr = 11:22:33:44:55:66
809++lxc.network.link = br0
810++lxc.network.mtu = 1500
811++lxc.network.name = eth0
812++lxc.network.veth.pair = veth-$name
813+ EOF
814+
815+ if [ $? -ne 0 ]; then
816
817=== renamed file 'debian/patches/12-debian-config.patch' => 'debian/patches/12-debian-config.patch.moved'
818=== added file 'debian/patches/13-lxc-create.patch'
819--- debian/patches/13-lxc-create.patch 1970-01-01 00:00:00 +0000
820+++ debian/patches/13-lxc-create.patch 2011-10-26 07:50:28 +0000
821@@ -0,0 +1,17 @@
822+Author: Daniel Baumann <daniel.baumann@progress-technologies.net>
823+Description:
824+ Keeping creation of new containers without previously existing configuration
825+ non-interactive.
826+
827+diff -Naurp lxc.orig/src/lxc/lxc-create.in lxc/src/lxc/lxc-create.in
828+--- lxc.orig/src/lxc/lxc-create.in 2011-09-21 12:40:39.632506012 +0200
829++++ lxc/src/lxc/lxc-create.in 2011-09-21 12:41:18.068694733 +0200
830+@@ -164,8 +164,6 @@ if [ ! -z $lxc_template ]; then
831+ echo "For more information look at lxc.conf (5)"
832+ echo
833+ echo "At this point, I assume you know what you do."
834+- echo "Press <enter> to continue ..."
835+- read dummy
836+ fi
837+
838+ ${templatedir}/lxc-$lxc_template --path=$lxc_path/$lxc_name --name=$lxc_name $*
839
840=== renamed file 'debian/patches/13-lxc-create.patch' => 'debian/patches/13-lxc-create.patch.moved'
841=== modified file 'debian/patches/series'
842=== added directory 'debian/po'
843=== renamed directory 'debian/po' => 'debian/po.moved'
844=== added file 'debian/po/POTFILES.in'
845--- debian/po/POTFILES.in 1970-01-01 00:00:00 +0000
846+++ debian/po/POTFILES.in 2011-10-26 07:50:28 +0000
847@@ -0,0 +1,1 @@
848+[type: gettext/rfc822deb] lxc.templates
849
850=== added file 'debian/po/de.po'
851--- debian/po/de.po 1970-01-01 00:00:00 +0000
852+++ debian/po/de.po 2011-10-26 07:50:28 +0000
853@@ -0,0 +1,46 @@
854+# German translation of lxc debconf templates.
855+# Copyright (C) 2011 Daniel Baumann <daniel.baumann@progress-technologies.net>
856+# This file is distributed under the same license as the lxc package.
857+#
858+msgid ""
859+msgstr ""
860+"Project-Id-Version: lxc 0.7.5-2\n"
861+"Report-Msgid-Bugs-To: lxc@packages.debian.org\n"
862+"POT-Creation-Date: 2011-09-21 10:22+0200\n"
863+"PO-Revision-Date: 2010-07-20 05:54+0200\n"
864+"Last-Translator: Daniel Baumann <daniel.baumann@progress-technologies.net>\n"
865+"Language-Team: none\n"
866+"Language: de\n"
867+"MIME-Version: 1.0\n"
868+"Content-Type: text/plain; charset=UTF-8\n"
869+"Content-Transfer-Encoding: 8bit\n"
870+
871+#. Type: title
872+#. Description
873+#: ../lxc.templates:1001
874+msgid "Linux Container (LXC)"
875+msgstr "Linux Container (LXC)"
876+
877+#. Type: boolean
878+#. Description
879+#: ../lxc.templates:2001
880+msgid "Linux Container: Automatic start and stop"
881+msgstr "Linux Container: Automatischer Start und Stop"
882+
883+#. Type: boolean
884+#. Description
885+#: ../lxc.templates:2001
886+msgid ""
887+"Linux Containers that have their configuration files copied or symlinked to "
888+"the /etc/lxc/auto directory can be automatically started during system boot "
889+"and shutdown on reboot/halt."
890+msgstr ""
891+"Linux Container welche ihre Konfigurationsdateien in das /etc/lxc/auto "
892+"Verzeichnis kopiert oder gelinkt haben, können automatisch beim "
893+"Hochfahrendes Systems gestarted und beim Herunterfahren gestoppt werden."
894+
895+#. Type: boolean
896+#. Description
897+#: ../lxc.templates:2001
898+msgid "If unsure, choose yes (default)."
899+msgstr "Wenn Sie unsicher sind, wählen sie ja (Standard)."
900
901=== added file 'debian/po/templates.pot'
902--- debian/po/templates.pot 1970-01-01 00:00:00 +0000
903+++ debian/po/templates.pot 2011-10-26 07:50:28 +0000
904@@ -0,0 +1,45 @@
905+# SOME DESCRIPTIVE TITLE.
906+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
907+# This file is distributed under the same license as the PACKAGE package.
908+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
909+#
910+#, fuzzy
911+msgid ""
912+msgstr ""
913+"Project-Id-Version: PACKAGE VERSION\n"
914+"Report-Msgid-Bugs-To: lxc@packages.debian.org\n"
915+"POT-Creation-Date: 2011-09-21 10:22+0200\n"
916+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
917+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
918+"Language-Team: LANGUAGE <LL@li.org>\n"
919+"Language: \n"
920+"MIME-Version: 1.0\n"
921+"Content-Type: text/plain; charset=CHARSET\n"
922+"Content-Transfer-Encoding: 8bit\n"
923+
924+#. Type: title
925+#. Description
926+#: ../lxc.templates:1001
927+msgid "Linux Container (LXC)"
928+msgstr ""
929+
930+#. Type: boolean
931+#. Description
932+#: ../lxc.templates:2001
933+msgid "Linux Container: Automatic start and stop"
934+msgstr ""
935+
936+#. Type: boolean
937+#. Description
938+#: ../lxc.templates:2001
939+msgid ""
940+"Linux Containers that have their configuration files copied or symlinked to "
941+"the /etc/lxc/auto directory can be automatically started during system boot "
942+"and shutdown on reboot/halt."
943+msgstr ""
944+
945+#. Type: boolean
946+#. Description
947+#: ../lxc.templates:2001
948+msgid "If unsure, choose yes (default)."
949+msgstr ""

Subscribers

People subscribed via source and target branches

to all changes: