From: Stéphane Graber <stgraber@ubuntu.com>
Date: Sat, 9 Feb 2013 19:52:12 +0000 (-0500)
Subject: lxc-create: Improve the layout of the config
X-Git-Tag: lxc-0.9.0.alpha3~1^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=35fef4e6c96b132c317994beb77817949c8c1808;p=thirdparty%2Flxc.git

lxc-create: Improve the layout of the config

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@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/lxc/lxc-create.in b/src/lxc/lxc-create.in
index 18f3d11bd..26ca5800d 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
+echo "" >> $lxc_path/$lxc_name/config
 
 if [ -n "$custom_rootfs" ]; then
     if grep -q "lxc.rootfs" $lxc_path/$lxc_name/config ; then