aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiachen YANG2020-11-06 11:03:49 +0900
committerJiachen YANG2020-11-06 11:03:49 +0900
commit1e942b920b64da0d1a52526c20215bc8f886649f (patch)
tree68c552e1651ec83aae3104b3609c90b799e40f75
parent57eb530af81b444a61096f3cf8f8ac1ef99a7c93 (diff)
downloadaur-1e942b920b64da0d1a52526c20215bc8f886649f.tar.gz
start before local-fs; fix bc dependency; sleep entropy/10 ms
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD8
-rwxr-xr-xsystemd-report-entropy8
-rw-r--r--systemd-report-entropy.service5
4 files changed, 17 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e3b5dbd6ca25..30b232dae0e3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,17 @@
pkgbase = systemd-report-entropy
pkgdesc = report system entropy to journald during boot
- pkgver = 1
+ pkgver = 2
pkgrel = 1
url = http://github.com/farseerfc/systemd-report-entropy
arch = any
license = custom:BSD
+ depends = bash
+ depends = bc
source = systemd-report-entropy
source = systemd-report-entropy.service
source = LICENSE
- sha512sums = 9b344e44bdd3eef9f1f07fe69f9d8a1c6248f942f71a239e0a46290ac9d915da0c11c023477a5fc51b84e39436e1cb01874e3806396bbfaf83c1417a056eb371
- sha512sums = 8c5be83a650cac8bb969091e586627cf24bbd1dc92011529541f244a589981d3e7b0973606e4af087f46034043a01f37c7cd4062fb8b5d00fc685ed0780848ad
+ sha512sums = c96c9178f2b8716d75e6a2ff7f4674c2dd0056661000243a66de6c12790ba45123fc4dec7e1fcc7c19fe51578163a5e69b269ce8d4492247e2cc3c064628f178
+ sha512sums = 847444c837ab903e46f9944352a93d76c8663d43fe9960bcf4d8533b2a647d276d870d8963594a26d0a67035499d7d88091af7ed8e6957c67f0679ee8edd3517
sha512sums = 6b75fd3686d5b4ae44c7dae0ede5caf38203bb285242e2abaa6f587f357c11138e969fead87f8362834803cea3b1a488da7bfc952545110d0c9a02cf230d4e48
pkgname = systemd-report-entropy
diff --git a/PKGBUILD b/PKGBUILD
index 4ad4533356b7..32aa835ace3d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,18 @@
# Maintainer: Jiachen Yang <farseerfc@gmail.com>
pkgname=systemd-report-entropy
-pkgver=1
+pkgver=2
pkgrel=1
pkgdesc="report system entropy to journald during boot"
arch=(any)
url="http://github.com/farseerfc/systemd-report-entropy"
license=('custom:BSD')
-depends=()
+depends=('bash' 'bc')
source=("$pkgname"
"$pkgname.service"
'LICENSE'
)
-sha512sums=('9b344e44bdd3eef9f1f07fe69f9d8a1c6248f942f71a239e0a46290ac9d915da0c11c023477a5fc51b84e39436e1cb01874e3806396bbfaf83c1417a056eb371'
- '8c5be83a650cac8bb969091e586627cf24bbd1dc92011529541f244a589981d3e7b0973606e4af087f46034043a01f37c7cd4062fb8b5d00fc685ed0780848ad'
+sha512sums=('c96c9178f2b8716d75e6a2ff7f4674c2dd0056661000243a66de6c12790ba45123fc4dec7e1fcc7c19fe51578163a5e69b269ce8d4492247e2cc3c064628f178'
+ '847444c837ab903e46f9944352a93d76c8663d43fe9960bcf4d8533b2a647d276d870d8963594a26d0a67035499d7d88091af7ed8e6957c67f0679ee8edd3517'
'6b75fd3686d5b4ae44c7dae0ede5caf38203bb285242e2abaa6f587f357c11138e969fead87f8362834803cea3b1a488da7bfc952545110d0c9a02cf230d4e48')
package() {
diff --git a/systemd-report-entropy b/systemd-report-entropy
index 27feefe32c63..ed5c306d9de8 100755
--- a/systemd-report-entropy
+++ b/systemd-report-entropy
@@ -1,9 +1,11 @@
#!/bin/bash
while true; do
entropy=$(cat /proc/sys/kernel/random/entropy_avail)
- echo "ENTROPY $(date -Ins) $entropy"
- sleep $(echo "$entropy / 10000" | bc -l)
- echo -n "REPORT ENTROPY is-system-running: "
+ echo -n "ENTROPY $(date -Ins) $entropy"
+ sleepms=$(echo "$(( $entropy < 100 ? 100 : $entropy )) / 10" | bc -l)
+ echo -e " sleeping $sleepms ms"
+ sleep $(echo "$sleepms / 1000" | bc -l)
+ echo -n "is-system-running: "
if systemctl is-system-running; then
echo "REPORT ENTROPY systemd boot finished, quit."
exit
diff --git a/systemd-report-entropy.service b/systemd-report-entropy.service
index 5c9e11aeb093..d61c81b33df2 100644
--- a/systemd-report-entropy.service
+++ b/systemd-report-entropy.service
@@ -1,6 +1,7 @@
[Unit]
Description=Start to report entropy in journal
-Before=default.target
+DefaultDependencies=no
+Before=local-fs.target sysinit.target
[Service]
Type=simple
@@ -8,4 +9,4 @@ ExecStart=/usr/bin/systemd-report-entropy
RemainAfterExit=yes
[Install]
-WantedBy=local-fs.target
+WantedBy=basic.target