Bug#685616: tpu: lxc/0.8.0~rc1-8.1 (pre-approval)
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: tpu
Please allow the upload of package lxc to testing-proposed-update.
It only fixes some debconf template translations, already fixed in Sid,
but I'm afraid the Sid version contains changes not in line with the
freeze policy, and I couldn't find any trace of pre-approval or unblock
request about it.
Czech and Danish translations of debconf templates are about to be 100%
complete, thus the interest in getting that fixed in Wheezy.
Please find attached the debdiff against the package in testing, for the
tpu, and for the Sid version if you'd prefer consider an unblock.
The packages built in a Wheezy environment are online:
http://people.debian.org/~taffit/lxc/
Regards
David
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.2.0-3-amd64 (SMP w/1 CPU core)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diffstat for lxc-0.8.0~rc1 lxc-0.8.0~rc1
changelog | 39 +++++++++++++++
local/examples/lxc-debian.cfg | 24 ++++-----
local/examples/lxc-progress.cfg | 38 +++++++--------
local/lxc-debconf | 71 ++++++++++++++++++----------
local/lxc-list | 17 +++++-
local/lxc-ls | 7 ++
lxc-dev.install | 2
lxc.README.Debian | 31 ++++++++++++
lxc.TODO | 5 +
lxc.install | 2
lxc.postrm | 2
patches/13-lxc-setcap-paths.patch | 24 +++++++++
patches/14-lxc-destroy-symlinks.patch | 13 +++++
patches/series | 2
po/cs.po | 27 +++-------
po/da.po | 34 ++++++-------
po/ja.po | 86 ++++++++++++++++++++++++++++++++++
17 files changed, 327 insertions(+), 97 deletions(-)
diff -Nru lxc-0.8.0~rc1/debian/changelog lxc-0.8.0~rc1/debian/changelog
--- lxc-0.8.0~rc1/debian/changelog 2012-07-03 18:26:52.000000000 -0400
+++ lxc-0.8.0~rc1/debian/changelog 2012-08-22 03:01:21.000000000 -0400
@@ -1,3 +1,42 @@
+lxc (0.8.0~rc1-10) unstable; urgency=low
+
+ * Adding some lxc related boot parameters in readme (Closes: #683999).
+ * Correcting spelling typo in previous changelog entry.
+ * Adding note about lxc directory in readme.
+ * Sourcing /etc/default/lxc in lxc-ls (Closes: #684124).
+ * Listing attached consoles in lxc-list.
+ * Using printf in lxc-list to produce a table output.
+ * Adding updated Danish debconf translations from Joe Dalton
+ <joedalton2@yahoo.dk> (Closes: #684572).
+ * Mounting /proc with hidepid=2 on progress by default.
+ * Also removing auto symlink when destroying containers.
+ * Protecting multiarch queries since install files are run with set -
+ e.
+ * Adding missing live-config preseedings in lxc-debconf (Closes:
+ #680469).
+ * Updating todo file.
+
+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Wed, 22 Aug 2012 09:01:11 +0200
+
+lxc (0.8.0~rc1-9) unstable; urgency=low
+
+ * Updating todo file.
+ * Correcting freudian typo in lxc directory removal in postrm (Closes:
+ #679842).
+ * Adding updated Czech debconf translations from Michal Simunek
+ <michal.simunek@gmail.com> (Closes: #679681).
+ * Using split out live-debconfig now.
+ * Adding patch to correct paths to lxc-init in lxc-setcap (Closes:
+ #682790).
+ * Adding Japanese debconf translations from Kenshi Muto
+ <kmuto@debian.org> (Closes: #683123).
+ * Using relative mount paths for /proc and /sys in container
+ configurations produced by lxc-debconf (Closes: #683444).
+ * Shortening name of dpkg.cfg.d configuration file used during chroot
+ operations.
+
+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sat, 04 Aug 2012 10:38:43 +0200
+
lxc (0.8.0~rc1-8) unstable; urgency=low
* Removing comments in lxc-debconf debconf templates, apparently
diff -Nru lxc-0.8.0~rc1/debian/local/examples/lxc-debian.cfg lxc-0.8.0~rc1/debian/local/examples/lxc-debian.cfg
--- lxc-0.8.0~rc1/debian/local/examples/lxc-debian.cfg 2012-06-29 17:14:41.000000000 -0400
+++ lxc-0.8.0~rc1/debian/local/examples/lxc-debian.cfg 2012-08-16 10:11:55.000000000 -0400
@@ -27,18 +27,18 @@
lxc lxc-debconf/eth0/veth string veth-debian
# live-debconfig
-live-config live-debconfig/hostname/hostname string debian
-live-config live-debconfig/ifupdown/eth0-comment string The primary network interface
-live-config live-debconfig/ifupdown/eth0-method select dhcp
-#live-config live-debconfig/ifupdown/eth0-address string
-#live-config live-debconfig/ifupdown/eth0-broadcast string
-#live-config live-debconfig/ifupdown/eth0-gateway string
-#live-config live-debconfig/ifupdown/eth0-netmask string
-#live-config live-debconfig/ifupdown/eth0-network string
-#live-config live-debconfig/ifupdown/nameservers string
-live-config live-debconfig/selinux/enable boolean false
-live-config live-debconfig/sysvinit/lxc-enable boolean true
-live-config live-debconfig/sysvinit/lxc-consoles string 6
+live-debconfig live-debconfig/hostname/hostname string debian
+live-debconfig live-debconfig/ifupdown/eth0-comment string The primary network interface
+live-debconfig live-debconfig/ifupdown/eth0-method select dhcp
+#live-debconfig live-debconfig/ifupdown/eth0-address string
+#live-debconfig live-debconfig/ifupdown/eth0-broadcast string
+#live-debconfig live-debconfig/ifupdown/eth0-gateway string
+#live-debconfig live-debconfig/ifupdown/eth0-netmask string
+#live-debconfig live-debconfig/ifupdown/eth0-network string
+#live-debconfig live-debconfig/ifupdown/nameservers string
+live-debconfig live-debconfig/selinux/enable boolean false
+live-debconfig live-debconfig/sysvinit/lxc-enable boolean true
+live-debconfig live-debconfig/sysvinit/lxc-consoles string 6
## System
diff -Nru lxc-0.8.0~rc1/debian/local/examples/lxc-progress.cfg lxc-0.8.0~rc1/debian/local/examples/lxc-progress.cfg
--- lxc-0.8.0~rc1/debian/local/examples/lxc-progress.cfg 2012-06-29 17:14:41.000000000 -0400
+++ lxc-0.8.0~rc1/debian/local/examples/lxc-progress.cfg 2012-08-16 10:11:55.000000000 -0400
@@ -40,25 +40,25 @@
lxc lxc-debconf/eth1/veth string veth-public200
# live-debconfig
-live-config live-debconfig/hostname/hostname string progress
-live-config live-debconfig/ifupdown/eth0-comment string private
-live-config live-debconfig/ifupdown/eth0-method select static
-live-config live-debconfig/ifupdown/eth0-address string 10.0.2.200
-live-config live-debconfig/ifupdown/eth0-broadcast string 10.0.2.255
-live-config live-debconfig/ifupdown/eth0-gateway string 10.0.2.1
-live-config live-debconfig/ifupdown/eth0-netmask string 255.255.255.0
-live-config live-debconfig/ifupdown/eth0-network string 10.0.2.0
-live-config live-debconfig/ifupdown/eth1-comment string public
-live-config live-debconfig/ifupdown/eth1-method select static
-live-config live-debconfig/ifupdown/eth1-address string 123.45.678.200
-live-config live-debconfig/ifupdown/eth1-broadcast string 123.45.678.255
-live-config live-debconfig/ifupdown/eth1-gateway string
-live-config live-debconfig/ifupdown/eth1-netmask string 255.255.255.0
-live-config live-debconfig/ifupdown/eth1-network string 123.45.678.128
-live-config live-debconfig/ifupdown/nameservers string 8.8.8.8 8.8.4.4
-live-config live-debconfig/selinux/enable boolean false
-live-config live-debconfig/sysvinit/lxc-enable boolean true
-live-config live-debconfig/sysvinit/lxc-consoles string 1
+live-debconfig live-debconfig/hostname/hostname string progress
+live-debconfig live-debconfig/ifupdown/eth0-comment string private
+live-debconfig live-debconfig/ifupdown/eth0-method select static
+live-debconfig live-debconfig/ifupdown/eth0-address string 10.0.2.200
+live-debconfig live-debconfig/ifupdown/eth0-broadcast string 10.0.2.255
+live-debconfig live-debconfig/ifupdown/eth0-gateway string 10.0.2.1
+live-debconfig live-debconfig/ifupdown/eth0-netmask string 255.255.255.0
+live-debconfig live-debconfig/ifupdown/eth0-network string 10.0.2.0
+live-debconfig live-debconfig/ifupdown/eth1-comment string public
+live-debconfig live-debconfig/ifupdown/eth1-method select static
+live-debconfig live-debconfig/ifupdown/eth1-address string 123.45.678.200
+live-debconfig live-debconfig/ifupdown/eth1-broadcast string 123.45.678.255
+live-debconfig live-debconfig/ifupdown/eth1-gateway string
+live-debconfig live-debconfig/ifupdown/eth1-netmask string 255.255.255.0
+live-debconfig live-debconfig/ifupdown/eth1-network string 123.45.678.128
+live-debconfig live-debconfig/ifupdown/nameservers string 8.8.8.8 8.8.4.4
+live-debconfig live-debconfig/selinux/enable boolean false
+live-debconfig live-debconfig/sysvinit/lxc-enable boolean true
+live-debconfig live-debconfig/sysvinit/lxc-consoles string 1
## System
diff -Nru lxc-0.8.0~rc1/debian/local/lxc-debconf lxc-0.8.0~rc1/debian/local/lxc-debconf
--- lxc-0.8.0~rc1/debian/local/lxc-debconf 2012-06-30 08:06:33.000000000 -0400
+++ lxc-0.8.0~rc1/debian/local/lxc-debconf 2012-08-22 02:59:01.000000000 -0400
@@ -46,7 +46,7 @@
# Disable dpkg syncing
-cat > "${_ROOT}/etc/dpkg/dpkg.cfg.d/lxc-debconf" << EOF
+cat > "${_ROOT}/etc/dpkg/dpkg.cfg.d/lxc" << EOF
force-unsafe-io
EOF
@@ -79,7 +79,7 @@
Chroot "${_ROOT}" "apt-get clean"
# Cleanup
- rm -f "${_ROOT}/etc/dpkg/dpkg.cfg.d/lxc-debconf"
+ rm -f "${_ROOT}/etc/dpkg/dpkg.cfg.d/lxc"
rm -f "${_ROOT}/usr/sbin/policy-rc.d"
# Unmount pseudo-filesystems
@@ -232,36 +232,48 @@
Chroot "${_ROOTFS}" "apt-get --yes install ${_PACKAGES}"
fi
- # Install live-config
- if ls /usr/share/lxc/packages/live-config*.deb > /dev/null 2>&1
+ # Install live-debconfig
+ if ls /usr/share/lxc/packages/live-debconfig_*.deb > /dev/null 2>&1
then
- # Install local live-config package
- for _PACKAGE in /usr/share/lxc/packages/live-config-*_*.deb /usr/share/lxc/packages/live-config_*.deb
- do
- cp -L ${_PACKAGE} "${_ROOTFS}"
- Chroot "${_ROOTFS}" "dpkg -i $(basename ${_ROOTFS}/live-config*.deb)"
- rm -f "${_ROOTFS}"/live-config*.deb
- done
+ # Install local live-debconfig package
+ cp -L /usr/share/lxc/packages/live-debconfig_*.deb "${_ROOTFS}"
+ Chroot "${_ROOTFS}" "dpkg -i $(basename ${_ROOTFS}/live-debconfig_*.deb)"
+ rm -f "${_ROOTFS}"/live-debconfig_*.deb
else
- # Install remote live-config package
- Chroot "${_ROOTFS}" "apt-get install --yes live-config"
+ # Install remote live-debconfig package
+ Chroot "${_ROOTFS}" "apt-get install --yes live-debconfig"
fi
- # Initialize live-debconfig debconf database
- Chroot "${_ROOTFS}" "live-debconfig --noscripts"
-
# Preseed live-debconfig
if [ -e "${_PRESEED_FILE}" ]
then
- cat "${_PRESEED_FILE}" > "${_ROOTFS}/preseed.cfg"
+ grep -E '^ *live-debconfig' "${_PRESEED_FILE}" > "${_ROOTFS}/preseed.cfg"
+ fi
- Chroot "${_ROOTFS}" "DEBCONF_SYSTEMRC=/var/lib/live/debconfig/systemrc debconf-set-selections preseed.cfg"
+cat >> "${_ROOTFS}/preseed.cfg" << EOF
+# ifupdown
+live-debconfig live-debconfig/ifupdown/lo-enable boolean false
- rm -f "${_ROOTFS}/preseed.cfg"
- fi
+# sysvinit
+live-debconfig live-debconfig/sysvinit/lxc-enable boolean true
+
+# util-linux
+live-debconfig live-debconfig/util-linux/hwclockaccess boolean false
+
+# selinux
+live-debconfig live-debconfig/selinux/enable boolean false
+EOF
+
+ # Initialize live-debconfig debconf database
+ Chroot "${_ROOTFS}" "live-debconfig --noscripts"
+
+ # Apply preseed information
+ Chroot "${_ROOTFS}" "DEBCONF_SYSTEMRC=/var/lib/live/debconfig/systemrc debconf-set-selections preseed.cfg"
+
+ rm -f "${_ROOTFS}/preseed.cfg"
# Run live-debconfig
- Chroot "${_ROOTFS}" "live-debconfig"
+ Chroot "${_ROOTFS}" "DEBIAN_FRONTEND=dialog DEBIAN_PRIORITY=high live-debconfig"
# Configure user-setup
@@ -626,8 +638,21 @@
#lxc.cgroup.memory.memsw.limit_in_bytes = 1G
## Filesystem
-lxc.mount.entry = proc ${_ROOTFS}/proc proc nodev,noexec,nosuid 0 0
-lxc.mount.entry = sysfs ${_ROOTFS}/sys sysfs defaults,ro 0 0
+EOF
+
+case "${_MODE}" in
+ progress)
+ _PROC_OPTIONS="nodev,noexec,nosuid,hidepid=2"
+ ;;
+
+ *)
+ _PROC_OPTIONS="nodev,noexec,nosuid"
+ ;;
+esac
+
+cat >> "${_PATH}/config" << EOF
+lxc.mount.entry = proc proc proc ${_PROC_OPTIONS} 0 0
+lxc.mount.entry = sysfs sys sysfs defaults,ro 0 0
EOF
# Adding preseeded mount entries
diff -Nru lxc-0.8.0~rc1/debian/local/lxc-list lxc-0.8.0~rc1/debian/local/lxc-list
--- lxc-0.8.0~rc1/debian/local/lxc-list 2012-06-30 08:06:45.000000000 -0400
+++ lxc-0.8.0~rc1/debian/local/lxc-list 2012-08-16 10:11:55.000000000 -0400
@@ -23,14 +23,25 @@
do
if lxc-info -n ${_CONTAINER} 2>&1 | grep -qs "${_STATUS}"
then
- echo -n " ${_CONTAINER}"
+ printf " %-55.50s" "${_CONTAINER}"
if [ -e /etc/lxc/auto/${_CONTAINER} ]
then
- echo " (auto)"
+ printf "%-10.6s" "(auto)"
else
- echo
+ printf "%-10.6s" " "
fi
+
+ case "${_STATUS}" in
+ RUNNING)
+ if ps -eaf | grep -sq "lxc-console --name ${_CONTAINER}\$"
+ then
+ printf "%-10.9s" "[CONSOLE]"
+ fi
+ ;;
+ esac
+
+ printf "\n"
fi
done
diff -Nru lxc-0.8.0~rc1/debian/local/lxc-ls lxc-0.8.0~rc1/debian/local/lxc-ls
--- lxc-0.8.0~rc1/debian/local/lxc-ls 2012-06-30 08:06:46.000000000 -0400
+++ lxc-0.8.0~rc1/debian/local/lxc-ls 2012-08-16 10:11:55.000000000 -0400
@@ -9,7 +9,12 @@
set -e
-_LXC_DIRECTORY="/var/lib/lxc"
+if [ -e /etc/default/lxc ]
+then
+ . /etc/default/lxc
+fi
+
+_LXC_DIRECTORY="${LXC_DIRECTORY:-/var/lib/lxc}"
if [ ! -e "${_LXC_DIRECTORY}" ]
then
diff -Nru lxc-0.8.0~rc1/debian/lxc-dev.install lxc-0.8.0~rc1/debian/lxc-dev.install
--- lxc-0.8.0~rc1/debian/lxc-dev.install 2012-06-29 18:12:27.000000000 -0400
+++ lxc-0.8.0~rc1/debian/lxc-dev.install 2012-08-20 04:47:00.000000000 -0400
@@ -2,7 +2,7 @@
set -e
-DEB_HOST_MULTIARCH="$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
+DEB_HOST_MULTIARCH="$(dpkg-architecture -qDEB_HOST_MULTIARCH || true)"
cat << EOF
usr/include
diff -Nru lxc-0.8.0~rc1/debian/lxc.install lxc-0.8.0~rc1/debian/lxc.install
--- lxc-0.8.0~rc1/debian/lxc.install 2012-06-29 18:30:21.000000000 -0400
+++ lxc-0.8.0~rc1/debian/lxc.install 2012-08-20 04:47:00.000000000 -0400
@@ -2,7 +2,7 @@
set -e
-DEB_HOST_MULTIARCH="$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
+DEB_HOST_MULTIARCH="$(dpkg-architecture -qDEB_HOST_MULTIARCH || true)"
cat << EOF
etc
diff -Nru lxc-0.8.0~rc1/debian/lxc.postrm lxc-0.8.0~rc1/debian/lxc.postrm
--- lxc-0.8.0~rc1/debian/lxc.postrm 2012-07-03 18:24:30.000000000 -0400
+++ lxc-0.8.0~rc1/debian/lxc.postrm 2012-08-16 10:11:55.000000000 -0400
@@ -9,7 +9,7 @@
. /etc/default/lxc
fi
- LXC_DIRECTORY="${LXC_DIRECTORY:-/etc/default/lxc}"
+ LXC_DIRECTORY="${LXC_DIRECTORY:-/var/lib/lxc}"
rm -f /etc/default/lxc
diff -Nru lxc-0.8.0~rc1/debian/lxc.README.Debian lxc-0.8.0~rc1/debian/lxc.README.Debian
--- lxc-0.8.0~rc1/debian/lxc.README.Debian 2012-06-29 18:34:07.000000000 -0400
+++ lxc-0.8.0~rc1/debian/lxc.README.Debian 2012-08-16 10:11:55.000000000 -0400
@@ -17,6 +17,21 @@
If you use a Debian wheezy kernel or newer, all of the features are enabled
including the resource controller.
+In order to enable the memory controller for Debian wheezy, the following
+boot parameter needs to be used:
+
+ cgroup_enable=memory
+
+In order to enable the swap controller for Debian wheezy, the following
+boot parameter needs to be used:
+
+ swapaccount
+
+In order to enable apparmor which lxc can make use of, the following
+boot parameter needs to be used:
+
+ security=apparmor
+
Note: Kernel version before 2.6.36 do crash when using two bridge network
interfaces with LXC. If you need more than one bridge on the host system,
make sure you upgrade your kernel first.
@@ -56,4 +71,20 @@
/etc/lxc/auto/www.example.org -> /var/lib/lxc/www.example.org/config
+
+5. Directory
+
+LXC container are stored in /var/lib/lxc by default. Various components within the
+lxc package assume that the containers are there. Therefore, if you want to move
+the containers to another directory, use:
+
+ # dpkg-reconfigure -plow lxc
+
+and answer the debconf question about the lxc directory accordingly. The package's
+maintainer scripts will take care about replacing /var/lib/lxc (if empty) with a
+symlink to your new lxc directory.
+
+In case you're doing things manually, make sure that /var/lib/lxc is a symlink
+pointing to your lxc directory at all times.
+
-- Daniel Baumann <daniel.baumann@progress-technologies.net> Tue, 12 Jul 2011 20:32:16 +0200
diff -Nru lxc-0.8.0~rc1/debian/lxc.TODO lxc-0.8.0~rc1/debian/lxc.TODO
--- lxc-0.8.0~rc1/debian/lxc.TODO 2012-06-29 17:46:31.000000000 -0400
+++ lxc-0.8.0~rc1/debian/lxc.TODO 2012-08-22 03:00:42.000000000 -0400
@@ -19,11 +19,14 @@
start/stop/restart/create/destroy their containers
lxc-debconf:
+ * for some reason the Internal_options don't make it to debconf.default;
+ probably because the 'if db_get ...' constructs don't work with set -e.
+ * allow mechanism to store local packages that overwrite repository ones
* if invoked as lxc-debconf, ask for mode (debian, progress, ubuntu, etc.)
* allow to have templates (that do not get modified) in /etc/lxc/debconf
* write preseed file into /etc/lxc/debconf after lxc-debconf is done
* create /etc/lxc/{debian,progress} and respect it depending on mode
- * add a warning when building squeeze but no live-config 3.x in /usr/share/lxc
+ * add a warning when building squeeze but no live-debconfig in /usr/share/lxc
* allow using architecture=auto
* save last used IP, use this +1 as default for next container
* add manpage
diff -Nru lxc-0.8.0~rc1/debian/patches/13-lxc-setcap-paths.patch lxc-0.8.0~rc1/debian/patches/13-lxc-setcap-paths.patch
--- lxc-0.8.0~rc1/debian/patches/13-lxc-setcap-paths.patch 1969-12-31 20:00:00.000000000 -0400
+++ lxc-0.8.0~rc1/debian/patches/13-lxc-setcap-paths.patch 2012-08-16 10:11:55.000000000 -0400
@@ -0,0 +1,24 @@
+Author: Daniel Baumann <daniel.baumann@progress-technologies.net>
+Description: Correct paths to lxc-init (Closes: #682790).
+
+diff -Naurp lxc.orig/src/lxc/lxc-setcap.in lxc/src/lxc/lxc-setcap.in
+--- lxc.orig/src/lxc/lxc-setcap.in 2012-07-26 01:51:06.383661274 +0200
++++ lxc/src/lxc/lxc-setcap.in 2012-07-26 01:50:50.675587139 +0200
+@@ -52,7 +52,7 @@ lxc_setcaps()
+ setcap $LXC_UNSHARE_CAPS=ep @BINDIR@/lxc-unshare
+ setcap $LXC_NETSTAT_CAPS=ep @BINDIR@/lxc-netstat
+ setcap $LXC_CHECKPOINT_CAPS=ep @BINDIR@/lxc-checkpoint
+- setcap $LXC_INIT_CAPS=ep @LXCINITDIR@/lxc-init
++ setcap $LXC_INIT_CAPS=ep @LIBDIR@/lxc-init
+
+ test -e @LXCPATH@ || mkdir -p @LXCPATH@
+ chmod 0777 @LXCPATH@
+@@ -68,7 +68,7 @@ lxc_dropcaps()
+ setcap -r @BINDIR@/lxc-unshare
+ setcap -r @BINDIR@/lxc-netstat
+ setcap -r @BINDIR@/lxc-checkpoint
+- setcap -r @LXCINITDIR@/lxc-init
++ setcap -r @LIBDIR@/lxc-init
+ chmod 0755 @LXCPATH@
+ }
+
diff -Nru lxc-0.8.0~rc1/debian/patches/14-lxc-destroy-symlinks.patch lxc-0.8.0~rc1/debian/patches/14-lxc-destroy-symlinks.patch
--- lxc-0.8.0~rc1/debian/patches/14-lxc-destroy-symlinks.patch 1969-12-31 20:00:00.000000000 -0400
+++ lxc-0.8.0~rc1/debian/patches/14-lxc-destroy-symlinks.patch 2012-08-20 04:38:28.000000000 -0400
@@ -0,0 +1,13 @@
+Author: Daniel Baumann <daniel.baumann@progress-technologies.net>
+Description: Also removing auto symlink when destroying containers.
+
+diff -Naurp lxc.orig/src/lxc/lxc-destroy.in lxc/src/lxc/lxc-destroy.in
+--- lxc.orig/src/lxc/lxc-destroy.in 2012-08-20 10:32:37.382147953 +0200
++++ lxc/src/lxc/lxc-destroy.in 2012-08-20 10:37:05.040052154 +0200
+@@ -108,3 +108,6 @@ if [ ! -z "$rootdev" ]; then
+ fi
+ # recursively remove the container to remove old container configuration
+ rm -rf --one-file-system --preserve-root $lxc_path/$lxc_name
++
++# remove auto symlink
++rm -f /etc/lxc/auto/$lxc_name
diff -Nru lxc-0.8.0~rc1/debian/patches/series lxc-0.8.0~rc1/debian/patches/series
--- lxc-0.8.0~rc1/debian/patches/series 2012-06-29 17:14:41.000000000 -0400
+++ lxc-0.8.0~rc1/debian/patches/series 2012-08-20 04:38:28.000000000 -0400
@@ -10,3 +10,5 @@
10-lxc-clone-trap-name.patch
11-lxc-console-escape.patch
12-lxc-create-rootfs.patch
+13-lxc-setcap-paths.patch
+14-lxc-destroy-symlinks.patch
diff -Nru lxc-0.8.0~rc1/debian/po/cs.po lxc-0.8.0~rc1/debian/po/cs.po
--- lxc-0.8.0~rc1/debian/po/cs.po 2012-07-03 18:29:51.000000000 -0400
+++ lxc-0.8.0~rc1/debian/po/cs.po 2012-08-16 10:11:55.000000000 -0400
@@ -1,13 +1,13 @@
# Czech translation of lxc debconf templates.
-# Copyright (C) 2011 Michal Simunek <michal.simunek@gmail.com>
+# Copyright (C) 2011-2012 Michal Simunek <michal.simunek@gmail.com>
# This file is distributed under the same license as the lxc package.
#
msgid ""
msgstr ""
-"Project-Id-Version: lxc 0.7.5-9\n"
+"Project-Id-Version: lxc 0.8.0~rc1-5\n"
"Report-Msgid-Bugs-To: lxc@packages.debian.org\n"
"POT-Creation-Date: 2012-02-09 13:08+0100\n"
-"PO-Revision-Date: 2011-11-17 17:31+0100\n"
+"PO-Revision-Date: 2011-06-30 14:31+0200\n"
"Last-Translator: Michal Simunek <michal.simunek@gmail.com>\n"
"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
"Language: cs\n"
@@ -48,29 +48,21 @@
#. Type: select
#. Description
#: ../lxc.templates:3001
-#, fuzzy
-#| msgid "Linux Container: Stop method"
msgid "Linux Container: Shutdown method"
-msgstr "Linuxový kontejner: Způsob zastavení"
+msgstr "Linuxový kontejner: Způsob ukončení"
#. Type: select
#. Description
#: ../lxc.templates:3001
-#, fuzzy
-#| msgid ""
-#| "Linux Containers can be stopped in different ways. The stop method kills "
-#| "all processes inside the container. The halt method initiates a shutdown, "
-#| "which takes longer and can have problems with containers that don't "
-#| "shutdown themselves properly."
msgid ""
"Linux Containers can be shutdown in different ways. The stop method "
"terminates all processes inside the container. The halt method initiates a "
"shutdown, which takes longer and can have problems with containers that "
"don't shutdown themselves properly."
msgstr ""
-"Linuxové kontejnery lze zastavit různými způsoby. Způsob stop zabije všechny "
-"procesy uvnitř kontejneru. Způsob halt zinicializuje vypnutí, které trvá "
-"delší dobu a může mít problémy s kontejnery, které se sami správně nevypnou."
+"Linuxové kontejnery lze ukončit různými způsoby. Způsob stop zabije všechny "
+"procesy uvnitř kontejneru. Způsob halt zinicializuje ukončení, které trvá "
+"delší dobu a může mít problémy s kontejnery, které se sami správně neukončí."
#. Type: select
#. Description
@@ -79,6 +71,8 @@
"Unless you know that your containers don't shutdown properly, choose halt "
"(default)."
msgstr ""
+"Pokud nevíte, zda se vaše kontejnery správně ukončí, zvolte halt "
+"(výchozí)"
#. Type: string
#. Description
@@ -100,6 +94,3 @@
#: ../lxc.templates:4001
msgid "If unsure, use /var/lib/lxc (default)."
msgstr "Nejste-li si jistí, použijte /var/lib/lxc (výchozí)."
-
-#~ msgid "If unsure, choose stop (default)."
-#~ msgstr "Nejste-li si jistí, zvolte stop (výchozí)."
diff -Nru lxc-0.8.0~rc1/debian/po/da.po lxc-0.8.0~rc1/debian/po/da.po
--- lxc-0.8.0~rc1/debian/po/da.po 2012-06-29 17:14:41.000000000 -0400
+++ lxc-0.8.0~rc1/debian/po/da.po 2012-08-16 10:21:10.000000000 -0400
@@ -1,5 +1,5 @@
# Danish translation of lxc debconf templates.
-# Copyright (C) 2011 Joe Hansen <joedalton2@yahoo.dk>
+# Copyright (C) 2011-2012 Joe Hansen <joedalton2@yahoo.dk>
# This file is distributed under the same license as the lxc package.
#
msgid ""
@@ -7,7 +7,7 @@
"Project-Id-Version: lxc\n"
"Report-Msgid-Bugs-To: lxc@packages.debian.org\n"
"POT-Creation-Date: 2012-02-09 13:08+0100\n"
-"PO-Revision-Date: 2011-10-23 17:30+01:00\n"
+"PO-Revision-Date: 2012-08-11 17:30+01:00\n"
"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
"Language: da\n"
@@ -18,10 +18,8 @@
#. Type: title
#. Description
#: ../lxc.templates:1001
-#, fuzzy
-#| msgid "Linux Containers (LXC) setup"
msgid "Linux Containers: LXC setup"
-msgstr "Opsætning af Linuxcontainere (LXC)"
+msgstr "Linuxcontainere: LXC-opsætning"
#. Type: boolean
#. Description
@@ -32,31 +30,26 @@
#. Type: boolean
#. Description
#: ../lxc.templates:2001
-#, fuzzy
-#| msgid ""
-#| "Linux Containers can be automatically started during system boot and shut "
-#| "down on reboot or halt."
msgid ""
"Linux Containers that have their configuration files copied or symlinked to "
"the /etc/lxc/auto directory can be automatically started during system boot, "
"and shut down on reboot or halt."
msgstr ""
-"Linuxcontainere kan automatisk igangsættes ved systemopstart og lukke ned "
-"ved genstart eller stop."
+"Linuxcontainere, som får deres konfigurationsfiler kopieret eller symbolsk "
+"henvist til mappen /etc/lxc/auto, kan automatisk igangsættes ved systemopstart "
+"og lukkes ned ved genstart eller stop."
#. Type: boolean
#. Description
#: ../lxc.templates:2001
msgid "If unsure, choose yes (default)."
-msgstr ""
+msgstr "Hvis i tvivl, så vælg ja »yes« (standard)."
#. Type: select
#. Description
#: ../lxc.templates:3001
-#, fuzzy
-#| msgid "Linux Containers (LXC) setup"
msgid "Linux Container: Shutdown method"
-msgstr "Opsætning af Linuxcontainere (LXC)"
+msgstr "Linuxcontainer: Metode for nedlukning"
#. Type: select
#. Description
@@ -67,6 +60,10 @@
"shutdown, which takes longer and can have problems with containers that "
"don't shutdown themselves properly."
msgstr ""
+"Linuxcontainere kan lukkes ned på forskellige måder. Stopmetoden "
+"terminerer alle processer inden i containeren. Stop-metoden initierer "
+"en nedlukning, som tager længere tid og kan have problemer med containere "
+"som ikke lukker sig selv ned korrekt."
#. Type: select
#. Description
@@ -75,12 +72,14 @@
"Unless you know that your containers don't shutdown properly, choose halt "
"(default)."
msgstr ""
+"Med mindre du ved, at dine containere ikke lukker korrekt ned, så vælg "
+"stop (standard)."
#. Type: string
#. Description
#: ../lxc.templates:4001
msgid "LXC directory:"
-msgstr ""
+msgstr "LXC-mappe:"
#. Type: string
#. Description
@@ -88,9 +87,10 @@
msgid ""
"Please specify the directory that will be used to store the Linux Containers."
msgstr ""
+"Angiv venligst mappen som vil blive brugt til at lagre Linuxcontainerne."
#. Type: string
#. Description
#: ../lxc.templates:4001
msgid "If unsure, use /var/lib/lxc (default)."
-msgstr ""
+msgstr "Hvis i tvivl, så brug /var/lib/lxc (standard)."
diff -Nru lxc-0.8.0~rc1/debian/po/ja.po lxc-0.8.0~rc1/debian/po/ja.po
--- lxc-0.8.0~rc1/debian/po/ja.po 1969-12-31 20:00:00.000000000 -0400
+++ lxc-0.8.0~rc1/debian/po/ja.po 2012-08-16 10:11:55.000000000 -0400
@@ -0,0 +1,86 @@
+# Japanese translation of lxc debconf templates.
+# Copyright (C) 2012 Kenshi Muto <kmuto@debian.org>
+# This file is distributed under the same license as the lxc package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: lxc\n"
+"Report-Msgid-Bugs-To: lxc@packages.debian.org\n"
+"POT-Creation-Date: 2012-02-09 13:08+0100\n"
+"PO-Revision-Date: 2012-07-29 08:00+0900\n"
+"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
+"Language-Team: debian-japanese <debian-japanese@lists.debian.org>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: title
+#. Description
+#: ../lxc.templates:1001
+msgid "Linux Containers: LXC setup"
+msgstr "Linux コンテナ: LXC のセットアップ"
+
+#. Type: boolean
+#. Description
+#: ../lxc.templates:2001
+msgid "Automatically start Linux Containers on boot?"
+msgstr "ブート時に Linux コンテナを自動で開始しますか?"
+
+#. Type: boolean
+#. Description
+#: ../lxc.templates:2001
+msgid ""
+"Linux Containers that have their configuration files copied or symlinked to "
+"the /etc/lxc/auto directory can be automatically started during system boot, "
+"and shut down on reboot or halt."
+msgstr "/etc/lxc/auto ディレクトリにその設定ファイルをコピーまたはシンボリックリンクされている Linux コンテナは、システムのブート時に自動で開始され、再起動あるいは停止時に自動でシャットダウンされます。"
+
+#. Type: boolean
+#. Description
+#: ../lxc.templates:2001
+msgid "If unsure, choose yes (default)."
+msgstr "よくわからなければこの質問に「はい」と答えてください (デフォルト)。"
+
+#. Type: select
+#. Description
+#: ../lxc.templates:3001
+msgid "Linux Container: Shutdown method"
+msgstr "Linux コンテナ: シャットダウンの方法"
+
+#. Type: select
+#. Description
+#: ../lxc.templates:3001
+msgid ""
+"Linux Containers can be shutdown in different ways. The stop method "
+"terminates all processes inside the container. The halt method initiates a "
+"shutdown, which takes longer and can have problems with containers that "
+"don't shutdown themselves properly."
+msgstr "Linux コンテナは異なる手法でシャットダウンできます。stop 手法はコンテナ内のすべてのプロセスをターミネートします。halt 手法は shutdown を呼び出しますが、これは stop 手法よりも長くかかり、正常にシャットダウンできないコンテナでは問題となる可能性があります。"
+
+#. Type: select
+#. Description
+#: ../lxc.templates:3001
+msgid ""
+"Unless you know that your containers don't shutdown properly, choose halt "
+"(default)."
+msgstr "コンテナが正常にシャットダウンされるか不明であれば、halt を選んでください (デフォルト)。"
+
+#. Type: string
+#. Description
+#: ../lxc.templates:4001
+msgid "LXC directory:"
+msgstr "LXC のディレクトリ:"
+
+#. Type: string
+#. Description
+#: ../lxc.templates:4001
+msgid ""
+"Please specify the directory that will be used to store the Linux Containers."
+msgstr "Linux コンテナを格納するのに利用するディレクトリを指定してください。"
+
+#. Type: string
+#. Description
+#: ../lxc.templates:4001
+msgid "If unsure, use /var/lib/lxc (default)."
+msgstr "よくわからなければ、/var/lib/lxc を使用してください (デフォルト)。"
diffstat for lxc-0.8.0~rc1 lxc-0.8.0~rc1
changelog | 12 ++++++++
po/cs.po | 27 ++++++-------------
po/da.po | 34 ++++++++++++------------
po/ja.po | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 124 insertions(+), 35 deletions(-)
diff -Nru lxc-0.8.0~rc1/debian/changelog lxc-0.8.0~rc1/debian/changelog
--- lxc-0.8.0~rc1/debian/changelog 2012-07-03 18:26:52.000000000 -0400
+++ lxc-0.8.0~rc1/debian/changelog 2012-08-22 11:14:34.000000000 -0400
@@ -1,3 +1,15 @@
+lxc (0.8.0~rc1-8.1) testing; urgency=low
+
+ * Non-maintainer upload.
+ * Adding updated Danish debconf translations from Joe Dalton
+ <joedalton2@yahoo.dk> (Closes: #684572).
+ * Adding updated Czech debconf translations from Michal Simunek
+ <michal.simunek@gmail.com> (Closes: #679681).
+ * Adding Japanese debconf translations from Kenshi Muto
+ <kmuto@debian.org> (Closes: #683123).
+
+ -- David Prévot <taffit@debian.org> Wed, 22 Aug 2012 11:14:26 -0400
+
lxc (0.8.0~rc1-8) unstable; urgency=low
* Removing comments in lxc-debconf debconf templates, apparently
diff -Nru lxc-0.8.0~rc1/debian/po/cs.po lxc-0.8.0~rc1/debian/po/cs.po
--- lxc-0.8.0~rc1/debian/po/cs.po 2012-07-03 18:29:51.000000000 -0400
+++ lxc-0.8.0~rc1/debian/po/cs.po 2012-08-22 10:57:38.000000000 -0400
@@ -1,13 +1,13 @@
# Czech translation of lxc debconf templates.
-# Copyright (C) 2011 Michal Simunek <michal.simunek@gmail.com>
+# Copyright (C) 2011-2012 Michal Simunek <michal.simunek@gmail.com>
# This file is distributed under the same license as the lxc package.
#
msgid ""
msgstr ""
-"Project-Id-Version: lxc 0.7.5-9\n"
+"Project-Id-Version: lxc 0.8.0~rc1-5\n"
"Report-Msgid-Bugs-To: lxc@packages.debian.org\n"
"POT-Creation-Date: 2012-02-09 13:08+0100\n"
-"PO-Revision-Date: 2011-11-17 17:31+0100\n"
+"PO-Revision-Date: 2011-06-30 14:31+0200\n"
"Last-Translator: Michal Simunek <michal.simunek@gmail.com>\n"
"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
"Language: cs\n"
@@ -48,29 +48,21 @@
#. Type: select
#. Description
#: ../lxc.templates:3001
-#, fuzzy
-#| msgid "Linux Container: Stop method"
msgid "Linux Container: Shutdown method"
-msgstr "Linuxový kontejner: Způsob zastavení"
+msgstr "Linuxový kontejner: Způsob ukončení"
#. Type: select
#. Description
#: ../lxc.templates:3001
-#, fuzzy
-#| msgid ""
-#| "Linux Containers can be stopped in different ways. The stop method kills "
-#| "all processes inside the container. The halt method initiates a shutdown, "
-#| "which takes longer and can have problems with containers that don't "
-#| "shutdown themselves properly."
msgid ""
"Linux Containers can be shutdown in different ways. The stop method "
"terminates all processes inside the container. The halt method initiates a "
"shutdown, which takes longer and can have problems with containers that "
"don't shutdown themselves properly."
msgstr ""
-"Linuxové kontejnery lze zastavit různými způsoby. Způsob stop zabije všechny "
-"procesy uvnitř kontejneru. Způsob halt zinicializuje vypnutí, které trvá "
-"delší dobu a může mít problémy s kontejnery, které se sami správně nevypnou."
+"Linuxové kontejnery lze ukončit různými způsoby. Způsob stop zabije všechny "
+"procesy uvnitř kontejneru. Způsob halt zinicializuje ukončení, které trvá "
+"delší dobu a může mít problémy s kontejnery, které se sami správně neukončí."
#. Type: select
#. Description
@@ -79,6 +71,8 @@
"Unless you know that your containers don't shutdown properly, choose halt "
"(default)."
msgstr ""
+"Pokud nevíte, zda se vaše kontejnery správně ukončí, zvolte halt "
+"(výchozí)"
#. Type: string
#. Description
@@ -100,6 +94,3 @@
#: ../lxc.templates:4001
msgid "If unsure, use /var/lib/lxc (default)."
msgstr "Nejste-li si jistí, použijte /var/lib/lxc (výchozí)."
-
-#~ msgid "If unsure, choose stop (default)."
-#~ msgstr "Nejste-li si jistí, zvolte stop (výchozí)."
diff -Nru lxc-0.8.0~rc1/debian/po/da.po lxc-0.8.0~rc1/debian/po/da.po
--- lxc-0.8.0~rc1/debian/po/da.po 2012-06-29 17:14:41.000000000 -0400
+++ lxc-0.8.0~rc1/debian/po/da.po 2012-08-22 10:57:38.000000000 -0400
@@ -1,5 +1,5 @@
# Danish translation of lxc debconf templates.
-# Copyright (C) 2011 Joe Hansen <joedalton2@yahoo.dk>
+# Copyright (C) 2011-2012 Joe Hansen <joedalton2@yahoo.dk>
# This file is distributed under the same license as the lxc package.
#
msgid ""
@@ -7,7 +7,7 @@
"Project-Id-Version: lxc\n"
"Report-Msgid-Bugs-To: lxc@packages.debian.org\n"
"POT-Creation-Date: 2012-02-09 13:08+0100\n"
-"PO-Revision-Date: 2011-10-23 17:30+01:00\n"
+"PO-Revision-Date: 2012-08-11 17:30+01:00\n"
"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
"Language: da\n"
@@ -18,10 +18,8 @@
#. Type: title
#. Description
#: ../lxc.templates:1001
-#, fuzzy
-#| msgid "Linux Containers (LXC) setup"
msgid "Linux Containers: LXC setup"
-msgstr "Opsætning af Linuxcontainere (LXC)"
+msgstr "Linuxcontainere: LXC-opsætning"
#. Type: boolean
#. Description
@@ -32,31 +30,26 @@
#. Type: boolean
#. Description
#: ../lxc.templates:2001
-#, fuzzy
-#| msgid ""
-#| "Linux Containers can be automatically started during system boot and shut "
-#| "down on reboot or halt."
msgid ""
"Linux Containers that have their configuration files copied or symlinked to "
"the /etc/lxc/auto directory can be automatically started during system boot, "
"and shut down on reboot or halt."
msgstr ""
-"Linuxcontainere kan automatisk igangsættes ved systemopstart og lukke ned "
-"ved genstart eller stop."
+"Linuxcontainere, som får deres konfigurationsfiler kopieret eller symbolsk "
+"henvist til mappen /etc/lxc/auto, kan automatisk igangsættes ved systemopstart "
+"og lukkes ned ved genstart eller stop."
#. Type: boolean
#. Description
#: ../lxc.templates:2001
msgid "If unsure, choose yes (default)."
-msgstr ""
+msgstr "Hvis i tvivl, så vælg ja »yes« (standard)."
#. Type: select
#. Description
#: ../lxc.templates:3001
-#, fuzzy
-#| msgid "Linux Containers (LXC) setup"
msgid "Linux Container: Shutdown method"
-msgstr "Opsætning af Linuxcontainere (LXC)"
+msgstr "Linuxcontainer: Metode for nedlukning"
#. Type: select
#. Description
@@ -67,6 +60,10 @@
"shutdown, which takes longer and can have problems with containers that "
"don't shutdown themselves properly."
msgstr ""
+"Linuxcontainere kan lukkes ned på forskellige måder. Stopmetoden "
+"terminerer alle processer inden i containeren. Stop-metoden initierer "
+"en nedlukning, som tager længere tid og kan have problemer med containere "
+"som ikke lukker sig selv ned korrekt."
#. Type: select
#. Description
@@ -75,12 +72,14 @@
"Unless you know that your containers don't shutdown properly, choose halt "
"(default)."
msgstr ""
+"Med mindre du ved, at dine containere ikke lukker korrekt ned, så vælg "
+"stop (standard)."
#. Type: string
#. Description
#: ../lxc.templates:4001
msgid "LXC directory:"
-msgstr ""
+msgstr "LXC-mappe:"
#. Type: string
#. Description
@@ -88,9 +87,10 @@
msgid ""
"Please specify the directory that will be used to store the Linux Containers."
msgstr ""
+"Angiv venligst mappen som vil blive brugt til at lagre Linuxcontainerne."
#. Type: string
#. Description
#: ../lxc.templates:4001
msgid "If unsure, use /var/lib/lxc (default)."
-msgstr ""
+msgstr "Hvis i tvivl, så brug /var/lib/lxc (standard)."
diff -Nru lxc-0.8.0~rc1/debian/po/ja.po lxc-0.8.0~rc1/debian/po/ja.po
--- lxc-0.8.0~rc1/debian/po/ja.po 1969-12-31 20:00:00.000000000 -0400
+++ lxc-0.8.0~rc1/debian/po/ja.po 2012-08-22 10:57:38.000000000 -0400
@@ -0,0 +1,86 @@
+# Japanese translation of lxc debconf templates.
+# Copyright (C) 2012 Kenshi Muto <kmuto@debian.org>
+# This file is distributed under the same license as the lxc package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: lxc\n"
+"Report-Msgid-Bugs-To: lxc@packages.debian.org\n"
+"POT-Creation-Date: 2012-02-09 13:08+0100\n"
+"PO-Revision-Date: 2012-07-29 08:00+0900\n"
+"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
+"Language-Team: debian-japanese <debian-japanese@lists.debian.org>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: title
+#. Description
+#: ../lxc.templates:1001
+msgid "Linux Containers: LXC setup"
+msgstr "Linux コンテナ: LXC のセットアップ"
+
+#. Type: boolean
+#. Description
+#: ../lxc.templates:2001
+msgid "Automatically start Linux Containers on boot?"
+msgstr "ブート時に Linux コンテナを自動で開始しますか?"
+
+#. Type: boolean
+#. Description
+#: ../lxc.templates:2001
+msgid ""
+"Linux Containers that have their configuration files copied or symlinked to "
+"the /etc/lxc/auto directory can be automatically started during system boot, "
+"and shut down on reboot or halt."
+msgstr "/etc/lxc/auto ディレクトリにその設定ファイルをコピーまたはシンボリックリンクされている Linux コンテナは、システムのブート時に自動で開始され、再起動あるいは停止時に自動でシャットダウンされます。"
+
+#. Type: boolean
+#. Description
+#: ../lxc.templates:2001
+msgid "If unsure, choose yes (default)."
+msgstr "よくわからなければこの質問に「はい」と答えてください (デフォルト)。"
+
+#. Type: select
+#. Description
+#: ../lxc.templates:3001
+msgid "Linux Container: Shutdown method"
+msgstr "Linux コンテナ: シャットダウンの方法"
+
+#. Type: select
+#. Description
+#: ../lxc.templates:3001
+msgid ""
+"Linux Containers can be shutdown in different ways. The stop method "
+"terminates all processes inside the container. The halt method initiates a "
+"shutdown, which takes longer and can have problems with containers that "
+"don't shutdown themselves properly."
+msgstr "Linux コンテナは異なる手法でシャットダウンできます。stop 手法はコンテナ内のすべてのプロセスをターミネートします。halt 手法は shutdown を呼び出しますが、これは stop 手法よりも長くかかり、正常にシャットダウンできないコンテナでは問題となる可能性があります。"
+
+#. Type: select
+#. Description
+#: ../lxc.templates:3001
+msgid ""
+"Unless you know that your containers don't shutdown properly, choose halt "
+"(default)."
+msgstr "コンテナが正常にシャットダウンされるか不明であれば、halt を選んでください (デフォルト)。"
+
+#. Type: string
+#. Description
+#: ../lxc.templates:4001
+msgid "LXC directory:"
+msgstr "LXC のディレクトリ:"
+
+#. Type: string
+#. Description
+#: ../lxc.templates:4001
+msgid ""
+"Please specify the directory that will be used to store the Linux Containers."
+msgstr "Linux コンテナを格納するのに利用するディレクトリを指定してください。"
+
+#. Type: string
+#. Description
+#: ../lxc.templates:4001
+msgid "If unsure, use /var/lib/lxc (default)."
+msgstr "よくわからなければ、/var/lib/lxc を使用してください (デフォルト)。"
Reply to: