From 76a9542cd94d6ff00a8635915b351b7588abe831 Mon Sep 17 00:00:00 2001 From: Christophe de Dinechin Date: Fri, 23 Oct 2020 08:27:00 +0200 Subject: [PATCH] config: Make configuration file comments consistent During review, Julio Montes pointed out that there was some missing text in the comments for configuration-xyz.toml.in relative to the virtiofs version. Fixes: #3005 Suggested-by: Julio Montes Signed-off-by: Christophe de Dinechin --- cli/config/configuration-acrn.toml.in | 2 ++ cli/config/configuration-clh.toml.in | 2 ++ cli/config/configuration-fc.toml.in | 2 ++ cli/config/configuration-qemu.toml.in | 2 ++ 4 files changed, 8 insertions(+) diff --git a/cli/config/configuration-acrn.toml.in b/cli/config/configuration-acrn.toml.in index 1ca35ea982..6ecdd62fb8 100644 --- a/cli/config/configuration-acrn.toml.in +++ b/cli/config/configuration-acrn.toml.in @@ -19,6 +19,8 @@ image = "@IMAGEPATH@" # List of valid annotation names for the hypervisor # Each member of the list is a regular expression, which is the base name # of the annotation, e.g. "path" for io.katacontainers.config.hypervisor.path" +# The default if not set is empty (all annotations rejected.) +# Your distribution recommends: @DEFENABLEANNOTATIONS@ enable_annotations = @DEFENABLEANNOTATIONS@ # List of valid annotations values for the hypervisor diff --git a/cli/config/configuration-clh.toml.in b/cli/config/configuration-clh.toml.in index 8722fbe303..997d2c8661 100644 --- a/cli/config/configuration-clh.toml.in +++ b/cli/config/configuration-clh.toml.in @@ -18,6 +18,8 @@ image = "@IMAGEPATH@" # List of valid annotation names for the hypervisor # Each member of the list is a regular expression, which is the base name # of the annotation, e.g. "path" for io.katacontainers.config.hypervisor.path" +# The default if not set is empty (all annotations rejected.) +# Your distribution recommends: @DEFENABLEANNOTATIONS@ enable_annotations = @DEFENABLEANNOTATIONS@ # List of valid annotations values for the hypervisor diff --git a/cli/config/configuration-fc.toml.in b/cli/config/configuration-fc.toml.in index 77b6500722..871b73e87b 100644 --- a/cli/config/configuration-fc.toml.in +++ b/cli/config/configuration-fc.toml.in @@ -18,6 +18,8 @@ image = "@IMAGEPATH@" # List of valid annotation names for the hypervisor # Each member of the list is a regular expression, which is the base name # of the annotation, e.g. "path" for io.katacontainers.config.hypervisor.path" +# The default if not set is empty (all annotations rejected.) +# Your distribution recommends: @DEFENABLEANNOTATIONS@ enable_annotations = @DEFENABLEANNOTATIONS@ # List of valid annotations values for the hypervisor diff --git a/cli/config/configuration-qemu.toml.in b/cli/config/configuration-qemu.toml.in index 89745ca2eb..d3a9d3364d 100644 --- a/cli/config/configuration-qemu.toml.in +++ b/cli/config/configuration-qemu.toml.in @@ -20,6 +20,8 @@ machine_type = "@MACHINETYPE@" # List of valid annotation names for the hypervisor # Each member of the list is a regular expression, which is the base name # of the annotation, e.g. "path" for io.katacontainers.config.hypervisor.path" +# The default if not set is empty (all annotations rejected.) +# Your distribution recommends: @DEFENABLEANNOTATIONS@ enable_annotations = @DEFENABLEANNOTATIONS@ # List of valid annotations values for the hypervisor