summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorKlemens Nanni <kn@cvs.openbsd.org>2022-12-28 09:53:34 +0000
committerKlemens Nanni <kn@cvs.openbsd.org>2022-12-28 09:53:34 +0000
commit91bf3eb5c26836bc7a31ec09d4d7aa1ed259d5b5 (patch)
tree6ad6415b3362440ea2fe332d4ff5f91ad2588edd /etc
parent08e180bf626b98a0eccb01b73097d8538c6bda01 (diff)
Make wait_reorder_libs() honour library_aslr=NO
Otherwise it will unconditionally print an empty line in case relinking is disabled. Reported by kettenis Feedback OK tb OK florian
Diffstat (limited to 'etc')
-rw-r--r--etc/rc4
1 files changed, 3 insertions, 1 deletions
diff --git a/etc/rc b/etc/rc
index 149d6f5a33a..d4379e5ad91 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-# $OpenBSD: rc,v 1.567 2022/12/26 20:24:43 kn Exp $
+# $OpenBSD: rc,v 1.568 2022/12/28 09:53:33 kn Exp $
# System startup script run by init on autoboot or after single-user.
# Output and error are redirected to console by init, and the console is the
@@ -255,6 +255,8 @@ reorder_libs() {
wait_reorder_libs() {
local _line
+ [[ $library_aslr == NO ]] && return
+
while IFS= read -p _line; do
echo -n "$_line"
done