From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 12681138C9D for ; Tue, 2 Jun 2015 18:14:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8BF06E082B; Tue, 2 Jun 2015 18:14:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3F886E082B for ; Tue, 2 Jun 2015 18:14:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 05F06340CE0 for ; Tue, 2 Jun 2015 18:14:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1712BA0A for ; Tue, 2 Jun 2015 18:14:16 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1433268664.b209fe3859c05c286037843bb34058f849c54b15.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: init.d/ X-VCS-Repository: proj/openrc X-VCS-Files: init.d/bootmisc.in X-VCS-Directories: init.d/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: b209fe3859c05c286037843bb34058f849c54b15 X-VCS-Branch: master Date: Tue, 2 Jun 2015 18:14:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 98fa6e8c-4afa-4b10-92b6-3b2f275871e9 X-Archives-Hash: 0f795fac8e2902171a0f25e00aed5255 commit: b209fe3859c05c286037843bb34058f849c54b15 Author: Mike Gilbert gentoo org> AuthorDate: Thu May 28 04:01:43 2015 +0000 Commit: William Hubbs gentoo org> CommitDate: Tue Jun 2 18:11:04 2015 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=b209fe38 bootmisc: Don't call dmesg in systemd-nspawn containers This fixes #57. init.d/bootmisc.in | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in index dbd258e..13f2389 100644 --- a/init.d/bootmisc.in +++ b/init.d/bootmisc.in @@ -214,10 +214,13 @@ start() if yesno $log_dmesg; then if $logw || checkpath -W /var/log; then # Create an 'after-boot' dmesg log - if [ "$RC_SYS" != VSERVER -a "$RC_SYS" != OPENVZ -a "$RC_SYS" != LXC ]; then - dmesg > /var/log/dmesg - chmod 640 /var/log/dmesg - fi + case "$RC_SYS" in + VSERVER|OPENVZ|LXC|SYSTEMD-NSPAWN) ;; + *) + dmesg > /var/log/dmesg + chmod 640 /var/log/dmesg + ;; + esac fi fi