[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.57 and 1.84

version 1.57, 2021/12/08 03:45:05 version 1.84, 2021/12/18 20:40:36
Line 16 
Line 16 
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   
 set -o errexit -o pipefail -o nounset  set -o errexit -o pipefail -o nounset
   export PATH=/usr/bin:/bin:/usr/sbin:/sbin
   
 CFILE=SHA256.sig  CFILE=SHA256.sig
 DESTDIR=${DESTDIR:-}  DESTDIR=${DESTDIR:-}
Line 32 
Line 33 
 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
   
   LOCALSRC=
   
 tmpdir() {  tmpdir() {
         local _i=1 _dir          local _i=1 _dir
   
         # If we're not in the installer,          # If we're not in the installer,
         # we have mktemp and a more hostile environment          # we have mktemp and a more hostile environment.
         if [ -x /usr/bin/mktemp ]; then          if [ -x /usr/bin/mktemp ]; then
                 _dir=$( mktemp -d "${1}-XXXXXXXXX" )                  _dir=$( mktemp -d "${1}-XXXXXXXXX" )
         else          else
Line 48 
Line 51 
         echo "$_dir"          echo "$_dir"
 }  }
   
 realpath () {  
         if [ -x /usr/bin/realpath ]; then  
                 /usr/bin/realpath "$1"  
         elif [ "$1" = "${1%/*}" ]; then  
                 echo "${PWD}/$1"  
         else  
                 echo "$( cd "${1%/*}" && pwd )/${1##*/}"  
         fi  
 }  
   
 fetch() {  fetch() {
         local _file=$1 _user=_file _exit          local _src="${FWURL}/${1##*/}" _dst=$1 _user=_file _exit
   
         >"$_file"          # If we're not in the installer,
         chown "$_user" "$_file"          # we have su(1) and doas(1) is unlikely to be configured.
   
         # If we're not in the installer, we have su(1)  
         # and doas(1) is unlikely to be configured.  
         if [ -x /usr/bin/su ]; then          if [ -x /usr/bin/su ]; then
                 /usr/bin/su -s /bin/ksh "$_user" -c \                  /usr/bin/su -s /bin/ksh "$_user" -c \
                     "/usr/bin/ftp -D 'Get/Verify' -Vm \                      "/usr/bin/ftp -D 'Get/Verify' -Vm -o- '$_src'" > "$_dst"
                         -o '$_file' '${FWURL}/${_file}'"  
                 _exit="$?"                  _exit="$?"
         else          else
                 /usr/bin/doas -u "$_user" \                  /usr/bin/doas -u "$_user" \
                     ftp -D 'Get/Verify' -Vm \                      /usr/bin/ftp -D 'Get/Verify' -Vm -o- "$_src" > "$_dst"
                         -o "$_file" "${FWURL}/${_file}"  
                 _exit="$?"                  _exit="$?"
         fi          fi
   
         if [ "$_exit" -ne 0 ]; then          if [ "$_exit" -ne 0 ]; then
                 rm -f "$_file"                  rm -f "$_dst"
                 echo "Cannot fetch $_file" >&2                  echo "Cannot fetch $_src" >&2
                 return 1                  return 1
         fi          fi
   
         chown root "$_file"  
 }  }
   
 verify() {  verify() {
         # On the installer we don't get sha256 -C, so fake it.          # On the installer we don't get sha256 -C, so fake it.
         if ! fgrep -qx "SHA256 ($1) = $( /bin/sha256 -qb "$1" )" "$CFILE"; then          if ! fgrep -qx "SHA256 (${1##*/}) = $( /bin/sha256 -qb "$1" )" "$CFILE"; then
                 echo "Checksum test for $1 failed." >&2                  echo "Checksum test for ${1##*/} failed." >&2
                 return 1                  return 1
         fi          fi
 }  }
   
 devices_needing_firmware() {  devices_needing_firmware() {
         local _d _m _grep _dmesgtail _last=''          local _d _m _line _dmesgtail _last=''
   
         # 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
         _dmesgtail=$( sed -n 'H;/^OpenBSD/h;${g;p;}' /var/run/dmesg.boot )          sed -n 'H;/^OpenBSD/h;${g;p;}' /var/run/dmesg.boot |
               grep -e "^[a-z][a-z]*[0-9]" -e " not configured " | { \
                   _m=0
                   set -A _dmesgtail
                   while read -r _line; do
                           _dmesgtail[$_m]="$_line"
                           let _m=$_m+1
                   done
   
         grep -v '^[[:space:]]*#' "$FWPATTERNS" |                  grep -v '^[[:space:]]*#' "$FWPATTERNS" |
             while read -r _d _m; do                      while read -r _d _m; do
                 _grep="grep"                          [ "$_d" = "$_last" ] && continue
                 [ "$_last" = "$_d" ] && continue                          [ "$_m" ] || _m="^${_d}[0-9] at "
                 [ "$_m" ] || _m="^${_d}[0-9][0-9]* at "  
                 [ "$_m" = "${_m#^}" ] && _grep="fgrep"  
   
                 echo "$_dmesgtail" | $_grep -q "$_m" || continue                          if [ "$_m" = "${_m#^}" ]; then
                 echo "$_d"                                  _m="*$_m"
                 _last="$_d"                          else
         done                                  _m="${_m#^}"
                           fi
   
                           for _line in "${_dmesgtail[@]}"; do
                                   if [[ $_line = ${_m}* ]]; then
                                           echo "$_d"
                                           _last="$_d"
                                   fi
                           done
                       done
           }
 }  }
   
 firmware_filename() {  firmware_filename() {
Line 136 
Line 137 
 }  }
   
 add_firmware () {  add_firmware () {
         local _f="$1" _pkgdir="${DESTDIR}/var/db/pkg"          local _f="${1##*/}"
           local _pkgdir="${DESTDIR}/var/db/pkg/${_f%.tgz}"
         ftp -D "Install" -Vmo- "file:${1}" |          ftp -D "Install" -Vmo- "file:${1}" |
                 tar -s ",^\+,${_pkgdir}/${_f%.tgz}/+," \                  tar -s ",^\+,${_pkgdir}/+," \
                 -s ",^firmware,${DESTDIR}/etc/firmware," \                      -s ",^firmware,${DESTDIR}/etc/firmware," \
                 -C / -zxphf - "+*" "firmware/*"                      -C / -zxphf - "+*" "firmware/*"
   
         # TODO: Should we mark these so real fw_update can -Drepair?          # TODO: Should we mark these so real fw_update can -Drepair?
         ed -s "${_pkgdir}/${_f%.tgz}/+CONTENTS" <<EOL          ed -s "${_pkgdir}/+CONTENTS" <<EOL
 /^@comment pkgpath/ -1a  /^@comment pkgpath/ -1a
 @option manual-installation  @option manual-installation
 @option firmware  @option firmware
Line 186 
Line 188 
         done          done
 }  }
   
 set -A devices -- $( devices_needing_firmware )  usage() {
           echo "usage: fw_install [-DL] [driver | file [...]]"
           exit 2
   }
   
 if [ ! "${devices:-}" ]; then  INSTALL=true
   DOWNLOAD=true
   
   while getopts DL name
   do
          case "$name" in
          # "download only" means local dir and don't install
          D) LOCALSRC=. INSTALL=false ;;
          L) LOCALSRC=. ;;
          ?) usage 2 ;;
          esac
   done
   shift $((OPTIND - 1))
   
   # If we're installing from a local dir
   # we don't want to download anything
   [ "$LOCALSRC" ] && "$INSTALL" && DOWNLOAD=false
   [ "$LOCALSRC" ] || LOCALSRC="$( tmpdir "${DESTDIR}/tmp/fw_install" )"
   
   CFILE="$LOCALSRC/$CFILE"
   
   set -A devices -- "$@"
   
   [ "${devices[*]:-}" ] ||
       set -A devices -- $( devices_needing_firmware )
   
   if [ ! "${devices[*]:-}" ]; then
         echo "No devices found which need firmware files to be downloaded."          echo "No devices found which need firmware files to be downloaded."
         exit          exit
 fi  fi
   
 TMPDIR=$( tmpdir "${DESTDIR}/tmp/fw_install" )  if "$DOWNLOAD"; then
 cd "$TMPDIR"          fetch "$CFILE"
           ! signify -qVep "$FWPUB_KEY" -x "$CFILE" -m "$CFILE" &&
               echo "Signature check of SHA256.sig failed" >&2 && exit 1
   fi
   
 # To unpriv we need to let the unpriv user into this dir  for f in "${devices[@]}"; do
 chmod go+x .          d="$( firmware_devicename "$f" )"
   
 fetch "$CFILE"          if [ "$f" = "$d" ]; then
 ! signify -qVep "$FWPUB_KEY" -x "$CFILE" -m "$CFILE" &&                  f=$( firmware_filename "$d" || true )
     echo "Signature check of SHA256.sig failed" >&2 && exit 1                  [ "$f" ] || continue
                   f="$LOCALSRC/$f"
           elif ! "$INSTALL" && ! grep -Fq "($f)" "$CFILE" ; then
                   echo "Cannot download local file $f" >&2
                   exit 2
           fi
   
 for d in "${devices[@]}"; do  
         f=$( firmware_filename "$d" || true )  
         [ "$f" ] || continue  
         set -A installed -- $( installed_firmware "$d" )          set -A installed -- $( installed_firmware "$d" )
   
         if [ "${installed:-}" ]; then          if "$INSTALL" && [ "${installed[*]:-}" ]; then
                 for i in "${installed[@]:-}"; do                  for i in "${installed[@]}"; do
                         if [ "$f" = "$i.tgz" ]; then                          if [ "${f##*/}" = "$i.tgz" ]; then
                                 echo "$i already installed"                                  echo "$i already installed"
                                 continue 2                                  continue 2
                         fi                          fi
                 done                  done
         fi          fi
   
         fetch  "$f" || continue          if [ -e "$f" ]; then
         verify "$f" || continue                  if "$DOWNLOAD"; then
                           echo "Verify existing ${f##*/}"
                           verify "$f" || continue
                   # else assume it was verified when downloaded
                   fi
           elif "$DOWNLOAD"; then
                   fetch  "$f" || continue
                   verify "$f" || continue
           elif "$INSTALL"; then
                   echo "Cannot install ${f##*/}, not found" >&2
                   continue
           fi
   
         if [ "${installed:-}" ]; then          "$INSTALL" || continue
   
           if [ "${installed[*]:-}" ]; then
                 for i in "${installed[@]}"; do                  for i in "${installed[@]}"; do
                         delete_firmware "$i"                          delete_firmware "$i"
                 done                  done
Legend:
Removed from v.1.57  
changed lines
  Added in v.1.84
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>