From patchwork Wed Jun 3 15:46:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3154 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 49cYDs2n4Sz43s4 for ; Wed, 3 Jun 2020 15:46:53 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 49cYDq5RLYz1Sq; Wed, 3 Jun 2020 15:46:51 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 49cYDq3f5sz302m; Wed, 3 Jun 2020 15:46:51 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 49cYDp3K0sz2xlB for ; Wed, 3 Jun 2020 15:46:50 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 49cYDn4QHXz1Sq; Wed, 3 Jun 2020 15:46:49 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1591199209; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=9EFIeeHZZqFVPnejsxCncEd4c6PzWbVx3fDs8tZ8/54=; b=bDD/ZqKBMg+cDL86MeiQ32ZMCMsMaRUq00nB6p5aicuNdFg+VSbqDYoPG661hn1H0L4zVP E7kE2/CCAwUEz0Dg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1591199209; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=9EFIeeHZZqFVPnejsxCncEd4c6PzWbVx3fDs8tZ8/54=; b=o8Mr+pSiov1YXamJKNk+hjZ104hbedWD+08H69AQOKebiFjoorgmPKfOzunkXzaHSlClfB seK4IN11eg6KHkar5wtJejI6mnNZKAskfattxOdgrbyGrqozjatgSdLjo4FeibjT6f1nG/ 2bqm18Ydbv7CybaMRhFtGIVTXiHeCedwP6B3x80nnHgkMETHNSIv4VWDTcuz6CL0b2HDJG OSHh1kz0WRsSVk//n+l5gAjjIBnUvn+2SccLDgOdHAMfFb3f0ogm+nfNU1h8BwVL+gkwFV 5T3QSXkalkTh8gHuNWjMU9RXbO015vSStU6tzu+UWNkStB3T1F7ak9mPu80U4g== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH] random: Drop busy-loop script Date: Wed, 3 Jun 2020 15:46:44 +0000 Message-Id: <20200603154644.14287-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This is no longer required because the kernel will now try to generate some randomness in an easier way when needed. This has been added in: b923dd3de0acbf415cee193191250347b733fab8 Signed-off-by: Michael Tremer --- config/rootfiles/common/aarch64/initscripts | 2 -- config/rootfiles/common/armv5tel/initscripts | 2 -- config/rootfiles/common/i586/initscripts | 2 -- config/rootfiles/common/x86_64/initscripts | 2 -- lfs/initscripts | 1 - src/initscripts/system/random | 33 -------------------- 6 files changed, 42 deletions(-) delete mode 100644 src/initscripts/system/random diff --git a/config/rootfiles/common/aarch64/initscripts b/config/rootfiles/common/aarch64/initscripts index 8d945f7a5..485c0af6e 100644 --- a/config/rootfiles/common/aarch64/initscripts +++ b/config/rootfiles/common/aarch64/initscripts @@ -71,7 +71,6 @@ etc/rc.d/init.d/networking/wpa_supplicant.exe etc/rc.d/init.d/ntp etc/rc.d/init.d/pakfire etc/rc.d/init.d/partresize -etc/rc.d/init.d/random etc/rc.d/init.d/rc etc/rc.d/init.d/reboot etc/rc.d/init.d/rngd @@ -191,7 +190,6 @@ etc/rc.d/rcsysinit.d/S45udev_retry etc/rc.d/rcsysinit.d/S50cleanfs etc/rc.d/rcsysinit.d/S60setclock etc/rc.d/rcsysinit.d/S65rngd -etc/rc.d/rcsysinit.d/S66random etc/rc.d/rcsysinit.d/S70console etc/rc.d/rcsysinit.d/S71pakfire etc/rc.d/rcsysinit.d/S73swconfig diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts index 8d945f7a5..485c0af6e 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -71,7 +71,6 @@ etc/rc.d/init.d/networking/wpa_supplicant.exe etc/rc.d/init.d/ntp etc/rc.d/init.d/pakfire etc/rc.d/init.d/partresize -etc/rc.d/init.d/random etc/rc.d/init.d/rc etc/rc.d/init.d/reboot etc/rc.d/init.d/rngd @@ -191,7 +190,6 @@ etc/rc.d/rcsysinit.d/S45udev_retry etc/rc.d/rcsysinit.d/S50cleanfs etc/rc.d/rcsysinit.d/S60setclock etc/rc.d/rcsysinit.d/S65rngd -etc/rc.d/rcsysinit.d/S66random etc/rc.d/rcsysinit.d/S70console etc/rc.d/rcsysinit.d/S71pakfire etc/rc.d/rcsysinit.d/S73swconfig diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index 996925b7a..511692335 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -71,7 +71,6 @@ etc/rc.d/init.d/networking/wpa_supplicant.exe etc/rc.d/init.d/ntp etc/rc.d/init.d/pakfire etc/rc.d/init.d/partresize -etc/rc.d/init.d/random etc/rc.d/init.d/rc etc/rc.d/init.d/reboot etc/rc.d/init.d/rngd @@ -190,7 +189,6 @@ etc/rc.d/rcsysinit.d/S45udev_retry etc/rc.d/rcsysinit.d/S50cleanfs etc/rc.d/rcsysinit.d/S60setclock etc/rc.d/rcsysinit.d/S65rngd -etc/rc.d/rcsysinit.d/S66random etc/rc.d/rcsysinit.d/S70console etc/rc.d/rcsysinit.d/S71pakfire etc/rc.d/rcsysinit.d/S74cloud-init diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts index 996925b7a..511692335 100644 --- a/config/rootfiles/common/x86_64/initscripts +++ b/config/rootfiles/common/x86_64/initscripts @@ -71,7 +71,6 @@ etc/rc.d/init.d/networking/wpa_supplicant.exe etc/rc.d/init.d/ntp etc/rc.d/init.d/pakfire etc/rc.d/init.d/partresize -etc/rc.d/init.d/random etc/rc.d/init.d/rc etc/rc.d/init.d/reboot etc/rc.d/init.d/rngd @@ -190,7 +189,6 @@ etc/rc.d/rcsysinit.d/S45udev_retry etc/rc.d/rcsysinit.d/S50cleanfs etc/rc.d/rcsysinit.d/S60setclock etc/rc.d/rcsysinit.d/S65rngd -etc/rc.d/rcsysinit.d/S66random etc/rc.d/rcsysinit.d/S70console etc/rc.d/rcsysinit.d/S71pakfire etc/rc.d/rcsysinit.d/S74cloud-init diff --git a/lfs/initscripts b/lfs/initscripts index 242de60e5..7d5f39716 100644 --- a/lfs/initscripts +++ b/lfs/initscripts @@ -171,7 +171,6 @@ $(TARGET) : ln -sf ../init.d/setclock /etc/rc.d/rc0.d/K47setclock ln -sf ../init.d/setclock /etc/rc.d/rc6.d/K47setclock ln -sf ../init.d/rngd /etc/rc.d/rcsysinit.d/S65rngd - ln -sf ../init.d/random /etc/rc.d/rcsysinit.d/S66random ln -sf ../init.d/console /etc/rc.d/rcsysinit.d/S70console ln -sf ../init.d/pakfire /etc/rc.d/rcsysinit.d/S71pakfire ln -sf ../init.d/cloud-init /etc/rc.d/rcsysinit.d/S74cloud-init diff --git a/src/initscripts/system/random b/src/initscripts/system/random deleted file mode 100644 index 489c7dac9..000000000 --- a/src/initscripts/system/random +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -. /etc/sysconfig/rc -. $rc_functions - -if [ -e /proc/sys/kernel/random/poolsize ]; then - poolsize=$( /var/tmp/random-tmpfile - sync - rm -f /var/tmp/random-tmpfile - done; - ;; - - *) - echo "Usage: $0 {start}" - exit 1 - ;; -esac - -# End $rc_base/init.d/random