From a9d4e3917fc8ca63dfc9a63df6a9fc7ae3af9e03 Mon Sep 17 00:00:00 2001 From: rpe <> Date: Fri, 27 May 2016 17:03:45 +0000 Subject: [PATCH] No need to show the messages if we skip in case of /usr/lib on nfs. OK deraadt --- src/etc/rc | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/etc/rc b/src/etc/rc index a2676e22..c93ea77e 100644 --- a/src/etc/rc +++ b/src/etc/rc @@ -1,4 +1,4 @@ -# $OpenBSD: rc,v 1.483 2016/05/27 16:49:08 rpe Exp $ +# $OpenBSD: rc,v 1.484 2016/05/27 17:03:45 rpe 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 @@ -164,13 +164,10 @@ reorder_libs() { local _dkdev=/dev/$(stat -L -f '%Sd' /usr/lib) local _mp=$(mount | grep "^$_dkdev") - echo -n 'reordering libraries:' - # Skip if /usr/lib is on a nfs mounted filesystem. - if [[ $_mp == *' type nfs '* ]]; then - echo ' skipped.' - return - fi + [[ $_mp == *' type nfs '* ]] && return + + echo -n 'reordering libraries:' # Only choose the latest version of the libraries. for _liba in /usr/lib/libc.so.*.a; do