]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
Simplify information message
authorDaniel Baumann <daniel.baumann@progress-technologies.net>
Tue, 31 Jul 2012 14:01:21 +0000 (16:01 +0200)
committerDaniel Lezcano <daniel.lezcano@free.fr>
Tue, 31 Jul 2012 14:01:21 +0000 (16:01 +0200)
Keeping creation of new containers without previously existing configuration
non-interactive and trimm the warning message.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
src/lxc/lxc-create.in

index bd9a438ce6e50692dca88a2950fcc4dab8babcec..acbd4cf9c87df51813774c7a4fc75754c0e9d804 100644 (file)
@@ -266,29 +266,10 @@ if [ ! -z $lxc_template ]; then
     fi
 
     if [ -z "$lxc_config" ]; then
-       echo
-       echo "Warning:"
-       echo "-------"
-       echo "Usually the template option is called with a configuration"
+       echo "Note: Usually the template option is called with a configuration"
        echo "file option too, mostly to configure the network."
-       echo "eg. lxc-create -n foo -f lxc.conf -t debian"
-       echo "The configuration file is often:"
-       echo
-       echo "lxc.network.type=macvlan"
-       echo "lxc.network.link=eth0"
-       echo "lxc.network.flags=up"
-       echo
-       echo "or alternatively:"
-       echo
-       echo "lxc.network.type=veth"
-       echo "lxc.network.link=br0"
-       echo "lxc.network.flags=up"
-       echo
        echo "For more information look at lxc.conf (5)"
        echo
-       echo "At this point, I assume you know what you do."
-       echo "Press <enter> to continue ..."
-       read dummy
     fi
 
     ${templatedir}/lxc-$lxc_template --path=$lxc_path/$lxc_name --name=$lxc_name $*