[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.94 and 1.108

version 1.94, 2021/12/21 02:16:01 version 1.108, 2021/12/23 03:45:46
Line 15 
Line 15 
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF  # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 # 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 -o noclobber -o noglob
 set +o monitor  set +o monitor
 export PATH=/usr/bin:/bin:/usr/sbin:/sbin  export PATH=/usr/bin:/bin:/usr/sbin:/sbin
   
Line 34 
Line 34 
 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
   
   VERBOSE=false
 DOWNLOAD=true  DOWNLOAD=true
 INSTALL=true  INSTALL=true
 LOCALSRC=  LOCALSRC=
Line 61 
Line 62 
         # we have su(1) and doas(1) is unlikely to be configured.          # we have su(1) and doas(1) is unlikely to be configured.
         set -o monitor # make sure ftp gets its own process group          set -o monitor # make sure ftp gets its own process group
         (          (
           flags=-VM
           "$VERBOSE" && flags=-vm
         if [ -x /usr/bin/su ]; then          if [ -x /usr/bin/su ]; then
                 exec /usr/bin/su -s /bin/ksh "$_user" -c \                  exec /usr/bin/su -s /bin/ksh "$_user" -c \
                     "/usr/bin/ftp -D 'Get/Verify' -Vm -o- '$_src'" > "$_dst"                      "/usr/bin/ftp -D 'Get/Verify' $flags -o- '$_src'" > "$_dst"
         else          else
                 exec /usr/bin/doas -u "$_user" \                  exec /usr/bin/doas -u "$_user" \
                     /usr/bin/ftp -D 'Get/Verify' -Vm -o- "$_src" > "$_dst"                      /usr/bin/ftp -D 'Get/Verify' $flags -o- "$_src" > "$_dst"
         fi          fi
         ) & _pid=$!          ) & _pid=$!
         set +o monitor          set +o monitor
   
         trap "kill -TERM '-$_pid'; exit 1" EXIT INT QUIT ABRT TERM          trap "kill -TERM '-$_pid' 2>/dev/null; exit 1" EXIT INT QUIT ABRT TERM
   
         SECONDS=0          SECONDS=0
         _last=0          _last=0
Line 148 
Line 151 
 }  }
   
 installed_firmware() {  installed_firmware() {
           set +o noglob
         for fw in "${DESTDIR}/var/db/pkg/$1-firmware"*; do          for fw in "${DESTDIR}/var/db/pkg/$1-firmware"*; do
                 [ -e "$fw" ] || continue                  [ -e "$fw/+CONTENTS" ] || continue
                 echo "${fw##*/}"                  echo "${fw##*/}"
         done          done
           set -o noglob
 }  }
   
 add_firmware () {  add_firmware () {
         local _f="${1##*/}"          local _f="${1##*/}" _pkgname
         local _pkgdir="${DESTDIR}/var/db/pkg/${_f%.tgz}"          local _tmpdir="$( tmpdir "${DESTDIR}/var/db/pkg/.firmware" )"
         ftp -D "Install" -Vmo- "file:${1}" |          local flags=-VM
                 tar -s ",^\+,${_pkgdir}/+," \          "$VERBOSE" && flags=-vm
           ftp -D "Install" "$flags" -o- "file:${1}" |
                   tar -s ",^\+,${_tmpdir}/+," \
                     -s ",^firmware,${DESTDIR}/etc/firmware," \                      -s ",^firmware,${DESTDIR}/etc/firmware," \
                     -C / -zxphf - "+*" "firmware/*"                      -C / -zxphf - "+*" "firmware/*"
   
           _pkgname="$( sed -n '/^@name /{s///p;q;}' "${_tmpdir}/+CONTENTS" )"
           if [ ! "$_pkgname" ]; then
                   echo "Failed to extract name from $1, partial install" 2>&1
                   rm -rf "$_tmpdir"
                   return 1
           fi
   
         # 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}/+CONTENTS" <<EOL          ed -s "${_tmpdir}/+CONTENTS" <<EOL
 /^@comment pkgpath/ -1a  /^@comment pkgpath/ -1a
 @option manual-installation  @option manual-installation
 @option firmware  @option firmware
Line 171 
Line 185 
 .  .
 w  w
 EOL  EOL
   
           chmod 755 "$_tmpdir"
           mv "$_tmpdir" "${DESTDIR}/var/db/pkg/${_pkgname}"
 }  }
   
 delete_firmware() {  delete_firmware() {
         local _cwd _pkg="$1" _pkgdir="${DESTDIR}/var/db/pkg"          local _cwd _pkg="$1" _pkgdir="${DESTDIR}/var/db/pkg"
   
         # TODO: Check hash for files before deleting          # TODO: Check hash for files before deleting
         echo "Uninstalling $_pkg"          "$VERBOSE" && echo "Uninstalling $_pkg"
         _cwd="${_pkgdir}/$_pkg"          _cwd="${_pkgdir}/$_pkg"
   
           if [ ! -e "$_cwd/+CONTENTS" ] ||
               ! grep -Fxq '@option firmware' "$_cwd/+CONTENTS"; then
                   echo "${0##*/}: $_pkg does not appear to be firmware" >&2
                   return 2
           fi
   
         set -A _remove -- "${_cwd}/+CONTENTS" "${_cwd}"          set -A _remove -- "${_cwd}/+CONTENTS" "${_cwd}"
   
         while read -r c g; do          while read -r c g; do
Line 199 
Line 222 
                 if [ -d "$_r" ]; then                  if [ -d "$_r" ]; then
                         # Try hard not to actually remove recursively                          # Try hard not to actually remove recursively
                         # without rmdir on the install media.                          # without rmdir on the install media.
                           set +o noglob
                         [ "$_r/*" = "$( echo "$_r"/* )" ] && rm -rf "$_r"                          [ "$_r/*" = "$( echo "$_r"/* )" ] && rm -rf "$_r"
                           set -o noglob
                 else                  else
                         rm -f "$_r"                          rm -f "$_r"
                 fi                  fi
Line 207 
Line 232 
 }  }
   
 usage() {  usage() {
         echo "usage:  ${0##*/} [-D | -L] [driver | file ...]"          echo "usage:  ${0##*/} [-D | -L] [-v] [driver | file ...]"
         exit 2          exit 2
 }  }
   
 OPT_D=  OPT_D=
 OPT_L=  OPT_L=
 while getopts DL name  while getopts :DLv name
 do  do
        case "$name" in         case "$name" in
        D) OPT_D=true ;;         D) OPT_D=true ;;
        L) OPT_L=true ;;         L) OPT_L=true ;;
        ?) usage 2 ;;         v) VERBOSE=true ;;
          ?) echo "${0##*/}: unknown option -- -$OPTARG"; usage 2 ;;
        esac         esac
 done  done
 shift $((OPTIND - 1))  shift $((OPTIND - 1))
