[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.30 and 1.37

version 1.30, 2021/11/18 02:15:34 version 1.37, 2021/12/01 02:04:18
Line 1 
Line 1 
 #!/bin/ksh  #!/bin/ksh
   #       $OpenBSD$
 set -e  set -e
   
 # Fake up some things from install.sub that we don't need to actually do  # Fake up some things from install.sub that we don't need to actually do
 prefetcharea_fs_list() {  prefetcharea_fs_list() {
         echo "${DESTDIR}/tmp"          echo "${DESTDIR}/tmp"
 }  }
 reset_watchdog() {  
 }  
   
 # tmpdir, do_as, unpriv, and unpriv2 are from install.sub  # tmpdir, do_as, unpriv, and unpriv2 are from install.sub
   
Line 65 
Line 64 
         do_as _file "$@"          do_as _file "$@"
 }  }
   
 # "fail" needs to be replaced with the "ask_yn" loop like in the installer.  VNAME=${VNAME:-$(sysctl -n kern.osrelease)}
 _issue=  VERSION=${VERSION:-"${VNAME%.*}${VNAME#*.}"}
 fail() {  FWDIR=${FWDIR:-$VNAME}
         echo $_issue >&2  
         exit 1  
 }  
   
 VNAME=$(sysctl -n kern.osrelease)  
 VERSION="${VNAME%.*}${VNAME#*.}"  
 FWDIR="$VNAME"  
 MODE=${MODE:-install}  MODE=${MODE:-install}
   
 # TODO: We need the firmware for the system we just installed  # TODO: We need the firmware for the system we just installed
Line 93 
Line 85 
   
 FWURL=http://firmware.openbsd.org/firmware/${HTTP_FWDIR}  FWURL=http://firmware.openbsd.org/firmware/${HTTP_FWDIR}
 FWPUB_KEY=${DESTDIR}/etc/signify/openbsd-${VERSION}-fw.pub  FWPUB_KEY=${DESTDIR}/etc/signify/openbsd-${VERSION}-fw.pub
 FWPATTERNS="file:${0%/*}/firmware_patterns"  FWPATTERNS="${DESTDIR}/usr/share/misc/firmware_patterns"
   
 # TODO: support srclocal installation of firmware somehow  # TODO: support srclocal installation of firmware somehow
 fw_update() {  fw_install() {
         local _src=$1 _tmpfs_list _tmpfs _tmpsrc \          local _src=$1 _tmpfs_list _tmpfs _tmpsrc \
                 _t=Get _cfile="/tmp/SHA256" _pkgdir=${DESTDIR}/var/db/pkg \                  _t=Get _cfile="/tmp/SHA256" _pkgdir=${DESTDIR}/var/db/pkg \
                 _f _r _remove _i _installed                  _f _r _remove _i _installed
Line 105 
Line 97 
         echo "Let's $MODE firmware!"          echo "Let's $MODE firmware!"
         local _d _drivers=$(          local _d _drivers=$(
                 last=''                  last=''
                 $_unpriv ftp -D "Detecting" -Vmo- $FWPATTERNS |  
                 while read _d _m; do                  while read _d _m; do
                         grep=grep                          grep=grep
                         [ "$last" = "$_d" ] && continue                          [ "$last" = "$_d" ] && continue
Line 114 
Line 105 
                         $grep -q "$_m" /var/run/dmesg.boot || continue                          $grep -q "$_m" /var/run/dmesg.boot || continue
                         echo $_d                          echo $_d
                         last=$_d                          last=$_d
                 done                  done < $FWPATTERNS
         )          )
   
         if [ -z "$_drivers" ]; then          if [ -z "$_drivers" ]; then
Line 162 
Line 153 
             echo "Signature check of SHA256.sig failed" >&2 && return 1              echo "Signature check of SHA256.sig failed" >&2 && return 1
   
         for _d in $_drivers; do          for _d in $_drivers; do
                 $UU && reset_watchdog  
                 _f=$( sed -n "s/.*(\($_d-firmware-.*\.tgz\)).*/\1/p" "$_cfile" )                  _f=$( sed -n "s/.*(\($_d-firmware-.*\.tgz\)).*/\1/p" "$_cfile" )
                 _installed=$(                  _installed=$(
                 for fw in "${_pkgdir}/$_d-firmware"*; do                  for fw in "${_pkgdir}/$_d-firmware"*; do
Line 249 
Line 239 
         done          done
 }  }
   
 fw_update "$FWURL"  fw_install "$FWURL"
Legend:
Removed from v.1.30  
changed lines
  Added in v.1.37
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>