From e894b84102cf8265fff44a8da1964767f0ed1555 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Thu, 14 Mar 2024 23:29:55 +0100 Subject: [PATCH] Fix broken commit --- conf/dnsmasq.conf | 2 ++ manifest.toml | 13 ------------- 2 files changed, 2 insertions(+), 13 deletions(-) create mode 100644 conf/dnsmasq.conf diff --git a/conf/dnsmasq.conf b/conf/dnsmasq.conf new file mode 100644 index 0000000..1acc3fd --- /dev/null +++ b/conf/dnsmasq.conf @@ -0,0 +1,2 @@ +bind-interfaces +except-interface=incusbr0 diff --git a/manifest.toml b/manifest.toml index d448f04..c550871 100644 --- a/manifest.toml +++ b/manifest.toml @@ -16,10 +16,7 @@ license = "Apache-2.0" website = "https://linuxcontainers.org/incus/" admindoc = "https://linuxcontainers.org/incus/docs/main/" code = "https://github.com/lxc/incus" -<<<<<<< Updated upstream -======= # cpe = "" ->>>>>>> Stashed changes [integration] yunohost = '>= 11.2' @@ -34,20 +31,10 @@ ram.runtime = "50M" [install] [resources] -<<<<<<< Updated upstream - # Do NOT handle system_user, deb package will # [resources.system_user] # [resources.install_dir] -======= - [resources.system_user] - - [resources.install_dir] - - [resources.data_dir] - # TODO: incus actual data dir ->>>>>>> Stashed changes # Do NOT handle /var/lib, deb package will # [resources.data_dir]