Skip to content
Snippets Groups Projects
Verified Commit 1406e28c authored by Tomas Zak's avatar Tomas Zak
Browse files

packages: lxc: fixed patch for setting default network parameters

In new lxc version old settings for network were not applied.
Modified current patch for applying right network parameters.
parent 710a65a7
Branches hotfix/lxc-default-settings
Tags
1 merge request!698packages: lxc: fixed patch for setting default network parameters
Pipeline #122624 passed with stages
in 9 minutes and 37 seconds
...@@ -7,8 +7,8 @@ Signed-off-by: Michal Hrusecky <Michal@Hrusecky.net> ...@@ -7,8 +7,8 @@ Signed-off-by: Michal Hrusecky <Michal@Hrusecky.net>
--- ---
utils/lxc/Makefile | 1 + utils/lxc/Makefile | 1 +
utils/lxc/files/systemd-workaround | 4 +++ utils/lxc/files/systemd-workaround | 4 +++
utils/lxc/patches/030-turris-servers.patch | 31 ++++++++++++++++++++++ utils/lxc/patches/030-turris-servers.patch | 44 ++++++++++++++++++++++
3 files changed, 36 insertions(+) 3 files changed, 49 insertions(+)
create mode 100644 utils/lxc/files/systemd-workaround create mode 100644 utils/lxc/files/systemd-workaround
create mode 100644 utils/lxc/patches/030-turris-servers.patch create mode 100644 utils/lxc/patches/030-turris-servers.patch
...@@ -36,10 +36,10 @@ index 000000000..2e343dc68 ...@@ -36,10 +36,10 @@ index 000000000..2e343dc68
+} +}
diff --git a/utils/lxc/patches/030-turris-servers.patch b/utils/lxc/patches/030-turris-servers.patch diff --git a/utils/lxc/patches/030-turris-servers.patch b/utils/lxc/patches/030-turris-servers.patch
new file mode 100644 new file mode 100644
index 000000000..dae81378a index 000000000..4fd5c0956
--- /dev/null --- /dev/null
+++ b/utils/lxc/patches/030-turris-servers.patch +++ b/utils/lxc/patches/030-turris-servers.patch
@@ -0,0 +1,31 @@ @@ -0,0 +1,46 @@
+--- a/config/etc/default.conf.unknown +--- a/config/etc/default.conf.unknown
++++ b/config/etc/default.conf.unknown ++++ b/config/etc/default.conf.unknown
+@@ -1 +1,9 @@ +@@ -1 +1,9 @@
...@@ -53,6 +53,20 @@ index 000000000..dae81378a ...@@ -53,6 +53,20 @@ index 000000000..dae81378a
++lxc.hook.start-host = /usr/share/lxc/hooks/systemd-workaround ++lxc.hook.start-host = /usr/share/lxc/hooks/systemd-workaround
++# Template to generate fixed MAC address ++# Template to generate fixed MAC address
++lxc.net.0.hwaddr = x2:xx:xx:xx:xx:xx ++lxc.net.0.hwaddr = x2:xx:xx:xx:xx:xx
+--- a/config/etc/default.conf.lxcbr
++++ b/config/etc/default.conf.lxcbr
+@@ -1,4 +1,9 @@
+ lxc.net.0.type = veth
+-lxc.net.0.link = lxcbr0
++lxc.net.0.link = br-lan
+ lxc.net.0.flags = up
+-lxc.net.0.hwaddr = 00:16:3e:xx:xx:xx
++lxc.net.0.name = eth0
++# # Some workarounds
++lxc.include = /usr/share/lxc/config/common.conf
++lxc.hook.start-host = /usr/share/lxc/hooks/systemd-workaround
++# Template to generate fixed MAC address
++lxc.net.0.hwaddr = x2:xx:xx:xx:xx:xx
+--- a/templates/lxc-download.in +--- a/templates/lxc-download.in
++++ b/templates/lxc-download.in ++++ b/templates/lxc-download.in
+@@ -30,13 +30,13 @@ DOWNLOAD_ARCH= +@@ -30,13 +30,13 @@ DOWNLOAD_ARCH=
...@@ -70,7 +84,8 @@ index 000000000..dae81378a ...@@ -70,7 +84,8 @@ index 000000000..dae81378a
++DOWNLOAD_SERVER="$(uci get lxc.lxc.url 2> /dev/null || echo repo.turris.cz/lxc)" ++DOWNLOAD_SERVER="$(uci get lxc.lxc.url 2> /dev/null || echo repo.turris.cz/lxc)"
+ DOWNLOAD_TARGET="system" + DOWNLOAD_TARGET="system"
+ DOWNLOAD_URL= + DOWNLOAD_URL=
+ DOWNLOAD_USE_CACHE="false" + DOWNLOAD_USE_CACHE="false"
+
-- --
2.40.1 2.40.1
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment