Previous implementation was blocking the init and
breaking halt/reboot/sysupgrade (reported by Daniel Golle)
Signed-off-by: Etienne CHAMPETIER <champetier.etie...@gmail.com>
---
package/base-files/files/etc/init.d/urandom_seed | 29 ++++--------------------
package/base-files/files/sbin/urandom_seed | 19 ++++++++++++++++
2 files changed, 24 insertions(+), 24 deletions(-)
create mode 100755 package/base-files/files/sbin/urandom_seed
diff --git a/package/base-files/files/etc/init.d/urandom_seed
b/package/base-files/files/etc/init.d/urandom_seed
index cb2eb44..e3c29a3 100755
--- a/package/base-files/files/etc/init.d/urandom_seed
+++ b/package/base-files/files/etc/init.d/urandom_seed
@@ -1,29 +1,10 @@
#!/bin/sh /etc/rc.common
START=99
+USE_PROCD=1
-EXTRA_COMMANDS="save"
-
-_log() {
- logger -t urandom_seed "$1"
-}
-
-_save() {
- touch $1.tmp || { _log "touch $1 failed"; return; }
- chown root:root $1.tmp || { _log "chown $1 failed"; return; }
- chmod 600 $1.tmp || { _log "chmod $1 failed"; return; }
- getrandom 512 > $1.tmp || { _log "getrandom failed"; return; }
- mv $1.tmp $1 || { _log "mv $1 failed"; return; }
-}
-
-save() {
- SEED="$(uci -q get system.@system[0].urandom_seed)"
- [ "${SEED:0:1}" == "/" ] && _save "$SEED" && _log "Seed saved ($SEED)"
-
- SEED=/etc/urandom.seed
- [ ! -f $SEED ] && _save "$SEED" && _log "Seed saved ($SEED)"
-}
-
-boot() {
- save
+start_service() {
+ procd_open_instance
+ procd_set_param command "/sbin/urandom_seed"
+ procd_close_instance
}
diff --git a/package/base-files/files/sbin/urandom_seed
b/package/base-files/files/sbin/urandom_seed
new file mode 100755
index 0000000..fceb7b0
--- /dev/null
+++ b/package/base-files/files/sbin/urandom_seed
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+_log() {
+ logger -t urandom_seed "$1"
+}
+
+_save() {
+ touch "$1.tmp" || { _log "touch $1 failed"; return 1; }
+ chown root:root "$1.tmp" || { _log "chown $1 failed"; return 1; }
+ chmod 600 "$1.tmp" || { _log "chmod $1 failed"; return 1; }
+ getrandom 512 > "$1.tmp" || { _log "getrandom failed"; return 1; }
+ mv "$1.tmp" "$1" || { _log "mv $1 failed"; return 1; }
+}
+
+SEED="$(uci -q get system.@system[0].urandom_seed)"
+[ "${SEED:0:1}" == "/" ] && _save "$SEED" && _log "Seed saved ($SEED)"
+
+SEED=/etc/urandom.seed
+[ ! -f $SEED ] && _save "$SEED" && _log "Seed saved ($SEED)"
--
1.9.1
_______________________________________________
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
