aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files
diff options
context:
space:
mode:
authorPetr Štetiar <ynezz@true.cz>2019-05-20 16:38:33 +0200
committerPetr Štetiar <ynezz@true.cz>2019-07-22 09:53:01 +0200
commitf573d3de118476879d4a600b3216a1b49b87cdf9 (patch)
treef162672c200d2bee8690c321ecc68058ff4ea569 /package/base-files
parent81c5a5c4b325a3baf64be26c452fee17ff9e62ee (diff)
downloadupstream-f573d3de118476879d4a600b3216a1b49b87cdf9.tar.gz
upstream-f573d3de118476879d4a600b3216a1b49b87cdf9.tar.bz2
upstream-f573d3de118476879d4a600b3216a1b49b87cdf9.zip
base-files: move urandom seed bits into separate package
So it's possible to install or remove it as needed. Tested-by: Lucian Cristian <lucian.cristian@gmail.com> Signed-off-by: Petr Štetiar <ynezz@true.cz> (cherry picked from commit 27bfde9c9f789dbfabebf13047e8b042c27cdeef)
Diffstat (limited to 'package/base-files')
-rw-r--r--package/base-files/Makefile11
-rwxr-xr-xpackage/base-files/files/etc/init.d/urandom_seed12
-rw-r--r--package/base-files/files/lib/preinit/81_urandom_seed24
-rwxr-xr-xpackage/base-files/files/sbin/urandom_seed20
4 files changed, 10 insertions, 57 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 609ffa2c38..91d677acb3 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/version.mk
include $(INCLUDE_DIR)/feeds.mk
PKG_NAME:=base-files
-PKG_RELEASE:=197
+PKG_RELEASE:=198
PKG_FLAGS:=nonshared
PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
@@ -43,6 +43,15 @@ define Package/base-files
VERSION:=$(PKG_RELEASE)-$(REVISION)
endef
+define Package/urandom-seed
+ SECTION:=base
+ CATEGORY:=Base system
+ DEPENDS:=+libc +ubox-getrandom
+ TITLE:=/etc/urandom.seed handling for OpenWrt
+ URL:=http://openwrt.org/
+ VERSION:=$(PKG_RELEASE)-$(REVISION)
+endef
+
define Package/base-files/conffiles
/etc/config/
/etc/config/network
diff --git a/package/base-files/files/etc/init.d/urandom_seed b/package/base-files/files/etc/init.d/urandom_seed
deleted file mode 100755
index 17d9c13400..0000000000
--- a/package/base-files/files/etc/init.d/urandom_seed
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=99
-USE_PROCD=1
-
-start_service() {
- procd_open_instance "urandom_seed"
- procd_set_param command "/sbin/urandom_seed"
- procd_set_param stdout 1
- procd_set_param stderr 1
- procd_close_instance
-}
diff --git a/package/base-files/files/lib/preinit/81_urandom_seed b/package/base-files/files/lib/preinit/81_urandom_seed
deleted file mode 100644
index 26212c60b5..0000000000
--- a/package/base-files/files/lib/preinit/81_urandom_seed
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-log_urandom_seed() {
- echo "urandom-seed: $1" > /dev/kmsg
-}
-
-_do_urandom_seed() {
- [ -f "$1" ] || { log_urandom_seed "Seed file not found ($1)"; return; }
- [ -O "$1" -a -G "$1" -a ! -x "$1" ] || { log_urandom_seed "Wrong owner / permissions for $1"; return; }
-
- log_urandom_seed "Seeding with $1"
- cat "$1" > /dev/urandom
-}
-
-do_urandom_seed() {
- [ -c /dev/urandom ] || { log_urandom_seed "Something is wrong with /dev/urandom"; return; }
-
- _do_urandom_seed "/etc/urandom.seed"
-
- SEED="$(uci -q get system.@system[0].urandom_seed)"
- [ "${SEED:0:1}" = "/" -a "$SEED" != "/etc/urandom.seed" ] && _do_urandom_seed "$SEED"
-}
-
-boot_hook_add preinit_main do_urandom_seed
diff --git a/package/base-files/files/sbin/urandom_seed b/package/base-files/files/sbin/urandom_seed
deleted file mode 100755
index 7043e8af4e..0000000000
--- a/package/base-files/files/sbin/urandom_seed
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-set -e
-
-trap '[ "$?" -eq 0 ] || echo "An error occured" >&2' EXIT
-
-save() {
- touch "$1.tmp"
- chown root:root "$1.tmp"
- chmod 600 "$1.tmp"
- getrandom 512 > "$1.tmp"
- mv "$1.tmp" "$1"
- echo "Seed saved ($1)"
-}
-
-SEED="$(uci -q get system.@system[0].urandom_seed || true)"
-[ "${SEED:0:1}" = "/" ] && save "$SEED"
-
-SEED=/etc/urandom.seed
-[ ! -f $SEED ] && save "$SEED"
-true