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

Diff for /src/etc/rc between version 1.565 and 1.566

version 1.565, 2022/11/28 14:56:31 version 1.566, 2022/12/26 18:57:50
Line 188 
Line 188 
                 fi                  fi
         done          done
   
         echo -n 'reordering libraries:'          echo 'reordering libraries:'
   
         # Remount the (read-only) filesystems in _ro_list as read-write.          # Remount the (read-only) filesystems in _ro_list as read-write.
         for _mp in $_ro_list; do          for _mp in $_ro_list; do
Line 215 
Line 215 
                 cd $_tmpdir                  cd $_tmpdir
                 ar x $_liba                  ar x $_liba
                 if [[ $_lib == ld.so ]]; then                  if [[ $_lib == ld.so ]]; then
                         echo -n " $_lib"                          echo " $_lib"
                         args="-g -x -e _dl_start \                          args="-g -x -e _dl_start \
                             --version-script=Symbols.map --shared -Bsymbolic \                              --version-script=Symbols.map --shared -Bsymbolic \
                             --no-undefined"                              --no-undefined"
Line 226 
Line 226 
                         $_install /usr/libexec/ld.so /usr/libexec/ld.so.save                          $_install /usr/libexec/ld.so /usr/libexec/ld.so.save
                         $_install ld.so.test $_lib_dir/ld.so                          $_install ld.so.test $_lib_dir/ld.so
                 else                  else
                         echo -n " ${_lib%%.*}"                          echo " ${_lib%%.*}"
                         cc -shared -o $_lib $(ls *.so | sort -R) $(<.ldadd)                          cc -shared -o $_lib $(ls *.so | sort -R) $(<.ldadd)
                         [[ -s $_lib ]] && file $_lib | fgrep -q 'shared object'                          [[ -s $_lib ]] && file $_lib | fgrep -q 'shared object'
                         LD_BIND_NOW=1 LD_LIBRARY_PATH=$_tmpdir awk 'BEGIN {exit 0}'                          LD_BIND_NOW=1 LD_LIBRARY_PATH=$_tmpdir awk 'BEGIN {exit 0}'
Line 251 
Line 251 
         fi          fi
 }  }
   
   # Read output of reorder_libs co-process and output on console.
   wait_reorder_libs() {
           local _line
           while IFS= read -p _line; do
                   echo -n "$_line"
           done
           echo
   }
   
 # Run rc.* script and email output to root.  # Run rc.* script and email output to root.
 # Usage: run_upgrade_script firsttime|sysmerge  # Usage: run_upgrade_script firsttime|sysmerge
 run_upgrade_script() {  run_upgrade_script() {
Line 452 
Line 461 
 mount -s /var/log >/dev/null 2>&1       # cannot be on NFS  mount -s /var/log >/dev/null 2>&1       # cannot be on NFS
 mount -s /usr >/dev/null 2>&1           # if NFS, fstab must use IP address  mount -s /usr >/dev/null 2>&1           # if NFS, fstab must use IP address
   
   reorder_libs 2>&1 |&
   
 start_daemon slaacd dhcpleased resolvd >/dev/null 2>&1  start_daemon slaacd dhcpleased resolvd >/dev/null 2>&1
   
 echo 'starting network'  echo 'starting network'
Line 466 
Line 477 
   
 random_seed  random_seed
   
 reorder_libs  wait_reorder_libs
   
 # Load pf rules and bring up pfsync interface.  # Load pf rules and bring up pfsync interface.
 if [[ $pf != NO ]]; then  if [[ $pf != NO ]]; then
Legend:
Removed from v.1.565  
changed lines
  Added in v.1.566