[BACK]Return to rc CVS log [TXT][DIR] Up to [local] / src / etc

Diff for /src/etc/rc between version 1.253 and 1.254

version 1.253, 2004/09/18 20:17:37 version 1.254, 2004/09/27 08:43:51
Line 128 
Line 128 
 # pick up option configuration  # pick up option configuration
 . /etc/rc.conf  . /etc/rc.conf
   
 # set flags on ttys.  (do early, in case they use tty for SLIP in netstart)  # set flags on ttys. (do early, in case they use tty for SLIP in netstart)
 echo 'setting tty flags'  echo 'setting tty flags'
 ttyflags -a  ttyflags -a
   
Line 220 
Line 220 
 fi  fi
 syslogd ${syslogd_flags}  syslogd ${syslogd_flags}
   
   # run rdate before timed and ntpd
   if [ X"${rdate_flags}" != X"NO" ]; then
           echo -n 'running rdate'; rdate -s ${rdate_flags}; echo '.'
   fi
   
   if [ "X${ntpd_flags}" != X"NO" ]; then
           # since this is system startup, use -s
           echo -n 'starting ntpd'; ntpd -s $ntpd_flags; echo '.'
   fi
   
   if [ "X${timed_flags}" != X"NO" ]; then
           echo -n 'starting timed'; timed $timed_flags; echo '.'
   fi
   
 if [ X"${pf}" != X"NO" -a X"${pflogd_flags}" != X"NO" ]; then  if [ X"${pf}" != X"NO" -a X"${pflogd_flags}" != X"NO" ]; then
         ifconfig pflog0 up          ifconfig pflog0 up
         pflogd ${pflogd_flags}          pflogd ${pflogd_flags}
Line 303 
Line 317 
             -a ${amd_dir} `cat ${amd_master}` > /var/run/amd.pid )              -a ${amd_dir} `cat ${amd_master}` > /var/run/amd.pid )
 fi  fi
   
 # run rdate before timed/ntpd  
 if [ X"${rdate_flags}" != X"NO" ]; then  
         echo -n ' rdate';       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  
 fi  
   
 if [ "X${ntpd_flags}" != X"NO" ]; then  
         # since this is system startup, use -s  
         echo -n ' ntpd'; ntpd -s $ntpd_flags  
 fi  
 echo '.'  echo '.'
   
 mount -a -t nfs  mount -a -t nfs
Line 370 
Line 369 
     find . ! -name . ! -name lost+found ! -name quota.user \      find . ! -name . ! -name lost+found ! -name quota.user \
         ! -name quota.group -execdir rm -rf -- {} \; -type d -prune)          ! -name quota.group -execdir rm -rf -- {} \; -type d -prune)
   
 # create Unix sockets directories  for X if needed and make sure they have  # create Unix sockets directories for X if needed and make sure they have
 # correct permissions  # correct permissions
 if [ -d /usr/X11R6/lib ]; then  if [ -d /usr/X11R6/lib ]; then
         for d in /tmp/.X11-unix /tmp/.ICE-unix ; do          for d in /tmp/.X11-unix /tmp/.ICE-unix ; do
Line 531 
Line 530 
   
 # $sendmail_flags is imported from /etc/rc.conf;  # $sendmail_flags is imported from /etc/rc.conf;
 # If $sendmail_flags == NO or /etc/mailer.conf doesn't exist, then  # If $sendmail_flags == NO or /etc/mailer.conf doesn't exist, then
 # sendmail isn't run.  We call sendmail with a full path so that  # sendmail isn't run. We call sendmail with a full path so that
 # SIGHUP works.  Note that /usr/sbin/sendmail may actually call a  # SIGHUP works. Note that /usr/sbin/sendmail may actually call a
 # mailer other than sendmail, depending on /etc/mailer.conf.  # 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 ]; then
         echo -n ' sendmail';            ( /usr/sbin/sendmail ${sendmail_flags} >/dev/null 2>&1 & )          echo -n ' sendmail';            ( /usr/sbin/sendmail ${sendmail_flags} >/dev/null 2>&1 & )
 fi  fi
   
 if [ "X${httpd_flags}" != X"NO"  ]; then  if [ "X${httpd_flags}" != X"NO" ]; then
         # Clean up left-over httpd locks          # Clean up left-over httpd locks
         rm -f /var/www/logs/{ssl_mutex,httpd.lock,accept.lock}.*          rm -f /var/www/logs/{ssl_mutex,httpd.lock,accept.lock}.*
         echo -n ' httpd';               /usr/sbin/httpd ${httpd_flags}          echo -n ' httpd';               /usr/sbin/httpd ${httpd_flags}

Legend:
Removed from v.1.253  
changed lines
  Added in v.1.254