[lxc-devel] [lxc/master] Sabayon fixes

[stgraber on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 301 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20180216/8f659846/attachment.bin>
-------------- next part --------------
From 9bf5cd8dbb11075d8395192be78e3bf251517873 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Fri, 16 Feb 2018 16:49:02 -0500
Subject: [PATCH 1/2] lxc-sabayon: Remove broken/unused code
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 templates/lxc-sabayon.in | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/templates/lxc-sabayon.in b/templates/lxc-sabayon.in
index fb9e62f58..14200e8ac 100644
--- a/templates/lxc-sabayon.in
+++ b/templates/lxc-sabayon.in
@@ -264,14 +264,6 @@ systemd_container_tuning () {
     # /usr/lib/systemd/system-generators/gentoo-local-generator: line 4: cd: /etc/local.d: No such file or directory
     mkdir ${rootfs}/etc/local.d/
 
-   # Fix TERM variable for container console
-   mkdir container-getty\@0.service.d
-   cat <<EOF > container-getty\@0.service.d/00gentoo.conf
-[Service]
-Environment=TERM=
-Environment=TERM=linux
-EOF
-
     return 0
 }
 

From 59ee28f21d2fa4a43bf0bfa50ec9c63a6181264b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Fri, 16 Feb 2018 16:50:45 -0500
Subject: [PATCH 2/2] lxc-sabayon: Fix handling of eth0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 templates/lxc-sabayon.in | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/templates/lxc-sabayon.in b/templates/lxc-sabayon.in
index 14200e8ac..51594c189 100644
--- a/templates/lxc-sabayon.in
+++ b/templates/lxc-sabayon.in
@@ -264,6 +264,13 @@ systemd_container_tuning () {
     # /usr/lib/systemd/system-generators/gentoo-local-generator: line 4: cd: /etc/local.d: No such file or directory
     mkdir ${rootfs}/etc/local.d/
 
+    mkdir ${rootfs}/etc/systemd/system/NetworkManager.service.d/
+    cat <<EOF > ${rootfs}/etc/systemd/system/NetworkManager.service.d/override.conf
+[Service]
+ExecStartPre=-/bin/ip -4 link set dev eth0 down
+EOF
+    chmod 644 ${rootfs}/etc/systemd/system/NetworkManager.service.d/override.conf
+
     return 0
 }