[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
LP for rc
a) While I was reading rc, I found some inconsistencies in the
criteria about when to probe for an existing executable file.
b) I found a reference to a /usr/local/bin/gated daemon in /usr/local/bin/
that, of course, doesn't exist. I think it shouldn't be in rc.
Where am I wrong, if so.
--
ISC. Gerardo Santana Gómez Garrido
OpenBSD México http://www.openbsd.org.mx/~santana
4291424
--- rc.orig Sun Jul 1 06:19:08 2001
+++ rc Sun Jul 1 07:11:39 2001
@@ -38,7 +38,7 @@ export PATH
if [ $1x = shutdownx ]; then
dd if=/dev/urandom of=/var/db/host.random bs=1024 count=64 >/dev/null 2>&1
chmod 600 /var/db/host.random >/dev/null 2>&1
- if [ $? -eq 0 -a -f /etc/rc.shutdown ]; then
+ if [ $? -eq 0 -a -r /etc/rc.shutdown ]; then
echo /etc/rc.shutdown in progress...
. /etc/rc.shutdown
echo /etc/rc.shutdown complete.
@@ -52,13 +52,13 @@ if [ $1x = shutdownx ]; then
fi
# Configure ccd devices.
-if [ -f /etc/ccd.conf ]; then
+if [ -s /etc/ccd.conf ]; then
ccdconfig -C
fi
# Configure raid devices.
for dev in 0 1 2 3; do
- if [ -f /etc/raid$dev.conf ]; then
+ if [ -s /etc/raid$dev.conf ]; then
raidctl -c /etc/raid$dev.conf raid$dev
raidctl -v -P raid$dev
fi
@@ -117,7 +117,7 @@ if [ "X$pf" != X"NO" ]; then
echo "block in all\nblock out all" | pfctl -R - -e
fi
-if [ -f /etc/sysctl.conf ]; then
+if [ -s /etc/sysctl.conf ]; then
(
# delete comments and blank lines
set -- `stripcom /etc/sysctl.conf`
@@ -180,7 +180,7 @@ syslogd ${syslogd_flags}
# $named_flags, $named_user, and $named_chroot are imported from /etc/rc.conf;
# if $named_flags != NO, named is run.
-if [ "X${named_flags}" != X"NO" ]; then
+if [ "X${named_flags}" != X"NO" -a -x /usr/sbin/named ]; then
if [ "X${named_user}" != "X" -a "X${named_user}" != X"root" ]; then
named_flags="-u ${named_user} ${named_flags}"
fi
@@ -194,20 +194,20 @@ if [ "X${named_flags}" != X"NO" ]; then
fi
named_flags="-t ${named_chroot} ${named_flags}"
fi
- echo 'starting named'; named $named_flags
+ echo 'starting named'; /usr/sbin/named $named_flags
fi
# $photurisd_flags is imported from /etc/rc.conf;
# If $photurisd_flags == NO or /etc/photuris/photuris.conf doesn't exist, then
# photurisd isn't run.
-if [ "X${photurisd_flags}" != X"NO" -a -e /etc/photuris/photuris.conf ]; then
+if [ "X${photurisd_flags}" != X"NO" -a -r /etc/photuris/photuris.conf ]; then
echo 'starting photurisd'; photurisd ${photurisd_flags}
fi
# $isakmpd_flags is imported from /etc/rc.conf;
# If $isakmpd_flags == NO or /etc/isakmpd/isakmpd.conf doesn't exist, then
# isakmpd isn't run.
-if [ "X${isakmpd_flags}" != X"NO" -a -e /etc/isakmpd/isakmpd.conf ]; then
+if [ "X${isakmpd_flags}" != X"NO" -a -r /etc/isakmpd/isakmpd.conf ]; then
echo 'starting isakmpd'; isakmpd ${isakmpd_flags}
fi
@@ -215,8 +215,8 @@ echo -n 'starting rpc daemons:'
# $portmap is imported from /etc/rc.conf;
# if $portmap == YES, the portmapper is started.
-if [ X"${portmap}" = X"YES" ]; then
- echo -n ' portmap'; portmap
+if [ X"${portmap}" = X"YES" -a -x /usr/sbin/portmap ]; then
+ echo -n ' portmap'; /usr/sbin/portmap
fi
if [ -d /var/yp/binding -a X`domainname` != X ]; then
@@ -256,26 +256,26 @@ if [ X${nfs_server} = X"YES" -a -s /etc/
echo -n > /var/db/mountdtab
echo -n ' mountd'; mountd
echo -n ' nfsd'; nfsd ${nfsd_flags}
- if [ X${lockd} = X"YES" ]; then
- echo -n ' rpc.lockd'; rpc.lockd
+ if [ X${lockd} = X"YES" -a -x /usr/sbin/rpc.lockd ]; then
+ echo -n ' rpc.lockd'; /usr/sbin/rpc.lockd
fi
fi
-if [ X${amd} = X"YES" -a -e ${amd_master} ]; then
+if [ X${amd} = X"YES" -a -x /usr/sbin/amd -a -r ${amd_master} ]; then
echo -n ' amd'
- (cd /etc/amd; amd -l syslog -x error,noinfo,nostats -p \
+ (cd /etc/amd; /usr/sbin/amd -l syslog -x error,noinfo,nostats -p \
-a ${amd_dir} `cat ${amd_master}` > /var/run/amd.pid )
fi
# run rdate before timed
-if [ X"${rdate_flags}" != X"NO" ]; then
- echo -n ' rdate'; rdate -s ${rdate_flags}
+if [ X"${rdate_flags}" != X"NO" -a -x /usr/sbin/rdate ]; then
+ echo -n ' rdate'; /usr/sbin/rdate -s ${rdate_flags}
fi
# $timed_flags is imported from /etc/rc.conf;
# if $timed_flags == NO, timed isn't run.
-if [ "X${timed_flags}" != X"NO" ]; then
- echo -n ' timed'; timed $timed_flags
+if [ "X${timed_flags}" != X"NO" -a -x /usr/sbin/timed ]; then
+ echo -n ' timed'; /usr/sbin/timed $timed_flags
fi
echo '.'
@@ -289,7 +289,8 @@ if [ -d /var/crash ]; then
savecore /var/crash
fi
-if [ "X${afs}" = X"YES" -a -c ${afs_device} -a -d ${afs_mount_point} ]; then
+if [ "X${afs}" = X"YES" -a -c ${afs_device} -a -d ${afs_mount_point} \
+ -a -x /usr/libexec/afsd ]; then
echo -n 'mounting afs:'
mount -t xfs ${afs_device} ${afs_mount_point}
/usr/libexec/afsd ${afsd_flags} -d ${afs_device}
@@ -315,7 +316,7 @@ chmod 666 /dev/tty[pqrstuvwxyzPQRST]*
chown root.wheel /dev/tty[pqrstuvwxyzPQRST]*
# check the password temp/lock file
-if [ -f /etc/ptmp ]; then
+if [ -f /etc/ptmp -a -x /usr/bin/logger ]; then
logger -s -p auth.err \
'password file may be incorrect -- /etc/ptmp exists'
fi
@@ -328,14 +329,14 @@ echo clearing /tmp
find . ! -name . ! -name lost+found ! -name quota.user \
! -name quota.group -execdir rm -rf -- {} \; -type d -prune)
-[ -f /etc/rc.securelevel ] && . /etc/rc.securelevel
+[ -r /etc/rc.securelevel ] && . /etc/rc.securelevel
if [ X${securelevel} != X"" ]; then
echo -n 'setting kernel security level: '
sysctl -w kern.securelevel=${securelevel}
fi
# patch /etc/motd
-if [ ! -f /etc/motd ]; then
+if [ ! -r /etc/motd ]; then
install -c -o root -g wheel -m 664 /dev/null /etc/motd
fi
T=`mktemp /tmp/_motd.XXXXXXXXXX`
@@ -351,11 +352,11 @@ if [ -x /usr/libexec/vi.recover ]; then
echo 'preserving editor files'; /usr/libexec/vi.recover
fi
-if [ -f /var/account/acct ]; then
+if [ -w /var/account/acct -a -x /usr/sbin/accton ]; then
echo 'turning on accounting'; accton /var/account/acct
fi
-if [ -f /sbin/ldconfig ]; then
+if [ -x /sbin/ldconfig ]; then
echo 'creating runtime link editor directory cache.'
if [ -d /usr/local/lib ]; then
shlib_dirs="$shlib_dirs /usr/local/lib"
@@ -366,7 +367,7 @@ if [ -f /sbin/ldconfig ]; then
ldconfig $shlib_dirs
fi
-if [ ! -f /etc/ssh_host_dsa_key ]; then
+if [ ! -r /etc/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_host_dsa_key -N ''; then
echo done.
@@ -374,7 +375,7 @@ if [ ! -f /etc/ssh_host_dsa_key ]; then
echo failed.
fi
fi
-if [ ! -f /etc/ssh_host_rsa_key ]; then
+if [ ! -r /etc/ssh_host_rsa_key ]; then
echo -n "ssh-keygen: generating new RSA host key... "
if /usr/bin/ssh-keygen -q -t rsa -f /etc/ssh_host_rsa_key -N ''; then
echo done.
@@ -396,23 +397,24 @@ echo -n starting network daemons:
# $gated and $routed_flags are imported from /etc/rc.conf.
# If $gated == YES, gated is used; otherwise routed.
# If $routed_flags == NO, routed isn't run.
-if [ X${gated} = X"YES" -a -e /etc/gated.conf ]; then
+if [ X${gated} = X"YES" -a -r /etc/gated.conf -a -x /usr/local/sbin/gated ]
+then
echo -n ' gated'; /usr/local/sbin/gated $gated_flags
elif [ "X${routed_flags}" != X"NO" ]; then
- echo -n ' routed'; routed $routed_flags
+ echo -n ' routed'; /sbin/routed $routed_flags
fi
# $mrouted_flags is imported from /etc/rc.conf;
# If $mrouted_flags == NO, then mrouted isn't run.
-if [ "X${mrouted_flags}" != X"NO" ]; then
- echo -n ' mrouted'; mrouted $mrouted_flags
+if [ "X${mrouted_flags}" != X"NO" -a -x /usr/sbin/mrouted ]; then
+ echo -n ' mrouted'; /usr/sbin/mrouted $mrouted_flags
fi
# $dhcpd_flags is imported from /etc/rc.conf
# If $dhcpd_flags == NO or /etc/dhcpd.conf doesn't exist, then dhcpd isn't run.
-if [ "X${dhcpd_flags}" != X"NO" -a -f /etc/dhcpd.conf ]; then
+if [ "X${dhcpd_flags}" != X"NO" -a -r /etc/dhcpd.conf -a /usr/sbin/dhcpd ]; then
touch /var/db/dhcpd.leases
- if [ -f /etc/dhcpd.interfaces ]; then
+ if [ -r /etc/dhcpd.interfaces ]; then
dhcpd_ifs=`awk -F\# '{ print $1; }' < /etc/dhcpd.interfaces`
fi
echo -n ' dhcpd'; /usr/sbin/dhcpd ${dhcpd_flags} ${dhcpd_ifs}
@@ -423,20 +425,21 @@ if ifconfig lo0 inet6 >/dev/null 2>&1; t
if [ "X${fw}" == X"0" ]; then
# $rtsold_flags is imported from /etc/rc.conf;
# If $rtsold_flags == NO, then rtsold isn't run.
- if [ "X${rtsold_flags}" != X"NO" ]; then
+ if [ "X${rtsold_flags}" != X"NO" -a -x /usr/sbin/rtsold ]; then
echo -n ' rtsold'
/usr/sbin/rtsold ${rtsold_flags}
fi
else
# $route6d_flags is imported from /etc/rc.conf;
# If $route6d_flags == NO, then route6d isn't run.
- if [ "X${route6d_flags}" != X"NO" ]; then
+ if [ "X${route6d_flags}" != X"NO" -a -x /usr/sbin/route6d ]
+ then
echo -n ' route6d'
/usr/sbin/route6d ${route6d_flags}
fi
# $rtadvd_flags is imported from /etc/rc.conf;
# If $rtadvd_flags == NO, then rtadvd isn't run.
- if [ "X${rtadvd_flags}" != X"NO" ]; then
+ if [ "X${rtadvd_flags}" != X"NO" -a -x /usr/sbin/rtadvd ]; then
echo -n ' rtadvd'
/usr/sbin/rtadvd ${rtadvd_flags}
fi
@@ -445,13 +448,13 @@ fi
# $rwhod is imported from /etc/rc.conf;
# if $rwhod == YES, rwhod is run.
-if [ X${rwhod} = X"YES" ]; then
- echo -n ' rwhod'; rwhod
+if [ X${rwhod} = X"YES" -a -x /usr/sbin/rwhod ]; then
+ echo -n ' rwhod'; /usr/sbin/rwhod
fi
-if [ X${lpd_flags} != X"NO" ]; then
- echo -n ' printer'; lpd ${lpd_flags}
+if [ X${lpd_flags} != X"NO" -a -x /usr/sbin/lpd ]; then
+ echo -n ' printer'; /usr/sbin/lpd ${lpd_flags}
fi
# $sendmail_flags is imported from /etc/rc.conf;
@@ -459,7 +462,8 @@ fi
# sendmail isn't run. We call sendmail with a full path so that
# SIGHUP works. Note that /usr/sbin/sendmail may actually call a
# mailer other than sendmail, depending on /etc/mailer.conf.
-if [ "X${sendmail_flags}" != X"NO" -a -s /etc/mailer.conf ]; then
+if [ "X${sendmail_flags}" != X"NO" -a -s /etc/mailer.conf \
+ -a -x /usr/sbin/sendmail ]; then
echo -n ' sendmail'; ( /usr/sbin/sendmail ${sendmail_flags} >/dev/null 2>&1 & )
fi
@@ -469,60 +473,62 @@ if [ "X${httpd_flags}" != X"NO" ]; then
echo -n ' httpd'; /usr/sbin/httpd ${httpd_flags}
fi
-if [ "X${ftpd_flags}" != X"NO" ]; then
+if [ "X${ftpd_flags}" != X"NO" -a -x /usr/libexec/ftpd ]; then
echo -n ' ftpd'; /usr/libexec/ftpd ${ftpd_flags}
fi
-if [ "X${identd_flags}" != X"NO" ]; then
+if [ "X${identd_flags}" != X"NO" -a -x /usr/libexec/identd ]; then
echo -n ' identd'; /usr/libexec/identd ${identd_flags}
fi
# $smtpfwdd_flags is imported from /etc/rc.conf;
# If $smtpfwdd_flags == NO, smtpfwdd isn't run.
-if [ "X${smtpfwdd_flags}" != X"NO" ]; then
+if [ "X${smtpfwdd_flags}" != X"NO" -a -x /usr/libexec/smtpfwdd ]; then
echo -n ' smtpfwdd'; /usr/libexec/smtpfwdd ${smtpfwdd_flags}
fi
-if [ X${inetd} = X"YES" -a -e /etc/inetd.conf ]; then
- echo -n ' inetd'; inetd
+if [ X${inetd} = X"YES" -a -r /etc/inetd.conf -a -x /usr/sbin/inetd ]; then
+ echo -n ' inetd'; /usr/sbin/inetd
fi
# $rarpd_flags is imported from /etc/rc.conf;
# If $rarpd_flags == NO or /etc/ethers doesn't exist, then
# rarpd isn't run.
-if [ "X${rarpd_flags}" != X"NO" -a -s /etc/ethers ]; then
- echo -n ' rarpd'; rarpd ${rarpd_flags}
+if [ "X${rarpd_flags}" != X"NO" -a -s /etc/ethers -a -x /usr/sbin/rarpd ]; then
+ echo -n ' rarpd'; /usr/sbin/rarpd ${rarpd_flags}
fi
# $bootparamd_flags is imported from /etc/rc.conf;
# If $bootparamd_flags == NO or /etc/bootparams doesn't exist, then
# bootparamd isn't run.
-if [ "X${bootparamd_flags}" != X"NO" -a -s /etc/bootparams ]; then
- echo -n ' rpc.bootparamd'; rpc.bootparamd ${bootparamd_flags}
+if [ "X${bootparamd_flags}" != X"NO" -a -s /etc/bootparams \
+ -a -x /usr/sbin/rpc.bootparamd ]; then
+ echo -n ' rpc.bootparamd'; /usr/sbin/rpc.bootparamd ${bootparamd_flags}
fi
# $rbootd_flags is imported from /etc/rc.conf;
# If $rbootd_flags == NO or /etc/rbootd.conf doesn't exist, then
# rbootd isn't run.
-if [ "X${rbootd_flags}" != X"NO" -a -s /etc/rbootd.conf ]; then
- echo -n ' rbootd'; rbootd ${rbootd_flags}
+if [ "X${rbootd_flags}" != X"NO" -a -s /etc/rbootd.conf \
+ -a -x /usr/sbin/rbootd ]; then
+ echo -n ' rbootd'; /usr/sbin/rbootd ${rbootd_flags}
fi
# $mopd_flags is imported from /etc/rc.conf;
# If $mopd_flags == NO or /tftpboot/mop doesn't exist, then
# mopd isn't run.
-if [ "X${mopd_flags}" != X"NO" -a -d /tftpboot/mop ]; then
- echo -n ' mopd'; mopd ${mopd_flags}
+if [ "X${mopd_flags}" != X"NO" -a -d /tftpboot/mop -a -x /usr/sbin/mopd ]; then
+ echo -n ' mopd'; /usr/sbin/mopd ${mopd_flags}
fi
-if [ X"${sshd_flags}" != X"NO" ]; then
+if [ X"${sshd_flags}" != X"NO" -a -x /usr/sbin/sshd ]; then
/usr/sbin/sshd ${sshd_flags}; echo -n ' sshd'
fi
echo '.'
-if [ -f /sbin/kbd -a -f /etc/kbdtype ]; then
+if [ -x /sbin/kbd -a -r /etc/kbdtype ]; then
kbd `cat /etc/kbdtype`
fi
@@ -556,7 +562,7 @@ if [ X${krb5_slave_kdc} = X"YES" ]; then
# Remember to enable hpropd in inetd.conf
fi
-[ -f /etc/rc.local ] && . /etc/rc.local
+[ -r /etc/rc.local ] && . /etc/rc.local
echo -n standard daemons:
@@ -581,7 +587,7 @@ if [ "X${wsmoused_flags}" != X"NO" -a -x
fi
# Alternatively, on some architectures, xdm may be started in /etc/ttys.
-if [ "X${xdm_flags}" != X"NO" ]; then
+if [ "X${xdm_flags}" != X"NO" -a -x /usr/X11R6/bin/xdm ]; then
echo 'starting xdm...'; /usr/X11R6/bin/xdm ${xdm_flags}
fi