=================================================================== RCS file: /cvs/openbsd/fw_update/fw_install.sh,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- openbsd/fw_update/fw_install.sh 2021/12/09 02:17:41 1.62 +++ openbsd/fw_update/fw_install.sh 2021/12/09 02:23:15 1.63 @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: fw_install.sh,v 1.62 2021/12/09 02:17:41 afresh1 Exp $ +# $OpenBSD: fw_install.sh,v 1.63 2021/12/09 02:23:15 afresh1 Exp $ # # Copyright (c) 2021 Andrew Hewus Fresh # @@ -61,20 +61,17 @@ fetch() { local _file=$1 _user=_file _exit - >"$_file" - chown "$_user" "$_file" - # 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 /usr/bin/su -s /bin/ksh "$_user" -c \ "/usr/bin/ftp -D 'Get/Verify' -Vm \ - -o '$_file' '${FWURL}/${_file}'" + -o- '${FWURL}/${_file}'" > "$_file" _exit="$?" else /usr/bin/doas -u "$_user" \ ftp -D 'Get/Verify' -Vm \ - -o "$_file" "${FWURL}/${_file}" + -o- "${FWURL}/${_file}" > "$_file" _exit="$?" fi @@ -83,8 +80,6 @@ echo "Cannot fetch $_file" >&2 return 1 fi - - chown root "$_file" } verify() { @@ -237,9 +232,6 @@ TMPDIR=$( tmpdir "${DESTDIR}/tmp/fw_install" ) cd "$TMPDIR" fi - -# To unpriv we need to let the unpriv user into this dir -chmod go+x . fetch "$CFILE" ! signify -qVep "$FWPUB_KEY" -x "$CFILE" -m "$CFILE" &&