From: Mingli Yu <mingli...@windriver.com> Remove deprecated options in lxc*.service to silence below warning: # systemctl status lxc [snip] /usr/lib/systemd/system/lxc.service:17: Standard output type syslog is obsolete, automatically updating to journal. Please update your unit file, and consider removing the setting altogether. /usr/lib/systemd/system/lxc.service:18: Standard output type syslog is obsolete, automatically updating to journal. Please update your unit file, and consider removing the setting altogether.
Signed-off-by: Mingli Yu <mingli...@windriver.com> --- ...setting-regarding-the-Standard-Outpu.patch | 35 +++++++++++++++++++ ...ed-options-in-lxc.service-fixes-3527.patch | 31 ++++++++++++++++ recipes-containers/lxc/lxc_4.0.4.bb | 2 ++ 3 files changed, 68 insertions(+) create mode 100644 recipes-containers/lxc/files/0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch create mode 100644 recipes-containers/lxc/files/0001-remove-deprecated-options-in-lxc.service-fixes-3527.patch diff --git a/recipes-containers/lxc/files/0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch b/recipes-containers/lxc/files/0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch new file mode 100644 index 0000000..ab97422 --- /dev/null +++ b/recipes-containers/lxc/files/0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch @@ -0,0 +1,35 @@ +From a7a92a06a47322dee45664db5c7bfa68b2b95edb Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli...@windriver.com> +Date: Wed, 23 Sep 2020 07:03:02 +0000 +Subject: [PATCH] Remove obsolete setting regarding the Standard Output + +The Standard output type "syslog" is obsolete, causing a warning since systemd +version 246 [1]. + +Please consider using "journal" or "journal+console" + +[1] https://github.com/systemd/systemd/blob/master/NEWS#L202 + +Upstream-Status: Submitted [https://github.com/lxc/lxc/pull/3541] + +Signed-off-by: Mingli Yu <mingli...@windriver.com> +--- + config/init/systemd/l...@.service.in | 2 -- + 1 files changed, 2 deletions(-) + +diff --git a/config/init/systemd/l...@.service.in b/config/init/systemd/l...@.service.in +index a2aa2211f..21ce64aef 100644 +--- a/config/init/systemd/l...@.service.in ++++ b/config/init/systemd/l...@.service.in +@@ -14,8 +14,6 @@ ExecStop=@BINDIR@/lxc-stop -n %i + # Environment=BOOTUP=serial + # Environment=CONSOLETYPE=serial + Delegate=yes +-StandardOutput=syslog +-StandardError=syslog + + [Install] + WantedBy=multi-user.target +-- +2.26.2 + diff --git a/recipes-containers/lxc/files/0001-remove-deprecated-options-in-lxc.service-fixes-3527.patch b/recipes-containers/lxc/files/0001-remove-deprecated-options-in-lxc.service-fixes-3527.patch new file mode 100644 index 0000000..2957680 --- /dev/null +++ b/recipes-containers/lxc/files/0001-remove-deprecated-options-in-lxc.service-fixes-3527.patch @@ -0,0 +1,31 @@ +From 0c4cd88d4a19d27ba9b5d2c8fa4d482d78211c35 Mon Sep 17 00:00:00 2001 +From: graysky <gray...@archlinux.us> +Date: Fri, 21 Aug 2020 06:33:49 -0400 +Subject: [PATCH] remove deprecated options in lxc.service fixes #3527 + +Remove deprecated options in lxc.service fixes #3527 + +Upstream-Status: Backport + +Signed-off-by: graysky <gray...@archlinux.us> +Signed-off-by: Mingli Yu <mingli...@windriver.com> +--- + config/init/systemd/lxc.service.in | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/config/init/systemd/lxc.service.in b/config/init/systemd/lxc.service.in +index e3745dc2d..397a6c4d0 100644 +--- a/config/init/systemd/lxc.service.in ++++ b/config/init/systemd/lxc.service.in +@@ -14,8 +14,6 @@ ExecReload=@LIBEXECDIR@/lxc/lxc-apparmor-load + # Environment=BOOTUP=serial + # Environment=CONSOLETYPE=serial + Delegate=yes +-StandardOutput=syslog +-StandardError=syslog + + [Install] + WantedBy=multi-user.target +-- +2.26.2 + diff --git a/recipes-containers/lxc/lxc_4.0.4.bb b/recipes-containers/lxc/lxc_4.0.4.bb index f526ab9..4ef5fc0 100644 --- a/recipes-containers/lxc/lxc_4.0.4.bb +++ b/recipes-containers/lxc/lxc_4.0.4.bb @@ -47,6 +47,8 @@ SRC_URI = "http://linuxcontainers.org/downloads/${BPN}-${PV}.tar.gz \ file://templates-use-curl-instead-of-wget.patch \ file://tests-our-init-is-not-busybox.patch \ file://tests-add-no-validate-when-using-download-template.patch \ + file://0001-remove-deprecated-options-in-lxc.service-fixes-3527.patch \ + file://0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch \ file://dnsmasq.conf \ file://lxc-net \ " -- 2.26.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#5877): https://lists.yoctoproject.org/g/meta-virtualization/message/5877 Mute This Topic: https://lists.yoctoproject.org/mt/77188710/21656 Group Owner: meta-virtualization+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
