| version 1.1, 2021/09/30 04:06:56 |
version 1.14, 2021/10/17 23:25:14 |
|
|
| done |
done |
| } |
} |
| |
|
| set -A _KERNV -- $( scan_dmesg '/^OpenBSD \([1-9][0-9]*\.[0-9]\)\([^ ]*\) .*/ { s//\1 \2/p; q; }' ) |
# tmpdir, do_as, unpriv, and unpriv2 are from install.sub |
| VNAME=${_KERNV[0]} |
|
| OSDIR=$VNAME |
|
| if ((${#_KERNV[*]} > 1)) && [ "$_KERNV[1]" = "-current" -o "$_KERNV[1]" = "-beta" ]; then |
|
| OSDIR=snapshots |
|
| fi |
|
| |
|
| FWURL=http://firmware.openbsd.org/firmware/${OSDIR} |
# Create a temporary directory based on the supplied directory name prefix. |
| PKGDIR=${DESTDIR}/var/db/pkg |
tmpdir() { |
| PATTERNS="file:${0%/*}/firmware_patterns" |
local _i=1 _dir |
| |
|
| drivers=$( |
until _dir="${1?}.$_i.$RANDOM" && mkdir -- "$_dir" 2>/dev/null; do |
| last='' |
((++_i < 10000)) || return 1 |
| ftp -D "Detecting" -Vmo- $PATTERNS | |
|
| while read d m; do |
|
| [ "$last" = "$d" ] && continue |
|
| [ "$m" ] || m="^$d[0-9][0-9]* at " |
|
| [ "$( scan_dmesg "/$m/ { p; q; }" )" ] || continue |
|
| echo $d |
|
| last=$d |
|
| done |
done |
| ) |
echo "$_dir" |
| |
} |
| |
|
| if [ -z "$drivers" ]; then |
# Run a command ($2+) as unprivileged user ($1). |
| echo "No devices found which need firmware files to be downloaded." >&2 |
# Take extra care that after "cmd" no "user" processes exist. |
| exit 0 |
# |
| fi |
# Optionally: |
| |
# - create "file" and chown it to "user" |
| |
# - after "cmd", chown "file" back to root |
| |
# |
| |
# Usage: do_as user [-f file] cmd |
| |
do_as() { |
| |
(( $# >= 2 )) || return |
| |
|
| tmpdir=${DESTDIR}/tmp/fw_update |
local _file _rc _user=$1 |
| [ -e "$tmpdir" ] && rm -rf "$tmpdir" |
shift |
| mkdir -p "$tmpdir" |
|
| cd "$tmpdir" |
|
| |
|
| # TODO: Drop privs during fetch and verify |
if [[ $1 == -f ]]; then |
| ftp -D Get -Vm "$FWURL/SHA256.sig" |
_file=$2 |
| |
shift 2 |
| |
fi |
| |
|
| # Probably should bundle the firmware sigfile on the installer, |
if [[ -n $_file ]]; then |
| # although we can just get it from the recently installed system. |
>$_file |
| if [ "$DESTDIR" ]; then |
chown "$_user" "$_file" |
| sigfile=$( sed -n '/^untrusted comment: verify with \(.*\)$/ { s//\1/p; q; }' SHA256.sig ) |
|
| if [ ! -e "/etc/signify/$sigfile" ] \ |
|
| && [ -e "${DESTDIR}/etc/signify/$sigfile" ]; then |
|
| cp -a "${DESTDIR}/etc/signify/$sigfile" "/etc/signify/$sigfile" |
|
| fi |
fi |
| fi |
|
| |
|
| signify -Ve -x SHA256.sig -m - < SHA256.sig > SHA256 |
doas -u "$_user" "$@" |
| |
_rc=$? |
| |
|
| for d in $drivers; do |
while doas -u "$_user" kill -9 -1 2>/dev/null; do |
| firmware=$( sed -n "s/.*(\($d-firmware-.*\.tgz\)).*/\1/p" SHA256 ) |
echo "Processes still running for user $_user after: $@" |
| installed=$( installed_firmware $d ) |
sleep 1 |
| |
|
| for i in $installed; do |
|
| if [ "$firmware" = "$i.tgz" ]; then |
|
| echo "Firmware for $d already installed ($installed)" |
|
| continue 2 |
|
| fi |
|
| done |
done |
| |
|
| mkdir $d |
[[ -n $_file ]] && chown root "$_file" |
| |
|
| # TODO: Drop privs during fetch and verify |
return $_rc |
| ftp -D "Get/Verify" -Vmo- "$FWURL/$firmware" | sha256 -bph "$d/h" > "$firmware" |
} |
| fgrep -qx "SHA256 ($firmware) = $(<$d/h)" SHA256 |
|
| |
|
| # TODO: Check hash for files before deleting |
unpriv() { |
| if [ "$installed" ] && [ -e "${PKGDIR}/$installed/+CONTENTS" ]; then |
do_as _sndio "$@" |
| echo "Uninstalling $installed" |
} |
| cwd=${PKGDIR}/$installed |
|
| |
|
| remove="${cwd}/+CONTENTS ${cwd}" |
unpriv2() { |
| |
do_as _file "$@" |
| |
} |
| |
|
| while read c g; do |
_issue= |
| case $c in |
fail() { |
| @cwd) cwd=$g |
echo $_issue >&2 |
| ;; |
exit 1 |
| @*) continue |
} |
| ;; |
|
| *) remove="$cwd/$c $remove" |
|
| ;; |
|
| esac |
|
| done < "${PKGDIR}/$installed/+CONTENTS" |
|
| |
|
| for r in $remove ; do |
VNAME=$(sysctl -n kern.osrelease) |
| if [ -d "$r" ]; then |
VERSION="${VNAME%.*}${VNAME#*.}" |
| # Try hard not to actually remove recursively |
FWDIR="$VNAME" |
| # without rmdir on the install media. |
|
| [ "$r/*" = $( echo "$r"/* ) ] && rm -rf "$r" |
# TODO: We need the firmware for the system we just installed |
| else |
# not the one we booted from. For example: |
| rm -f "$r" |
# * booting from a snapshot bsd.rd that thinks it is the 7.0 release |
| fi |
# 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 |
| |
set -- $(scan_dmesg "/^OpenBSD $VNAME\([^ ]*\).*$/s//\1/p") |
| |
[[ $1 == -!(stable) ]] && HTTP_FWDIR=snapshots |
| |
|
| |
FWURL=http://firmware.openbsd.org/firmware/${HTTP_FWDIR} |
| |
FWPUB_KEY=${DESTDIR}/etc/signify/openbsd-${VERSION}-fw.pub |
| |
PKGDIR=${DESTDIR}/var/db/pkg |
| |
PATTERNS="file:${0%/*}/firmware_patterns" |
| |
|
| |
fw_update() { |
| |
local _tmpsrc _f _remove _r |
| |
local _src=$FWURL _t=Get _cfile="/tmp/SHA256" _srclocal=false |
| |
local _drivers=$( |
| |
last='' |
| |
ftp -D "Detecting" -Vmo- $PATTERNS | |
| |
while read d m; do |
| |
grep=grep |
| |
[ "$last" = "$d" ] && continue |
| |
[ "$m" ] || m="^$d[0-9][0-9]* at " |
| |
[ "$m" = "${m#^}" ] && grep=fgrep |
| |
$grep -q "$m" /var/run/dmesg.boot || continue |
| |
echo $d |
| |
last=$d |
| done |
done |
| |
) |
| |
|
| |
if [ -z "$_drivers" ]; then |
| |
echo "No devices found which need firmware files to be downloaded." >&2 |
| |
return |
| fi |
fi |
| |
|
| # TODO: Add some details about the install to +CONTENTS like pkg_add |
if _tmpsrc=$( tmpdir "${DESTDIR}/tmp/fw_update" ); then |
| # TODO: Or, maybe we save the firmware someplace and make pkg_add reinstall |
( |
| echo "Installing $firmware" |
>$_tmpsrc/t && |
| tar -zxphf "$firmware" -C /etc "firmware/*" |
$_unpriv cat $_tmpsrc/t |
| mkdir -p ${PKGDIR}/${firmware%.tgz}/ |
) >/dev/null 2>&1 || |
| tar -zxphf "$firmware" -C "${PKGDIR}/${firmware%.tgz}" "+*" |
rm -r $_tmpsrc |
| ed -s "${PKGDIR}/${firmware%.tgz}/+CONTENTS" <<EOL |
fi |
| |
|
| |
[[ ! -d $_tmpsrc ]] && |
| |
_issue="Cannot create prefetch area" && fail |
| |
|
| |
! $_unpriv ftp -D "$_t" -Vmo - "$_src/SHA256.sig" >"$_cfile.sig" && |
| |
_issue="Cannot fetch SHA256.sig" && fail |
| |
|
| |
# Verify signature file with public keys. |
| |
! unpriv -f "$_cfile" \ |
| |
signify -Vep $FWPUB_KEY -x "$_cfile.sig" -m "$_cfile" && |
| |
_issue="Signature check of SHA256.sig failed" && fail |
| |
|
| |
for d in $_drivers; do |
| |
_f=$( sed -n "s/.*(\($d-firmware-.*\.tgz\)).*/\1/p" "$_cfile" ) |
| |
installed=$( installed_firmware "$d" ) |
| |
|
| |
for i in $installed; do |
| |
if [ "$_f" = "$i.tgz" ]; then |
| |
echo "Firmware for $d already installed ($installed)" |
| |
continue 2 |
| |
fi |
| |
done |
| |
|
| |
rm -f /tmp/h /tmp/fail |
| |
|
| |
_t=Get/Verify |
| |
# Fetch firmware file and create a checksum by piping through |
| |
# sha256. Create a flag file in case ftp failed. Firmware |
| |
# from net is written to the prefetch area. |
| |
( $_unpriv ftp -D "$_t" -Vmo - "$_src/$_f" || >/tmp/fail ) | |
| |
( $_srclocal && unpriv2 sha256 -b >/tmp/h || |
| |
unpriv2 -f /tmp/h sha256 -bph /tmp/h >"$_tmpsrc/$_f" ) |
| |
|
| |
# Handle failed transfer. |
| |
if [[ -f /tmp/fail ]]; then |
| |
rm -f "$_tmpsrc/$_f" |
| |
_issue="Fetching of $_f failed!" |
| |
fail |
| |
fi |
| |
|
| |
# Verify firmware by comparing its checksum with SHA256. |
| |
if fgrep -qx "SHA256 ($_f) = $(</tmp/h)" "$_cfile"; then |
| |
#_unver=$(rmel $_f $_unver) |
| |
true |
| |
else |
| |
[[ -d "$_tmpsrc" ]] && rm -rf "$_tmpsrc" |
| |
_issue="Checksum test for $_f failed." |
| |
fail |
| |
fi |
| |
|
| |
# TODO: Check hash for files before deleting |
| |
if [ "$installed" ] && [ -e "${PKGDIR}/$installed/+CONTENTS" ]; then |
| |
echo "Uninstalling $installed" |
| |
cwd=${PKGDIR}/$installed |
| |
|
| |
set -A _remove -- "${cwd}/+CONTENTS" "${cwd}" |
| |
|
| |
while read c g; do |
| |
case $c in |
| |
@cwd) cwd="${DESTDIR}/$g" |
| |
;; |
| |
@*) continue |
| |
;; |
| |
*) set -A _remove -- "$cwd/$c" "${_remove[@]}" |
| |
;; |
| |
esac |
| |
done < "${PKGDIR}/$installed/+CONTENTS" |
| |
|
| |
for _r in "${_remove[@]}" ; do |
| |
if [ -d "$_r" ]; then |
| |
# Try hard not to actually remove recursively |
| |
# without rmdir on the install media. |
| |
[ "$_r/*" = $( echo "$_r"/* ) ] && rm -rf "$_r" |
| |
else |
| |
rm -f "$_r" |
| |
fi |
| |
done |
| |
fi |
| |
|
| |
# 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 |
| |
echo "Installing $_f" |
| |
tar -zxphf "$_tmpsrc/$_f" -C "${DESTDIR}/etc" "firmware/*" |
| |
mkdir -p ${PKGDIR}/${_f%.tgz}/ |
| |
tar -zxphf "$_tmpsrc/$_f" -C "${PKGDIR}/${_f%.tgz}" "+*" |
| |
ed -s "${PKGDIR}/${_f%.tgz}/+CONTENTS" <<EOL |
| /^@comment pkgpath/ -1a |
/^@comment pkgpath/ -1a |
| @option manual-installation |
@option manual-installation |
| @option firmware |
@option firmware |
|
|
| . |
. |
| w |
w |
| EOL |
EOL |
| done |
done |
| |
} |
| |
|
| |
fw_update |