[lxc-devel] [PATCH 2/2] Fold dnsmasq command line in lxc-net.in
Serge Hallyn
serge.hallyn at ubuntu.com
Tue Dec 8 15:43:05 UTC 2015
Quoting TAMUKI Shoichi (tamuki at linet.gr.jp):
> Fold dnsmasq command line at about 80 chars because the line is too
> long.
>
> Signed-off-by: TAMUKI Shoichi <tamuki at linet.gr.jp>
Normally I don't like whitespace-only patches, but this does
make it much more readable.
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>
> ---
> config/init/common/lxc-net.in | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/config/init/common/lxc-net.in b/config/init/common/lxc-net.in
> index efe64c1..d457e78 100644
> --- a/config/init/common/lxc-net.in
> +++ b/config/init/common/lxc-net.in
> @@ -124,7 +124,13 @@ start() {
> fi
> done
>
> - dnsmasq $LXC_DHCP_CONFILE_ARG $LXC_DOMAIN_ARG -u ${DNSMASQ_USER} --strict-order --bind-interfaces --pid-file="${varrun}"/dnsmasq.pid --listen-address ${LXC_ADDR} --dhcp-range ${LXC_DHCP_RANGE} --dhcp-lease-max=${LXC_DHCP_MAX} --dhcp-no-override --except-interface=lo --interface=${LXC_BRIDGE} --dhcp-leasefile="${varlib}"/misc/dnsmasq.${LXC_BRIDGE}.leases --dhcp-authoritative $LXC_IPV6_ARG || cleanup
> + dnsmasq $LXC_DHCP_CONFILE_ARG $LXC_DOMAIN_ARG -u ${DNSMASQ_USER} \
> + --strict-order --bind-interfaces --pid-file="${varrun}"/dnsmasq.pid \
> + --listen-address ${LXC_ADDR} --dhcp-range ${LXC_DHCP_RANGE} \
> + --dhcp-lease-max=${LXC_DHCP_MAX} --dhcp-no-override \
> + --except-interface=lo --interface=${LXC_BRIDGE} \
> + --dhcp-leasefile="${varlib}"/misc/dnsmasq.${LXC_BRIDGE}.leases \
> + --dhcp-authoritative $LXC_IPV6_ARG || cleanup
>
> touch "${varrun}"/network_up
> FAILED=0
> --
> 2.2.1
> _______________________________________________
> lxc-devel mailing list
> lxc-devel at lists.linuxcontainers.org
> http://lists.linuxcontainers.org/listinfo/lxc-devel
More information about the lxc-devel
mailing list