diff --git a/tests/cli-test-xml/compare/virt-install-fs-default.xml b/tests/cli-test-xml/compare/virt-install-fs-default.xml index 9ab649dbf..7344fc4c6 100644 --- a/tests/cli-test-xml/compare/virt-install-fs-default.xml +++ b/tests/cli-test-xml/compare/virt-install-fs-default.xml @@ -1,8 +1,8 @@ foolxc 00000000-1111-2222-3333-444444444444 - 65536 - 65536 + 131072 + 131072 1 exe diff --git a/tests/clitest.py b/tests/clitest.py index 1ee547d58..530ae275c 100644 --- a/tests/clitest.py +++ b/tests/clitest.py @@ -1029,11 +1029,11 @@ c.add_compare("--connect %(URI-KVM)s --arch x86_64", "x86_64-graphics") # LXC specific tests # ###################### -c = vinst.add_category("lxc", "--name foolxc --memory 64 --noautoconsole --connect " + utils.URIs.lxc) +c = vinst.add_category("lxc", "--name foolxc --noautoconsole --connect " + utils.URIs.lxc) c.add_invalid("--filesystem /,not/abs") # filesystem target is not absolute c.add_compare("", "default") c.add_compare("--os-variant fedora27", "default-f27") -c.add_compare("--filesystem /source,/", "fs-default") +c.add_compare("--filesystem /source,/ --memory 128", "fs-default") c.add_compare("--init /usr/bin/httpd", "manual-init") diff --git a/virt-install b/virt-install index e5fbe050b..05d3aaef4 100755 --- a/virt-install +++ b/virt-install @@ -454,6 +454,11 @@ def set_cli_defaults(options, guest): guest.name = default_name if guest.os.is_container(): + if not memory_specified(guest): + # LXC doesn't even do anything with memory settings, but libvirt + # XML requires it anyways. Fill in 64 MiB + log.debug("Setting container default --memory 64") + guest.currentMemory = 64 // 1024 return if (options.unattended and