diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2003-12-29 23:16:46 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2003-12-29 23:16:46 +0000 |
| commit | ea7f893ae4a51a92d7b7ddf22181e7c347707cee (patch) | |
| tree | 7d98090674c6a6a92dadc5c00f674de3952ad60e | |
| parent | 63e8b4fcf61c02a069d78708e789aca785943ccf (diff) | |
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@
| -rw-r--r-- | etc/rc | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -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 |