Browse Source

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@
OPENBSD_3_5
millert 21 years ago
parent
commit
b174c0edef
1 changed files with 5 additions and 5 deletions
  1. +5
    -5
      src/etc/rc

+ 5
- 5
src/etc/rc View File

@ -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 # System startup script run by init on autoboot
# or after single-user. # or after single-user.
@ -383,10 +383,6 @@ if [ $? -eq 0 ]; then
rm -f $T rm -f $T
fi fi
if [ -x /usr/libexec/vi.recover ]; then
echo 'preserving editor files'; /usr/libexec/vi.recover
fi
if [ -f /var/account/acct ]; then if [ -f /var/account/acct ]; then
echo 'turning on accounting'; accton /var/account/acct echo 'turning on accounting'; accton /var/account/acct
fi fi
@ -402,6 +398,10 @@ if [ -f /sbin/ldconfig ]; then
ldconfig $shlib_dirs ldconfig $shlib_dirs
fi 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 if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then
echo -n "ssh-keygen: generating new DSA host key... " 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 if /usr/bin/ssh-keygen -q -t dsa -f /etc/ssh/ssh_host_dsa_key -N ''; then


Loading…
Cancel
Save