From patchwork Fri Dec 6 12:31:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 1205028 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=crapouillou.net Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=crapouillou.net header.i=@crapouillou.net header.b="VJRf8Dus"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47TsRG5k50z9sRH for ; Fri, 6 Dec 2019 23:32:10 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 6299E88CF2; Fri, 6 Dec 2019 12:32:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mifjrb98QBOX; Fri, 6 Dec 2019 12:32:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 7809088B24; Fri, 6 Dec 2019 12:32:07 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 577E41BF2BD for ; Fri, 6 Dec 2019 12:32:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 48B5E883A1 for ; Fri, 6 Dec 2019 12:32:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UOAt4gKfqgO9 for ; Fri, 6 Dec 2019 12:32:05 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from crapouillou.net (outils.crapouillou.net [89.234.176.41]) by whitealder.osuosl.org (Postfix) with ESMTPS id E9E5888227 for ; Fri, 6 Dec 2019 12:32:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1575635520; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references; bh=Z46AWC/y4lerl8FpDassbIvldicFVWCTrOcsNctMtKg=; b=VJRf8DusuLo9mc1t1aOjPEUZJmzCE6iUAtgffsL2mhfsWdl3x6OUTgPwCleboz3JPYbXcg OD1mqHejqbTfkxj9KO1FOILsG6GW2l+sZTSACo3vDnrP/g8Hnyg/F+25vIjv3RSqhU4WMq Lo4xQy7XsUIvJ66bzyKCb8wYGdk0GSg= From: Paul Cercueil To: buildroot@busybox.net Date: Fri, 6 Dec 2019 13:31:54 +0100 Message-Id: <20191206123154.26102-1-paul@crapouillou.net> MIME-Version: 1.0 Subject: [Buildroot] [PATCH] busybox: Don't overwrite existing inittab X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paul Cercueil Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" If a inittab file was already provided in the skeleton, don't overwrite it with the one that comes with the busybox package. Signed-off-by: Paul Cercueil --- package/busybox/busybox.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 301e72bdd2..e5d2f1bd0c 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -277,7 +277,9 @@ endif ifeq ($(BR2_INIT_BUSYBOX),y) define BUSYBOX_INSTALL_INITTAB - $(INSTALL) -D -m 0644 package/busybox/inittab $(TARGET_DIR)/etc/inittab + if test ! -r $(TARGET_DIR)/etc/inittab; then \ + $(INSTALL) -D -m 0644 package/busybox/inittab $(TARGET_DIR)/etc/inittab; \ + fi endef endif