[lxc-devel] [PATCH] lxc-create: Improve the layout of the config

Serge Hallyn serge.hallyn at canonical.com
Mon Feb 11 03:13:26 UTC 2013


Quoting Stéphane Graber (stgraber at ubuntu.com):
> This simply adds an extra blank line between the original lxc config
> and the template generated options.
> 
> In typical use cases, this means that we'll now get the header, then
> a blank line, then default.conf content, then a blank line and finally
> the template generated config.
> 
> The wording of the header is also changed slightly so that it fits in
> the usual 80 columns.
> 
> Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>

Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>

> ---
>  src/lxc/lxc-create.in | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/src/lxc/lxc-create.in b/src/lxc/lxc-create.in
> index 18f3d11..26ca580 100644
> --- a/src/lxc/lxc-create.in
> +++ b/src/lxc/lxc-create.in
> @@ -300,11 +300,12 @@ if [ ! -z "$lxc_template" ]; then
>      if [ -n "$*" ]; then
>          echo "# Parameters passed to the template: $*" >> $lxc_path/$lxc_name/config
>      fi
> -    echo "# Checksum of the template script (SHA-1): $sum" >> $lxc_path/$lxc_name/config
> +    echo "# Template script checksum (SHA-1): $sum" >> $lxc_path/$lxc_name/config
>      echo "" >> $lxc_path/$lxc_name/config
>  fi
>  
>  cat $lxc_config >> $lxc_path/$lxc_name/config

Say, I think it might be worth a round of patches just to quote all
these filenames (in case, say, someone uses "$HOME/My Containers" as
their lxcpath :)

If anyone feels bored...

> +echo "" >> $lxc_path/$lxc_name/config
>  
>  if [ -n "$custom_rootfs" ]; then
>      if grep -q "lxc.rootfs" $lxc_path/$lxc_name/config ; then
> -- 
> 1.8.1.2
> 
> 
> ------------------------------------------------------------------------------
> Free Next-Gen Firewall Hardware Offer
> Buy your Sophos next-gen firewall before the end March 2013 
> and get the hardware for free! Learn more.
> http://p.sf.net/sfu/sophos-d2d-feb
> _______________________________________________
> Lxc-devel mailing list
> Lxc-devel at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/lxc-devel




More information about the lxc-devel mailing list