[BACK]Return to fw_install.sh CVS log [TXT][DIR] Up to [local] / openbsd / fw_update

Diff for /openbsd/fw_update/fw_install.sh between version 1.89 and 1.94

version 1.89, 2021/12/19 04:05:25 version 1.94, 2021/12/21 02:16:01
Line 55 
Line 55 
 }  }
   
 fetch() {  fetch() {
         local _src="${FWURL}/${1##*/}" _dst=$1 _user=_file _pid _exit          local _src="${FWURL}/${1##*/}" _dst=$1 _user=_file _pid _exit _error=''
   
         # If we're not in the installer,          # If we're not in the installer,
         # we have su(1) and doas(1) is unlikely to be configured.          # we have su(1) and doas(1) is unlikely to be configured.
Line 84 
Line 84 
                                 sleep 1                                  sleep 1
                         else                          else
                                 kill -INT -"$_pid"                                  kill -INT -"$_pid"
                                 echo "fetch timed out" >&2                                  _error=" (timed out)"
                         fi                          fi
                 else                  else
                         sleep 1                          sleep 1
Line 100 
Line 100 
   
         if [ "$_exit" -ne 0 ]; then          if [ "$_exit" -ne 0 ]; then
                 rm -f "$_dst"                  rm -f "$_dst"
                 echo "Cannot fetch $_src" >&2                  echo "Cannot fetch $_src$_error" >&2
                 return 1                  return 1
         fi          fi
 }  }
Line 114 
Line 114 
 }  }
   
 devices_needing_firmware() {  devices_needing_firmware() {
         local _d _m _line _dmesgtail _last=''          local _d _m _line _dmesgtail _last='' _nl=$( echo )
   
         # When we're not in the installer, the dmesg.boot can          # When we're not in the installer, the dmesg.boot can
         # contain multiple boots, so only look in the last one          # contain multiple boots, so only look in the last one
Line 124 
Line 124 
         grep -v '^[[:space:]]*#' "$FWPATTERNS" |          grep -v '^[[:space:]]*#' "$FWPATTERNS" |
             while read -r _d _m; do              while read -r _d _m; do
                 [ "$_d" = "$_last" ] && continue                  [ "$_d" = "$_last" ] && continue
                 [ "$_m" ] || _m="^${_d}[0-9] at "                  [ "$_m" ]             || _m="${_nl}${_d}[0-9] at "
                   [ "$_m" = "${_m#^}" ] || _m="${_nl}${_m#^}"
   
                 if [ "$_m" != "${_m#^}" ]; then  
                         _m="$( echo -n "\n${_m#^}" )"  
                 fi  
   
                 if [[ $_dmesgtail = *$_m* ]]; then                  if [[ $_dmesgtail = *$_m* ]]; then
                         echo "$_d"                          echo "$_d"
                         _last="$_d"                          _last="$_d"
Line 210 
Line 207 
 }  }
   
 usage() {  usage() {
         echo "usage: fw_install [-D | -L] [driver | file ...]"          echo "usage:  ${0##*/} [-D | -L] [driver | file ...]"
         exit 2          exit 2
 }  }
   
Line 242 
Line 239 
   
 CFILE="$LOCALSRC/$CFILE"  CFILE="$LOCALSRC/$CFILE"
   
   if "$INSTALL" && [ -x /usr/bin/id ] && [ $(/usr/bin/id -u) != 0 ]; then
           echo "need root privileges" >&2
           exit 1
   fi
   
 set -A devices -- "$@"  set -A devices -- "$@"
   
 [ "${devices[*]:-}" ] ||  
     set -A devices -- $( devices_needing_firmware )  
   
 if [ ! "${devices[*]:-}" ]; then  if [ ! "${devices[*]:-}" ]; then
         echo "No devices found which need firmware files to be downloaded."          echo -n "Detecting firmware ..."
         exit          set -A devices -- $( devices_needing_firmware )
           [ "${devices[*]:-}" ] && echo " found." || echo " done."
 fi  fi
   
   [ "${devices[*]:-}" ] || exit
   
 if "$DOWNLOAD"; then  if "$DOWNLOAD"; then
         fetch "$CFILE"          fetch "$CFILE"
Legend:
Removed from v.1.89  
changed lines
  Added in v.1.94
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>