[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.123 and 1.125

version 1.123, 2021/12/24 17:57:54 version 1.125, 2021/12/25 00:27:56
Line 117 
Line 117 
         fi          fi
 }  }
   
 devices_needing_firmware() {  firmware_in_dmesg() {
         local _d _m _line _dmesgtail _last='' _nl=$( echo )          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
Line 168 
Line 168 
         done          done
 }  }
   
   detect_firmware() {
           local _devices _last='' _d
   
           set -sA _devices -- $(
               firmware_in_dmesg
               for _d in $( installed_firmware '*' '-firmware-' '*' ); do
                   echo "$( firmware_devicename "$_d" )"
               done
           )
   
           [ "${_devices[*]:-}" ] || return 0
           for _d in "${_devices[@]}"; do
                   [[ $_last = $_d ]] && continue
                   echo $_d
                   _last="$_d"
           done
   }
   
 add_firmware () {  add_firmware () {
         local _f="${1##*/}" _pkgname          local _f="${1##*/}" _pkgname
         local _tmpdir="$( tmpdir "${DESTDIR}/var/db/pkg/.firmware" )"          local _tmpdir="$( tmpdir "${DESTDIR}/var/db/pkg/.firmware" )"
Line 285 
Line 303 
         LOCALSRC="${LOCALSRC:-.}"          LOCALSRC="${LOCALSRC:-.}"
 fi  fi
   
 [ "$LOCALSRC" ] || LOCALSRC="$( tmpdir "${DESTDIR}/tmp/${0##*/}" )"  
   
 CFILE="$LOCALSRC/$CFILE"  
   
 if [ -x /usr/bin/id ] && [ "$(/usr/bin/id -u)" != 0 ]; then  if [ -x /usr/bin/id ] && [ "$(/usr/bin/id -u)" != 0 ]; then
         echo "need root privileges" >&2          echo "need root privileges" >&2
         exit 1          exit 1
Line 336 
Line 350 
         exit          exit
 fi  fi
   
   if [ ! "$LOCALSRC" ]; then
       LOCALSRC="$( tmpdir "${DESTDIR}/tmp/${0##*/}" )"
   fi
   
   CFILE="$LOCALSRC/$CFILE"
   
 if [ "${devices[*]:-}" ]; then  if [ "${devices[*]:-}" ]; then
         "$ALL" && usage 22          "$ALL" && usage 22
 else  else
         "$VERBOSE" && echo -n "Detecting firmware ..."          "$VERBOSE" && echo -n "Detecting firmware ..."
         set -sA devices -- $( devices_needing_firmware )          set -sA devices -- $( detect_firmware )
         "$VERBOSE" &&          "$VERBOSE" &&
             { [ "${devices[*]:-}" ] && echo " found." || echo " done." ; }              { [ "${devices[*]:-}" ] && echo " found." || echo " done." ; }
 fi  fi
Legend:
Removed from v.1.123  
changed lines
  Added in v.1.125
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>