Line 234 
Line 260 
         DOWNLOAD=false          DOWNLOAD=false
         LOCALSRC=.          LOCALSRC=.
 else  else
         LOCALSRC="$( tmpdir "${DESTDIR}/tmp/fw_install" )"          LOCALSRC="$( tmpdir "${DESTDIR}/tmp/${0##*/}" )"
 fi  fi
   
 CFILE="$LOCALSRC/$CFILE"  CFILE="$LOCALSRC/$CFILE"
   
 if "$INSTALL" && [ -x /usr/bin/id ] && [ $(/usr/bin/id -u) != 0 ]; then  if "$INSTALL" && [ -x /usr/bin/id ] && [ "$(/usr/bin/id -u)" != 0 ]; then
         echo "need root privileges" >&2          echo "need root privileges" >&2
         exit 1          exit 1
 fi  fi
Line 247 
Line 273 
 set -A devices -- "$@"  set -A devices -- "$@"
   
 if [ ! "${devices[*]:-}" ]; then  if [ ! "${devices[*]:-}" ]; then
         echo -n "Detecting firmware ..."          "$VERBOSE" && echo -n "Detecting firmware ..."
         set -A devices -- $( devices_needing_firmware )          set -A devices -- $( devices_needing_firmware )
         [ "${devices[*]:-}" ] && echo " found." || echo " done."          "$VERBOSE" &&
               { [ "${devices[*]:-}" ] && echo " found." || echo " done." ; }
 fi  fi
   
 [ "${devices[*]:-}" ] || exit  [ "${devices[*]:-}" ] || exit
Line 260 
Line 287 
             echo "Signature check of SHA256.sig failed" >&2 && exit 1              echo "Signature check of SHA256.sig failed" >&2 && exit 1
 fi  fi
   
   added=''
   updated=''
 for f in "${devices[@]}"; do  for f in "${devices[@]}"; do
         d="$( firmware_devicename "$f" )"          d="$( firmware_devicename "$f" )"
   
Line 277 
Line 306 
         if "$INSTALL" && [ "${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"                                  "$VERBOSE" && echo "$i already installed"
                                 continue 2                                  continue 2
                         fi                          fi
                 done                  done
Line 285 
Line 314 
   
         if [ -e "$f" ]; then          if [ -e "$f" ]; then
                 if "$DOWNLOAD"; then                  if "$DOWNLOAD"; then
                         echo "Verify existing ${f##*/}"                          "$VERBOSE" && echo "Verify existing ${f##*/}"
                         verify "$f" || continue                          verify "$f" || continue
                 # else assume it was verified when downloaded                  # else assume it was verified when downloaded
                 fi                  fi
Line 299 
Line 328 
   
         "$INSTALL" || continue          "$INSTALL" || continue
   
           removed=false
         if [ "${installed[*]:-}" ]; then          if [ "${installed[*]:-}" ]; then
                 for i in "${installed[@]}"; do                  for i in "${installed[@]}"; do
                         delete_firmware "$i"                          delete_firmware "$i"
                           removed=true
                 done                  done
         fi          fi
   
         add_firmware "$f"          add_firmware "$f"
   
           if "$removed"; then
                   [ "$updated" ] && updated="$updated,"
                   updated="$updated$d"
           else
                   [ "$added" ] && added="$added,"
                   added="$added$d"
           fi
 done  done
   
   if ! $VERBOSE && { [ "$added" ] || [ "$updated" ]; }; then
           echo  "${0##*/}: $(
               [ "$added" ] && echo -n "added ${added}"
               [ "$added" ] && [ "$updated" ] && echo -n "; "
               [ "$updated" ] && echo -n "updated ${updated}"
           )"
   fi
Legend:
Removed from v.1.94  
changed lines
  Added in v.1.108
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>