From 553338441418935cfe76db0c90a8fa58f12cfa37 Mon Sep 17 00:00:00 2001 From: holyfei Date: Sun, 1 Nov 2020 21:03:25 +0800 Subject: [PATCH] kata-containers: disable netmon by default reason: disable netmon by default, user can modify the enable_netmon config to enable netmon components. Signed-off-by: holyfei --- scripts/make_default_configuration.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/make_default_configuration.sh b/scripts/make_default_configuration.sh index 1cd5d61..c998c46 100755 --- a/scripts/make_default_configuration.sh +++ b/scripts/make_default_configuration.sh @@ -27,13 +27,12 @@ sed -i 's/^#enable_blk_mount/enable_blk_mount/' $KATA_CONFIG_PATH sed -i 's#/usr/libexec/kata-containers/kata-proxy#/usr/bin/kata-proxy#' $KATA_CONFIG_PATH sed -i 's#/usr/libexec/kata-containers/kata-shim#/usr/bin/kata-shim#' $KATA_CONFIG_PATH sed -i 's#/usr/libexec/kata-containers/kata-netmon#/usr/bin/kata-netmon#' $KATA_CONFIG_PATH -sed -i 's/^#enable_netmon/enable_netmon/' $KATA_CONFIG_PATH sed -i 's/^#disable_new_netns/disable_new_netns/' $KATA_CONFIG_PATH sed -i 's/^#disable_vhost_net/disable_vhost_net/' $KATA_CONFIG_PATH sed -i 's/^#block_device_cache_set/block_device_cache_set/' $KATA_CONFIG_PATH sed -i 's/^#block_device_cache_direct/block_device_cache_direct/' $KATA_CONFIG_PATH sed -i 's#path = \"/usr/bin/qemu-.*\"#path = \"/usr/bin/qemu-kvm\"#' $KATA_CONFIG_PATH -sed -i 's/^internetworking_model.*$/internetworking_model=\"bridged\"/' $KATA_CONFIG_PATH +sed -i 's/^internetworking_model.*$/internetworking_model = \"none\"/' $KATA_CONFIG_PATH if [ "$ARCH" == "aarch64" ];then sed -i 's/^machine_type.*$/machine_type = \"virt\"/' $KATA_CONFIG_PATH -- 2.11.0