diff options
| author | Manuel Bentele | 2021-06-29 13:33:04 +0200 |
|---|---|---|
| committer | Manuel Bentele | 2021-06-29 13:33:04 +0200 |
| commit | 23486acf692f07b2bcee9d5a85c7288b9a9986f3 (patch) | |
| tree | c11fddff185f91e7c788a3dbde7c5dbd8d14d74e | |
| parent | Merge branch 'master' into installer (diff) | |
| parent | [libvirt] Remove default network (diff) | |
| download | mltk-23486acf692f07b2bcee9d5a85c7288b9a9986f3.tar.gz mltk-23486acf692f07b2bcee9d5a85c7288b9a9986f3.tar.xz mltk-23486acf692f07b2bcee9d5a85c7288b9a9986f3.zip | |
Merge branch 'master' into installer
| -rw-r--r-- | core/modules/libvirt/module.build | 4 | ||||
| -rw-r--r-- | core/modules/libvirt/module.conf.debian | 2 | ||||
| -rw-r--r-- | core/modules/libvirt/module.conf.ubuntu | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/core/modules/libvirt/module.build b/core/modules/libvirt/module.build index dd868159..730af022 100644 --- a/core/modules/libvirt/module.build +++ b/core/modules/libvirt/module.build @@ -9,6 +9,6 @@ build() { post_copy() { # remove default network configuration - rm "${MODULE_BUILD_DIR}/etc/libvirt/qemu/networks/default.xml" - rm "${MODULE_BUILD_DIR}/etc/libvirt/qemu/networks/autostart/default.xml" + rm "/etc/libvirt/qemu/networks/default.xml" + rm "/etc/libvirt/qemu/networks/autostart/default.xml" } diff --git a/core/modules/libvirt/module.conf.debian b/core/modules/libvirt/module.conf.debian index 84be983c..4ff2138c 100644 --- a/core/modules/libvirt/module.conf.debian +++ b/core/modules/libvirt/module.conf.debian @@ -4,6 +4,7 @@ REQUIRED_INSTALLED_PACKAGES=" libvirt-daemon libvirt-clients ebtables + dnsmasq " REQUIRED_CONTENT_PACKAGES=" @@ -11,4 +12,5 @@ REQUIRED_CONTENT_PACKAGES=" libvirt-daemon libvirt-clients ebtables + dnsmasq " diff --git a/core/modules/libvirt/module.conf.ubuntu b/core/modules/libvirt/module.conf.ubuntu index 84be983c..4ff2138c 100644 --- a/core/modules/libvirt/module.conf.ubuntu +++ b/core/modules/libvirt/module.conf.ubuntu @@ -4,6 +4,7 @@ REQUIRED_INSTALLED_PACKAGES=" libvirt-daemon libvirt-clients ebtables + dnsmasq " REQUIRED_CONTENT_PACKAGES=" @@ -11,4 +12,5 @@ REQUIRED_CONTENT_PACKAGES=" libvirt-daemon libvirt-clients ebtables + dnsmasq " |