From ea7f893ae4a51a92d7b7ddf22181e7c347707cee Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Mon, 29 Dec 2003 23:16:46 +0000 Subject: Move vi.recover invocation until after after ldconf is run. Fixes a problem when postfix w/ sasl & tls is used instead of sendmail and perl is dynamically linked anyway. Closes PR 3605. OK deraadt@ and drahn@ --- etc/rc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'etc') diff --git a/etc/rc b/etc/rc index f9160383122..4dde3ac2b96 100644 --- a/etc/rc +++ b/etc/rc @@ -1,4 +1,4 @@ -# $OpenBSD: rc,v 1.230 2003/12/05 00:52:16 deraadt Exp $ +# $OpenBSD: rc,v 1.231 2003/12/29 23:16:45 millert Exp $ # System startup script run by init on autoboot # or after single-user. @@ -383,10 +383,6 @@ if [ $? -eq 0 ]; then rm -f $T fi -if [ -x /usr/libexec/vi.recover ]; then - echo 'preserving editor files'; /usr/libexec/vi.recover -fi - if [ -f /var/account/acct ]; then echo 'turning on accounting'; accton /var/account/acct fi @@ -402,6 +398,10 @@ if [ -f /sbin/ldconfig ]; then ldconfig $shlib_dirs fi +if [ -x /usr/libexec/vi.recover ]; then + echo 'preserving editor files'; /usr/libexec/vi.recover +fi + if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then echo -n "ssh-keygen: generating new DSA host key... " if /usr/bin/ssh-keygen -q -t dsa -f /etc/ssh/ssh_host_dsa_key -N ''; then -- cgit v1.2.3