[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.11 and 1.14

version 1.11, 2021/10/17 03:07:48 version 1.14, 2021/10/17 23:25:14
Line 80 
Line 80 
 VERSION="${VNAME%.*}${VNAME#*.}"  VERSION="${VNAME%.*}${VNAME#*.}"
 FWDIR="$VNAME"  FWDIR="$VNAME"
   
   # TODO: We need the firmware for the system we just installed
   #       not the one we booted from.  For example:
   #       * booting from a snapshot bsd.rd that thinks it is the 7.0 release
   #         will install the firmware from the 7.0 directory instead of
   #         from the snapshots dir.
   #       If they're using sysupgrade, then the installer kernel will be correct.
   #       If we're doing this in the installer we can check what they picked
   #       for downloading sets and use that value.
   #       Otherwise, the fw_update after first boot will fix it up for us.
   
 HTTP_FWDIR=$FWDIR  HTTP_FWDIR=$FWDIR
 set -- $(scan_dmesg "/^OpenBSD $VNAME\([^ ]*\).*$/s//\1/p")  set -- $(scan_dmesg "/^OpenBSD $VNAME\([^ ]*\).*$/s//\1/p")
 [[ $1 == -!(stable) ]] && HTTP_FWDIR=snapshots  [[ $1 == -!(stable) ]] && HTTP_FWDIR=snapshots
Line 91 
Line 101 
   
 fw_update() {  fw_update() {
         local _tmpsrc _f _remove _r          local _tmpsrc _f _remove _r
         local _src=$FWURL _t=Get _cfile="$_tmpsrc/SHA256" _srclocal=false          local _src=$FWURL _t=Get _cfile="/tmp/SHA256" _srclocal=false
         local _drivers=$(          local _drivers=$(
                 last=''                  last=''
                 ftp -D "Detecting" -Vmo- $PATTERNS |                  ftp -D "Detecting" -Vmo- $PATTERNS |
Line 122 
Line 132 
         [[ ! -d $_tmpsrc ]] &&          [[ ! -d $_tmpsrc ]] &&
                 _issue="Cannot create prefetch area" && fail                  _issue="Cannot create prefetch area" && fail
   
         cd "$_tmpsrc"  
   
         ! $_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 179 
Line 187 
   
                         while read c g; do                          while read c g; do
                                 case $c in                                  case $c in
                                 @cwd) cwd=$g                                  @cwd) cwd="${DESTDIR}/$g"
                                   ;;                                    ;;
                                 @*) continue                                  @*) continue
                                   ;;                                    ;;
Line 202 
Line 210 
         # TODO: Add some details about the install to +CONTENTS like pkg_add          # TODO: Add some details about the install to +CONTENTS like pkg_add
         # TODO: Or, maybe we save the firmware someplace and make pkg_add reinstall          # TODO: Or, maybe we save the firmware someplace and make pkg_add reinstall
                 echo "Installing $_f"                  echo "Installing $_f"
                 tar -zxphf "$_f" -C /etc "firmware/*"                  tar -zxphf "$_tmpsrc/$_f" -C "${DESTDIR}/etc" "firmware/*"
                 mkdir -p ${PKGDIR}/${_f%.tgz}/                  mkdir -p ${PKGDIR}/${_f%.tgz}/
                 tar -zxphf "$_f" -C "${PKGDIR}/${_f%.tgz}" "+*"                  tar -zxphf "$_tmpsrc/$_f" -C "${PKGDIR}/${_f%.tgz}" "+*"
                 ed -s "${PKGDIR}/${_f%.tgz}/+CONTENTS" <<EOL                  ed -s "${PKGDIR}/${_f%.tgz}/+CONTENTS" <<EOL
 /^@comment pkgpath/ -1a  /^@comment pkgpath/ -1a
 @option manual-installation  @option manual-installation
Legend:
Removed from v.1.11  
changed lines
  Added in v.1.14
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>