[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.18 and 1.21

version 1.18, 2021/10/18 00:33:07 version 1.21, 2021/10/21 02:25:32
Line 6 
Line 6 
         sed -n "$1" /var/run/dmesg.boot          sed -n "$1" /var/run/dmesg.boot
 }  }
   
 installed_firmware() {  
         for fw in ${PKGDIR}/$1-firmware*; do  
                 [ -e "$fw" ] || continue  
                 echo ${fw##*/}  
         done  
 }  
   
 # tmpdir, do_as, unpriv, and unpriv2 are from install.sub  # tmpdir, do_as, unpriv, and unpriv2 are from install.sub
   
 # Create a temporary directory based on the supplied directory name prefix.  # Create a temporary directory based on the supplied directory name prefix.
Line 70 
Line 63 
         do_as _file "$@"          do_as _file "$@"
 }  }
   
   # "fail" needs to be replaced with the "ask_yn" loop like in the installer.
 _issue=  _issue=
 fail() {  fail() {
         echo $_issue >&2          echo $_issue >&2
Line 97 
Line 91 
 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
 PKGDIR=${DESTDIR}/var/db/pkg  PKGDIR=${DESTDIR}/var/db/pkg
 PATTERNS="file:${0%/*}/firmware_patterns"  FWPATTERNS="file:${0%/*}/firmware_patterns"
   
   # TODO: support srclocal installation of firmware somehow
 fw_update() {  fw_update() {
         local _tmpsrc _f _r _remove _i _installed          local _src=$FWURL _tmpsrc _t=Get _cfile="/tmp/SHA256" _srclocal=false
         local _src=$FWURL _t=Get _cfile="/tmp/SHA256" _srclocal=false          local _f _r _remove _i _installed
         local _d _drivers=$(          local _d _drivers=$(
                 last=''                  last=''
                 ftp -D "Detecting" -Vmo- $PATTERNS |                  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 135 
Line 130 
         # Cleanup from previous runs.          # Cleanup from previous runs.
         rm -f $_cfile $_cfile.sig          rm -f $_cfile $_cfile.sig
   
     _t=Get/Verify          _t=Get/Verify
   
         ! $_unpriv ftp -D "$_t" -Vmo - "$_src/SHA256.sig" >"$_cfile.sig" &&          ! $_unpriv ftp -D "$_t" -Vmo - "$_src/SHA256.sig" >"$_cfile.sig" &&
             _issue="Cannot fetch SHA256.sig" && fail              _issue="Cannot fetch SHA256.sig" && fail
Line 147 
Line 142 
   
         for _d in $_drivers; do          for _d in $_drivers; do
                 _f=$( sed -n "s/.*(\($_d-firmware-.*\.tgz\)).*/\1/p" "$_cfile" )                  _f=$( sed -n "s/.*(\($_d-firmware-.*\.tgz\)).*/\1/p" "$_cfile" )
                 _installed=$( installed_firmware "$_d" )                  _installed=$(
                   for fw in "${PKGDIR}/$_d-firmware"*; do
                           [ -e "$fw" ] || continue
                           echo ${fw##*/}
                   done
                   )
   
                 for _i in $_installed; do                  for _i in $_installed; do
                         if [ "$_f" = "$_i.tgz" ]; then                          if [ "$_f" = "$_i.tgz" ]; then
Line 200 
Line 200 
                                 esac                                  esac
                         done < "${PKGDIR}/$_installed/+CONTENTS"                          done < "${PKGDIR}/$_installed/+CONTENTS"
   
                           # We specifically rm -f here because not removing files/dirs
                           # is probably not worth failing over.
                         for _r in "${_remove[@]}" ; do                          for _r in "${_remove[@]}" ; do
                                 if [ -d "$_r" ]; then                                  if [ -d "$_r" ]; then
                                         # Try hard not to actually remove recursively                                          # Try hard not to actually remove recursively
Line 211 
Line 213 
                         done                          done
                 fi                  fi
   
         # TODO: Add some details about the install to +CONTENTS like pkg_add                  # TODO: Should we mark these so real fw_update can -Drepair?
         # TODO: Or, maybe we save the firmware someplace and make pkg_add reinstall  
                 echo "Installing $_f"                  echo "Installing $_f"
                 tar -zxphf "$_tmpsrc/$_f" -C "${DESTDIR}/etc" "firmware/*"                  tar -zxphf "$_tmpsrc/$_f" -C "${DESTDIR}/etc" "firmware/*"
                 mkdir -p ${PKGDIR}/${_f%.tgz}/                  mkdir -p ${PKGDIR}/${_f%.tgz}/
Legend:
Removed from v.1.18  
changed lines
  Added in v.1.21
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>