[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.19 and 1.20

version 1.19, 2021/10/21 02:02:52 version 1.20, 2021/10/21 02:17:27
Line 63 
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 90 
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 198 
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 209 
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.19  
changed lines
  Added in v.1.20
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>