From patchwork Mon Jan 19 16:14:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Mikityanskiy X-Patchwork-Id: 430596 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id B6BD11401F6 for ; Tue, 20 Jan 2015 03:15:24 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id C3427A15EE; Mon, 19 Jan 2015 16:15:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UX3gfTF5B1S1; Mon, 19 Jan 2015 16:15:15 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7B552A1FF3; Mon, 19 Jan 2015 16:15:10 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 496121C203A for ; Mon, 19 Jan 2015 16:14:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 455F692518 for ; Mon, 19 Jan 2015 16:14:53 +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 h-6ubdM7ZmBa for ; Mon, 19 Jan 2015 16:14:53 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f174.google.com (mail-wi0-f174.google.com [209.85.212.174]) by whitealder.osuosl.org (Postfix) with ESMTPS id D9F2692514 for ; Mon, 19 Jan 2015 16:14:52 +0000 (UTC) Received: by mail-wi0-f174.google.com with SMTP id n3so283534wiv.1 for ; Mon, 19 Jan 2015 08:14:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=9IZAmDhEQasCltXpbYetWgsD5TVyFAwGVeFJpEowEYg=; b=gVPizl6QRETwSZInt/qxhj8g5E27JqyqtQpPP6ai7AlLFTm5bxdBbUHNqrgJ4z7cSk bJDLLT8CpvZffjO34K0mZg9x/AyD0FcXuUntF6QbTj5kzLQPz/Hc1U4BNm/jSbpaIWIW t9fbilmnV52r4Xms8nmCFL6njMwbsqDbxnfeQsWXRtSmj0K2ceut/JMEauEc2St8FZyY 3E+/jzSLyWkqzsE8ysa1iCSMmSyvNg08Wju4A5XM0EPiL4SFZHWxZEMDlL5u0Y1ljIHO apWAPIPB5vOLymkLzArYCGrp8kYQTg+f3LvtnyPWDx58XDeqvZcpJWE4GKsmB86NdRjm nfWA== X-Received: by 10.180.207.110 with SMTP id lv14mr14612615wic.41.1421684091324; Mon, 19 Jan 2015 08:14:51 -0800 (PST) Received: from ideapad.lan (199-13-179-94.pool.ukrtel.net. [94.179.13.199]) by mx.google.com with ESMTPSA id fc6sm14735765wib.12.2015.01.19.08.14.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 19 Jan 2015 08:14:50 -0800 (PST) From: Maxim Mikityanskiy To: buildroot@busybox.net Date: Mon, 19 Jan 2015 18:14:16 +0200 Message-Id: <1421684056-5266-17-git-send-email-maxtram95@gmail.com> X-Mailer: git-send-email 2.2.1 In-Reply-To: <1421684056-5266-1-git-send-email-maxtram95@gmail.com> References: <1421684056-5266-1-git-send-email-maxtram95@gmail.com> Subject: [Buildroot] [PATCH 16/16] package/rng-tools: add systemd support for rngd X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Add rngd.service for systemd. Also patch rngd with patch from Fedora to ignore failure if no hwrng present: https://bugzilla.redhat.com/show_bug.cgi?id=892178 Signed-off-by: Maxim Mikityanskiy --- package/rng-tools/rng-tools.mk | 8 ++++++++ package/rng-tools/rngd-exit-code.patch | 11 +++++++++++ package/rng-tools/rngd.service | 9 +++++++++ 3 files changed, 28 insertions(+) create mode 100644 package/rng-tools/rngd-exit-code.patch create mode 100644 package/rng-tools/rngd.service diff --git a/package/rng-tools/rng-tools.mk b/package/rng-tools/rng-tools.mk index 5b89656..13352cc 100644 --- a/package/rng-tools/rng-tools.mk +++ b/package/rng-tools/rng-tools.mk @@ -21,4 +21,12 @@ else RNG_TOOLS_CONF_OPTS += --without-libgcrypt endif +define RNG_TOOLS_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 644 package/rng-tools/rngd.service \ + $(TARGET_DIR)/lib/systemd/system/rngd.service + mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants + ln -fs /lib/systemd/system/rngd.service \ + $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/rngd.service +endef + $(eval $(autotools-package)) diff --git a/package/rng-tools/rngd-exit-code.patch b/package/rng-tools/rngd-exit-code.patch new file mode 100644 index 0000000..5f87161 --- /dev/null +++ b/package/rng-tools/rngd-exit-code.patch @@ -0,0 +1,11 @@ +--- a/rngd.c ++++ b/rngd.c +@@ -319,7 +319,7 @@ int main(int argc, char **argv) + message(LOG_DAEMON|LOG_ERR, + "Maybe RNG device modules are not loaded\n"); + } +- return 1; ++ return 66; + } + + if (arguments->verbose) { diff --git a/package/rng-tools/rngd.service b/package/rng-tools/rngd.service new file mode 100644 index 0000000..3bdc4c1 --- /dev/null +++ b/package/rng-tools/rngd.service @@ -0,0 +1,9 @@ +[Unit] +Description=Hardware RNG Entropy Gatherer Daemon + +[Service] +ExecStart=/usr/sbin/rngd -f +SuccessExitStatus=66 + +[Install] +WantedBy=multi-user.target