[SCM] live-debconfig branch, debian-next, updated. debian/3.0_a1-1-9-g48f786b

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 69d5113757174111a3b390039fb65340cbfa589c
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Jul 21 18:00:23 2012 +0200

    Updating wrapping in debconf templates files.

diff --git a/scripts/debconfig/0020-ifupdown.templates b/scripts/debconfig/0020-ifupdown.templates
index 4e79b28..23e2416 100644
--- a/scripts/debconfig/0020-ifupdown.templates
+++ b/scripts/debconfig/0020-ifupdown.templates
@@ -9,7 +9,8 @@ Default: dhcp
 Description: live-debconfig: Interface Method?
  What method should be used to configure the interface?
  .
- This defaults to dhcp and will require that you run a dhcp-server in your network.
+ This defaults to dhcp and will require that you run a dhcp-server in your
+ network.
 
 Template: live-debconfig/ifupdown/eth0-comment
 Type: string
diff --git a/scripts/debconfig/0030-sysvinit.templates b/scripts/debconfig/0030-sysvinit.templates
index 5b89d23..58fe618 100644
--- a/scripts/debconfig/0030-sysvinit.templates
+++ b/scripts/debconfig/0030-sysvinit.templates
@@ -20,8 +20,9 @@ Description: live-debconfig: How many consoles for LXC?
 
 Template: live-debconfig/sysvinit/lxc-disable-services
 Type: string
-Default: checkroot.sh hwclockfirst.sh hwclock.sh module-init-tools umountfs umountroot
+Default: checkroot.sh hwclockfirst.sh hwclock.sh module-init-tools umountfsumountroot
 Description: live-debconfig: Which services to disable for LXC?
  Some services are not useful in containers and should be disabled.
  .
- This defaults to checkroot.sh hwclockfirst.sh hwclock.sh module-init-tools umountfs umountroot.
+ This defaults to checkroot.sh hwclockfirst.sh hwclock.sh module-init-tools
+ umountfs umountroot.

-- 
live-debconfig