Powered by OpenBSD

CVS log for openbsd/fw_update/fw_install.sh

[BACK] Up to [local] / openbsd / fw_update

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.149 / (download) - annotate - [select for diffs], Fri Jan 14 04:25:46 2022 UTC (2 years, 10 months ago) by afresh1
Branch: MAIN
CVS Tags: HEAD
Changes since 1.148: +8 -14 lines
Diff to previous 1.148 (colored)

Clean up comments

requested by deraadt@

Revision 1.148 / (download) - annotate - [select for diffs], Tue Jan 11 02:48:11 2022 UTC (2 years, 10 months ago) by afresh1
Branch: MAIN
Changes since 1.147: +17 -12 lines
Diff to previous 1.147 (colored)

Only avoid verifying filenames specified on the command-line

Otherwise we might get the wrong stuff.

Revision 1.147 / (download) - annotate - [select for diffs], Sun Jan 9 03:02:38 2022 UTC (2 years, 10 months ago) by afresh1
Branch: MAIN
Changes since 1.146: +1 -1 lines
Diff to previous 1.146 (colored)

whitespace

Revision 1.146 / (download) - annotate - [select for diffs], Fri Jan 7 04:22:29 2022 UTC (2 years, 10 months ago) by afresh1
Branch: MAIN
Changes since 1.145: +21 -5 lines
Diff to previous 1.145 (colored)

Correctly avoid downloading SHA256.sig

We were verifying a checksum I didn't expect to.  Oops.

Revision 1.145 / (download) - annotate - [select for diffs], Fri Jan 7 02:18:52 2022 UTC (2 years, 10 months ago) by afresh1
Branch: MAIN
Changes since 1.144: +18 -18 lines
Diff to previous 1.144 (colored)

Whitespace

Revision 1.144 / (download) - annotate - [select for diffs], Fri Jan 7 02:16:31 2022 UTC (2 years, 10 months ago) by afresh1
Branch: MAIN
Changes since 1.143: +29 -33 lines
Diff to previous 1.143 (colored)

Download SHA256.sig when we need it

Not when we guess we might.  This is more scalable.

Revision 1.143 / (download) - annotate - [select for diffs], Fri Jan 7 01:47:24 2022 UTC (2 years, 10 months ago) by afresh1
Branch: MAIN
Changes since 1.142: +31 -13 lines
Diff to previous 1.142 (colored)

Only download SHA256.sig if we're going to use it

Revision 1.142 / (download) - annotate - [select for diffs], Fri Jan 7 00:38:06 2022 UTC (2 years, 10 months ago) by afresh1
Branch: MAIN
Changes since 1.141: +5 -5 lines
Diff to previous 1.141 (colored)

Switch from -D to -F

Because -D was used by the previous fw_update by something else

Revision 1.141 / (download) - annotate - [select for diffs], Thu Jan 6 16:38:24 2022 UTC (2 years, 10 months ago) by afresh1
Branch: MAIN
Changes since 1.140: +1 -1 lines
Diff to previous 1.140 (colored)

Fix typo

From Jurjen Oskam <jurjen () osk ! am>

Revision 1.140 / (download) - annotate - [select for diffs], Thu Jan 6 01:25:12 2022 UTC (2 years, 10 months ago) by afresh1
Branch: MAIN
Changes since 1.139: +14 -10 lines
Diff to previous 1.139 (colored)

More tidying of output

It was printing things at the wrong time.  When to print stuff is annoying to calculate.

Revision 1.139 / (download) - annotate - [select for diffs], Wed Jan 5 23:34:11 2022 UTC (2 years, 10 months ago) by afresh1
Branch: MAIN
Changes since 1.138: +28 -19 lines
Diff to previous 1.138 (colored)

Improve output for different levels of verbosity

Revision 1.138 / (download) - annotate - [select for diffs], Sun Dec 26 18:58:54 2021 UTC (2 years, 10 months ago) by afresh1
Branch: MAIN
Changes since 1.137: +37 -21 lines
Diff to previous 1.137 (colored)

Support multiple -v flags

Still don't 100% like the wording of everything but it seems to work.

Revision 1.137 / (download) - annotate - [select for diffs], Sun Dec 26 18:39:46 2021 UTC (2 years, 10 months ago) by afresh1
Branch: MAIN
Changes since 1.136: +1 -1 lines
Diff to previous 1.136 (colored)

Avoid errors on another race to kill ftp

Because it still could have exited between when we checked and now.

I wish there was a better way to keep track of our child processes.

Revision 1.136 / (download) - annotate - [select for diffs], Sat Dec 25 20:48:40 2021 UTC (2 years, 10 months ago) by afresh1
Branch: MAIN
Changes since 1.135: +3 -3 lines
Diff to previous 1.135 (colored)

Be quiet without verbose during dry-run

Because that seems nicer.

Revision 1.135 / (download) - annotate - [select for diffs], Sat Dec 25 20:43:40 2021 UTC (2 years, 10 months ago) by afresh1
Branch: MAIN
Changes since 1.134: +3 -3 lines
Diff to previous 1.134 (colored)

Optimization and proper quoting from shellcheck

Revision 1.134 / (download) - annotate - [select for diffs], Sat Dec 25 19:16:57 2021 UTC (2 years, 10 months ago) by afresh1
Branch: MAIN
Changes since 1.133: +2 -6 lines
Diff to previous 1.133 (colored)

Improve dry-run messaging

I'm still not a huge fan, but it's something.

Revision 1.133 / (download) - annotate - [select for diffs], Sat Dec 25 19:16:17 2021 UTC (2 years, 10 months ago) by afresh1
Branch: MAIN
Changes since 1.132: +1 -1 lines
Diff to previous 1.132 (colored)

Add missing quote

Oops

Revision 1.132 / (download) - annotate - [select for diffs], Sat Dec 25 19:08:52 2021 UTC (2 years, 10 months ago) by afresh1
Branch: MAIN
Changes since 1.131: +1 -2 lines
Diff to previous 1.131 (colored)

Don't filter dmesg before searching

It doesn't make things that much faster and apparently "not configured" isn't
enough to catch all the drivers.

Revision 1.131 / (download) - annotate - [select for diffs], Sat Dec 25 19:03:56 2021 UTC (2 years, 10 months ago) by afresh1
Branch: MAIN
Changes since 1.130: +29 -10 lines
Diff to previous 1.130 (colored)

Add a -n "dry run" mode

Revision 1.130 / (download) - annotate - [select for diffs], Sat Dec 25 18:22:38 2021 UTC (2 years, 10 months ago) by afresh1
Branch: MAIN
Changes since 1.129: +2 -0 lines
Diff to previous 1.129 (colored)

Don't download when specifying a local path

Unless that's all we're doing.
Otherwise we are installing from there, not the default URL.

Revision 1.129 / (download) - annotate - [select for diffs], Sat Dec 25 04:04:41 2021 UTC (2 years, 10 months ago) by afresh1
Branch: MAIN
Changes since 1.128: +11 -7 lines
Diff to previous 1.128 (colored)

Clean up the tmpdir for the extracted firmware

I am not completely sure what the correct thing to do with this if it fails,
but what are the chances we are extracting something and it fails?

Revision 1.128 / (download) - annotate - [select for diffs], Sat Dec 25 02:44:51 2021 UTC (2 years, 10 months ago) by afresh1
Branch: MAIN
Changes since 1.127: +1 -1 lines
Diff to previous 1.127 (colored)

Hide errors from killing ftp in the cleanup

There's a race between the cleanup handler and resetting the FTPPID,
so we ignore error messages from ftp.

Revision 1.127 / (download) - annotate - [select for diffs], Sat Dec 25 02:38:33 2021 UTC (2 years, 10 months ago) by afresh1
Branch: MAIN
Changes since 1.126: +2 -1 lines
Diff to previous 1.126 (colored)

Ignore errors in cleanup handler

We're about to exit anyway and we want to make sure we do all the cleanup

Revision 1.126 / (download) - annotate - [select for diffs], Sat Dec 25 00:34:00 2021 UTC (2 years, 10 months ago) by afresh1
Branch: MAIN
Changes since 1.125: +15 -8 lines
Diff to previous 1.125 (colored)

Clean up LOCALSRC on exit if it's a tmpdir

Moving the trap handler up and using a global variable for the FTPPID
so we can find it in the handler.

My testing shows that with `set -o errexit` the "EXIT" trap is enough.

Revision 1.125 / (download) - annotate - [select for diffs], Sat Dec 25 00:27:56 2021 UTC (2 years, 10 months ago) by afresh1
Branch: MAIN
Changes since 1.124: +6 -4 lines
Diff to previous 1.124 (colored)

Don't create tmpdir when deleting

We only need it if we're downloading and installing, not if we're deleting.

Revision 1.124 / (download) - annotate - [select for diffs], Fri Dec 24 18:19:00 2021 UTC (2 years, 10 months ago) by afresh1
Branch: MAIN
Changes since 1.123: +20 -2 lines
Diff to previous 1.123 (colored)

Detect installed firmware as well as from dmesg

Noticed by semarie@

Revision 1.123 / (download) - annotate - [select for diffs], Fri Dec 24 17:57:54 2021 UTC (2 years, 10 months ago) by afresh1
Branch: MAIN
Changes since 1.122: +3 -3 lines
Diff to previous 1.122 (colored)

Sort lists we iterate

That way we get consistent output

Revision 1.122 / (download) - annotate - [select for diffs], Fri Dec 24 02:36:13 2021 UTC (2 years, 10 months ago) by afresh1
Branch: MAIN
Changes since 1.121: +6 -18 lines
Diff to previous 1.121 (colored)

Remove the -L flag

We don't need it anymore, we can use "-p ." to the same effect.

Revision 1.121 / (download) - annotate - [select for diffs], Fri Dec 24 02:27:46 2021 UTC (2 years, 10 months ago) by afresh1
Branch: MAIN
Changes since 1.120: +30 -6 lines
Diff to previous 1.120 (colored)

Add support for -p path to choose a download or install location

Revision 1.120 / (download) - annotate - [select for diffs], Fri Dec 24 01:41:54 2021 UTC (2 years, 10 months ago) by afresh1
Branch: MAIN
Changes since 1.119: +4 -0 lines
Diff to previous 1.119 (colored)

Check for SHA25.sig if we're not downloading

Because we're probably going to need it.

We might not need it if all arguments are local files, so I might refactor it
to download or fail only when it's needed.

Revision 1.119 / (download) - annotate - [select for diffs], Fri Dec 24 01:20:52 2021 UTC (2 years, 10 months ago) by afresh1
Branch: MAIN
Changes since 1.118: +3 -3 lines
Diff to previous 1.118 (colored)

Set a name to use for ftp(1) errors

Surprised I hadn't hit any and noticed before.

Revision 1.118 / (download) - annotate - [select for diffs], Fri Dec 24 00:46:02 2021 UTC (2 years, 10 months ago) by afresh1
Branch: MAIN
Changes since 1.117: +3 -5 lines
Diff to previous 1.117 (colored)

We always need to be running as root

I forgot that even if we're only downloading we run ftp(1) as a different user
using `su` and I'm not allowed to do that.

Revision 1.117 / (download) - annotate - [select for diffs], Thu Dec 23 21:52:21 2021 UTC (2 years, 10 months ago) by afresh1
Branch: MAIN
Changes since 1.116: +7 -1 lines
Diff to previous 1.116 (colored)

Improve messaging when downloading, not installing.

Revision 1.116 / (download) - annotate - [select for diffs], Thu Dec 23 21:46:46 2021 UTC (2 years, 10 months ago) by afresh1
Branch: MAIN
Changes since 1.115: +2 -0 lines
Diff to previous 1.115 (colored)

Allow clobbering the CFILE

Becasue we always want to check for new firmware versions.

Revision 1.115 / (download) - annotate - [select for diffs], Thu Dec 23 21:43:04 2021 UTC (2 years, 10 months ago) by afresh1
Branch: MAIN
Changes since 1.114: +4 -1 lines
Diff to previous 1.114 (colored)

Show firmware that was already installed in summary

Revision 1.114 / (download) - annotate - [select for diffs], Thu Dec 23 21:41:29 2021 UTC (2 years, 10 months ago) by afresh1
Branch: MAIN
Changes since 1.113: +5 -11 lines
Diff to previous 1.113 (colored)

Always show added/updated summary

Because it's pretty useful

Revision 1.113 / (download) - annotate - [select for diffs], Thu Dec 23 21:34:12 2021 UTC (2 years, 10 months ago) by afresh1
Branch: MAIN
Changes since 1.112: +31 -16 lines
Diff to previous 1.112 (colored)

Add support for "-a" autodetect firmware

The mechanisms for detection of add/delete are different,
but that's not important.

Also for installing -a is still automatically enabled if no arguments are specified.

Revision 1.112 / (download) - annotate - [select for diffs], Thu Dec 23 20:38:12 2021 UTC (2 years, 10 months ago) by afresh1
Branch: MAIN
Changes since 1.111: +1 -1 lines
Diff to previous 1.111 (colored)

Only print the device name in the summary

Not the full package name with version and all.

Revision 1.111 / (download) - annotate - [select for diffs], Thu Dec 23 20:25:40 2021 UTC (2 years, 10 months ago) by afresh1
Branch: MAIN
Changes since 1.110: +38 -5 lines
Diff to previous 1.110 (colored)

Add support to delete firmware with -d name ...

Revision 1.110 / (download) - annotate - [select for diffs], Thu Dec 23 19:48:55 2021 UTC (2 years, 10 months ago) by afresh1
Branch: MAIN
Changes since 1.109: +3 -3 lines
Diff to previous 1.109 (colored)

Avoid globbing the match in the installed_firmware

Because I don't want that part to support globbing.

Revision 1.109 / (download) - annotate - [select for diffs], Thu Dec 23 19:32:59 2021 UTC (2 years, 10 months ago) by afresh1
Branch: MAIN
Changes since 1.108: +13 -5 lines
Diff to previous 1.108 (colored)

Adjust how we look for installed_firmware

Becasuse we know it needs to have a +CONTENTS file that contains '@option firmware'

Revision 1.108 / (download) - annotate - [select for diffs], Thu Dec 23 03:45:46 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.107: +1 -1 lines
Diff to previous 1.107 (colored)

Put -v in the right order in usage

Revision 1.107 / (download) - annotate - [select for diffs], Thu Dec 23 02:16:03 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.106: +6 -0 lines
Diff to previous 1.106 (colored)

Verify package looks like firmware before uninstalling

Because we don't want to accidentally remove something that isn't firmware.

Revision 1.106 / (download) - annotate - [select for diffs], Thu Dec 23 01:25:29 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.105: +14 -4 lines
Diff to previous 1.105 (colored)

Don't trust the filename for the package name

Have to figure out how to avoid extracting the firmware
if the +CONTENTS doesn't look right, but this is better than what was there.

Revision 1.105 / (download) - annotate - [select for diffs], Wed Dec 22 17:53:53 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.104: +1 -1 lines
Diff to previous 1.104 (colored)

Add -v to usage

Noticed by deraadt@

Revision 1.104 / (download) - annotate - [select for diffs], Wed Dec 22 04:56:05 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.103: +1 -1 lines
Diff to previous 1.103 (colored)

Quote the command substituion

This shouldn't output multiple words, but better to be safe and make it obvious
we don't expect any splitting.

Revision 1.103 / (download) - annotate - [select for diffs], Wed Dec 22 04:53:45 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.102: +19 -0 lines
Diff to previous 1.102 (colored)

Output a summary when not verbose and something changed

Revision 1.102 / (download) - annotate - [select for diffs], Wed Dec 22 04:43:41 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.101: +1 -1 lines
Diff to previous 1.101 (colored)

Don't hardcode our name

Even in a tempfile

Revision 1.101 / (download) - annotate - [select for diffs], Wed Dec 22 04:30:07 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.100: +13 -8 lines
Diff to previous 1.100 (colored)

Be silent except for errors without -v

Revision 1.100 / (download) - annotate - [select for diffs], Wed Dec 22 04:29:18 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.99: +1 -1 lines
Diff to previous 1.99 (colored)

Add missing flag to getopts

Sigh.

Revision 1.99 / (download) - annotate - [select for diffs], Wed Dec 22 04:10:22 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.98: +2 -2 lines
Diff to previous 1.98 (colored)

Provide our own error for getopts

Makes the error more professional.

Revision 1.98 / (download) - annotate - [select for diffs], Tue Dec 21 02:38:00 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.97: +1 -1 lines
Diff to previous 1.97 (colored)

Hide errors from kill in signal handler

We have no way to check that the ftp process is still running before we shut
off the handler and a SIGINT more often than not seems to happen after it has
exited.

Revision 1.97 / (download) - annotate - [select for diffs], Tue Dec 21 02:32:16 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.96: +2 -0 lines
Diff to previous 1.96 (colored)

Add a -v flag to be verbose

Doesn't _do_ anything yet, but it exists

Revision 1.96 / (download) - annotate - [select for diffs], Tue Dec 21 02:31:25 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.95: +1 -1 lines
Diff to previous 1.95 (colored)

Be more careful about what installed firmware are

Becasue without a +CONTENTS we can't uninstall it.

Revision 1.95 / (download) - annotate - [select for diffs], Tue Dec 21 02:16:47 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.94: +5 -1 lines
Diff to previous 1.94 (colored)

Add a couple more safety options

Because I don't expect to overwrite files and only need to glob in a couple very specific spots.

Revision 1.94 / (download) - annotate - [select for diffs], Tue Dec 21 02:16:01 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.93: +5 -0 lines
Diff to previous 1.93 (colored)

Check for running as root if we can and need to

No need to do that for downloading, right?

Revision 1.93 / (download) - annotate - [select for diffs], Tue Dec 21 02:09:03 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.92: +1 -1 lines
Diff to previous 1.92 (colored)

Use $0 for usage

Like syspatch and sysupgrade

Revision 1.92 / (download) - annotate - [select for diffs], Sun Dec 19 20:22:49 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.91: +3 -3 lines
Diff to previous 1.91 (colored)

Show error on one line

No need for two.  In the future we could even explain $_error if we get so bold.

Revision 1.91 / (download) - annotate - [select for diffs], Sun Dec 19 20:04:42 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.90: +5 -5 lines
Diff to previous 1.90 (colored)

Improve messaging

We can be quieter.  If I had a good way to detect in the installer,
I would like to only show this output when we are.  For now, it's fine.

Revision 1.90 / (download) - annotate - [select for diffs], Sun Dec 19 19:16:55 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.89: +3 -6 lines
Diff to previous 1.89 (colored)

Only subshell once for newline

It's still nicer than a string on two lines and slightly faster.

Revision 1.89 / (download) - annotate - [select for diffs], Sun Dec 19 04:05:25 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.88: +14 -25 lines
Diff to previous 1.88 (colored)

Use a single match against the dmesg not one per line

Because we can use a newline to anchor the ^, we can use a single
comparison against the entire dmesg.

This is significantly faster than matching each line.

Revision 1.88 / (download) - annotate - [select for diffs], Sun Dec 19 02:02:02 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.87: +1 -1 lines
Diff to previous 1.87 (colored)

Improve documenting usage

From jmc

Revision 1.87 / (download) - annotate - [select for diffs], Sat Dec 18 23:02:20 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.86: +20 -11 lines
Diff to previous 1.86 (colored)

Make -D and -L mutually exclusive

They really were before, but now it's explicit.

That means if we can solve some issues we oculd make "-DL" work that would
download to the current dir and install from there.

Revision 1.86 / (download) - annotate - [select for diffs], Sat Dec 18 22:08:04 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.85: +1 -1 lines
Diff to previous 1.85 (colored)

Improve style

Revision 1.85 / (download) - annotate - [select for diffs], Sat Dec 18 22:03:43 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.84: +35 -5 lines
Diff to previous 1.84 (colored)

Wrap ftp in a timer

That is, we put ftp in the background and check every second that
it's still running and every 12 seconds that the filesize has
changed.  If it hasn't, we interrupt the download and abort.

Revision 1.84 / (download) - annotate - [select for diffs], Sat Dec 18 20:40:36 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.83: +2 -1 lines
Diff to previous 1.83 (colored)

Filter dmesg for only lines that could need drivers

That is, they either start with ^\w+\d or match "not configured".
We might be able to get a tighter match than that, but better too much
than too little here.

Revision 1.83 / (download) - annotate - [select for diffs], Sat Dec 18 20:19:02 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.82: +26 -12 lines
Diff to previous 1.82 (colored)

Compare strings in ksh, without spawning grep

It's way faster to do it this way.

Faster requested by deraadt@

Revision 1.82 / (download) - annotate - [select for diffs], Sun Dec 12 20:24:53 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.81: +1 -1 lines
Diff to previous 1.81 (colored)

Adjust opts in all the places

Revision 1.81 / (download) - annotate - [select for diffs], Sun Dec 12 20:23:12 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.80: +2 -2 lines
Diff to previous 1.80 (colored)

Use -D for Download Only

Because -d is taken by fw_update to mean delete firmware

Revision 1.80 / (download) - annotate - [select for diffs], Sun Dec 12 20:21:14 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.79: +1 -1 lines
Diff to previous 1.79 (colored)

Fix usage

I removed the options, but not from usage.

Revision 1.79 / (download) - annotate - [select for diffs], Sun Dec 12 19:52:38 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.78: +3 -3 lines
Diff to previous 1.78 (colored)

Slight comment improvements

Revision 1.78 / (download) - annotate - [select for diffs], Sat Dec 11 21:19:24 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.77: +2 -0 lines
Diff to previous 1.77 (colored)

Put SHA256.sig into download dir, not current dir

Oops

Revision 1.77 / (download) - annotate - [select for diffs], Sat Dec 11 21:13:34 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.76: +1 -0 lines
Diff to previous 1.76 (colored)

Set a specific PATH

Revision 1.76 / (download) - annotate - [select for diffs], Sat Dec 11 21:11:02 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.75: +1 -1 lines
Diff to previous 1.75 (colored)

Use grep -F for filenames

Because it's mostly unsanitized input

Revision 1.75 / (download) - annotate - [select for diffs], Sat Dec 11 21:02:24 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.74: +4 -4 lines
Diff to previous 1.74 (colored)

Even more simplification

The logic is actually pretty straight forward once you realize that

Revision 1.74 / (download) - annotate - [select for diffs], Sat Dec 11 20:57:51 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.73: +2 -1 lines
Diff to previous 1.73 (colored)

Correct previous

Revision 1.73 / (download) - annotate - [select for diffs], Sat Dec 11 20:56:17 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.72: +3 -3 lines
Diff to previous 1.72 (colored)

Slight tidy

Revision 1.72 / (download) - annotate - [select for diffs], Sat Dec 11 20:33:50 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.71: +10 -6 lines
Diff to previous 1.71 (colored)

Simplify fetch/verify logic

No change, just easier to read (I hope)

Revision 1.71 / (download) - annotate - [select for diffs], Sat Dec 11 05:38:23 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.70: +1 -1 lines
Diff to previous 1.70 (colored)

Always update SHA256.sig file if we're downloading

Because we always want to make sure that what we have is the most correct.

Revision 1.70 / (download) - annotate - [select for diffs], Sat Dec 11 05:35:21 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.69: +6 -30 lines
Diff to previous 1.69 (colored)

Simplify file/device detection

Now that we're using full paths, even for downloaded files, we don't need the
dance to find the realpath and we can simplify finding the device/file to
download and install.

As a side effect, if there _are_ two firmware files available, you can now
specify one that's not the last one in the SHA256.sig file.

Revision 1.69 / (download) - annotate - [select for diffs], Sat Dec 11 05:08:38 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.68: +17 -20 lines
Diff to previous 1.68 (colored)

Use full paths instead of cd

That should make some things safer to do.

Revision 1.68 / (download) - annotate - [select for diffs], Sat Dec 11 03:56:35 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.67: +20 -28 lines
Diff to previous 1.67 (colored)

Use cwd as download/install source instead of taking args

Because theo says that's how unix tools work and it makes sense.

Revision 1.67 / (download) - annotate - [select for diffs], Sat Dec 11 03:25:09 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.66: +0 -1 lines
Diff to previous 1.66 (colored)

Don't "detect" files in the current dir

This is too much magic and not what folks would expect.  They either pass a
full filename or the name of the driver we look up in the SHA256.sig.

Revision 1.66 / (download) - annotate - [select for diffs], Sat Dec 11 03:12:21 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.65: +1 -1 lines
Diff to previous 1.65 (colored)

Improve usage

Some style guidance from jmc@

Revision 1.65 / (download) - annotate - [select for diffs], Thu Dec 9 02:51:25 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.64: +8 -8 lines
Diff to previous 1.64 (colored)

Only use ${...:-} construct when necessary

Because we don't need it for normal variables, only for arrays.

I wish empty arrays that we `set -A` worked better.

Revision 1.64 / (download) - annotate - [select for diffs], Thu Dec 9 02:37:38 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.63: +20 -5 lines
Diff to previous 1.63 (colored)

Add support for installing from a local dir

That way we can download the firmware while the network works and install it
when it doesn't.

I envision this being used to make it so firmware can be installed
by syspatch even when the install kernel doesn't have working internet,
maybe a connection that doesn't come up automatically or something.

This would also mean that if the bsd.upgrade kernel fails to boot for some
reason, we boot back into the previous system with the previous firmware that
was already working without having installed a firmware that doesn't work with
this kernel.  This would be mostly useful for full version upgrades not snapshots,
but there could be days when it's important.

Revision 1.63 / (download) - annotate - [select for diffs], Thu Dec 9 02:23:15 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.62: +2 -10 lines
Diff to previous 1.62 (colored)

Avoid need to chown dir/file with redirects

This way root needs to write the file, but we really control the name so that's
nicer than having to do the chown chmod dance.

Revision 1.62 / (download) - annotate - [select for diffs], Thu Dec 9 02:17:41 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.61: +1 -1 lines
Diff to previous 1.61 (colored)

Whitespace

Revision 1.61 / (download) - annotate - [select for diffs], Thu Dec 9 02:17:15 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.60: +1 -0 lines
Diff to previous 1.60 (colored)

Verify all files when downloading

It seems nicer.  We do still need to adjust our exitcode or something.

Revision 1.60 / (download) - annotate - [select for diffs], Thu Dec 9 02:09:52 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.59: +22 -5 lines
Diff to previous 1.59 (colored)

Add -d download/dir support

That lets us download the firmware we need into a specified directory.

Revision 1.59 / (download) - annotate - [select for diffs], Thu Dec 9 02:08:03 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.58: +13 -0 lines
Diff to previous 1.58 (colored)

Add usage and getopts

Although it doesn't take any real opts yet

Revision 1.58 / (download) - annotate - [select for diffs], Wed Dec 8 03:51:48 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.57: +31 -7 lines
Diff to previous 1.57 (colored)

Support passing files or driver names to install

So you can install drivers for vmm and some other device with:
fw_install vmm /path/to/other-firmware-1.23.tgz

Revision 1.57 / (download) - annotate - [select for diffs], Wed Dec 8 03:45:05 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.56: +6 -0 lines
Diff to previous 1.56 (colored)

Helper to convert filename to driver name

Revision 1.56 / (download) - annotate - [select for diffs], Wed Dec 8 03:44:37 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.55: +5 -2 lines
Diff to previous 1.55 (colored)

Show error if we can't find a firmware

But don't exit, instead we just continue

Probably should adjust the errorcode in the case or something,
but not sure to what yet.

Revision 1.55 / (download) - annotate - [select for diffs], Wed Dec 8 03:37:44 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.54: +10 -0 lines
Diff to previous 1.54 (colored)

Add realpath(1) helper

That does terrible things if we don't have it on the installer

Revision 1.54 / (download) - annotate - [select for diffs], Tue Dec 7 04:29:18 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.53: +1 -1 lines
Diff to previous 1.53 (colored)

Make signify quieter

We said we're going to check, we only need to say if it failed

Revision 1.53 / (download) - annotate - [select for diffs], Tue Dec 7 04:23:00 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.52: +1 -1 lines
Diff to previous 1.52 (colored)

Spell su correctly

Revision 1.52 / (download) - annotate - [select for diffs], Tue Dec 7 03:09:17 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.51: +3 -2 lines
Diff to previous 1.51 (colored)

Whitespace

Revision 1.51 / (download) - annotate - [select for diffs], Tue Dec 7 02:42:01 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.50: +5 -5 lines
Diff to previous 1.50 (colored)

Localize another variable

Revision 1.50 / (download) - annotate - [select for diffs], Tue Dec 7 02:35:57 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.49: +155 -208 lines
Diff to previous 1.49 (colored)

Use more verbose syntax for clarity

We're not limited on size by living in installer so we can write things more
clearly.

Revision 1.49 / (download) - annotate - [select for diffs], Thu Dec 2 04:00:37 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.48: +2 -2 lines
Diff to previous 1.48 (colored)

Fix silly set -- mistake, without using set --

Revision 1.48 / (download) - annotate - [select for diffs], Thu Dec 2 03:50:03 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.47: +3 -3 lines
Diff to previous 1.47 (colored)

Use _file not _sndio for privsep user

Revision 1.47 / (download) - annotate - [select for diffs], Thu Dec 2 03:48:13 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.46: +1 -2 lines
Diff to previous 1.46 (colored)

Don't unpriv signify(1), pledge(2) is enough

Revision 1.46 / (download) - annotate - [select for diffs], Thu Dec 2 03:46:50 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.45: +3 -7 lines
Diff to previous 1.45 (colored)

Don't unpriv sha256(1) its pledge(2)

We can trust it won't do anything untoward.

Revision 1.45 / (download) - annotate - [select for diffs], Thu Dec 2 03:44:19 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.44: +2 -2 lines
Diff to previous 1.44 (colored)

Tweak previous

Revision 1.44 / (download) - annotate - [select for diffs], Thu Dec 2 03:05:49 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.43: +14 -4 lines
Diff to previous 1.43 (colored)

use mktemp -d if available

Since it's safer than our handrolled version

Revision 1.43 / (download) - annotate - [select for diffs], Thu Dec 2 02:56:37 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.42: +1 -0 lines
Diff to previous 1.42 (colored)

Note that this is modified to use su by me

Revision 1.42 / (download) - annotate - [select for diffs], Wed Dec 1 03:11:43 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.41: +5 -1 lines
Diff to previous 1.41 (colored)

Use su if available

If we're not in the installer, there's a really good chance doas is not enabled
and so using su is the correct command to use.

Revision 1.41 / (download) - annotate - [select for diffs], Wed Dec 1 02:30:43 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.40: +1 -1 lines
Diff to previous 1.40 (colored)

There's no `tail` on the install media

Revision 1.40 / (download) - annotate - [select for diffs], Wed Dec 1 02:29:14 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.39: +0 -2 lines
Diff to previous 1.39 (colored)

Be quieter

If the installer wants to print the message, so be it. It doesn't belong here

Revision 1.39 / (download) - annotate - [select for diffs], Wed Dec 1 02:19:00 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.38: +1 -1 lines
Diff to previous 1.38 (colored)

Assume the last matching firmware is the one we want

Because it's possible there will be more in the SHA256.sig file, but we will
put the onus of sorting to have the preferred one last to whoever creates that
file, since we are running in a very limited case.

Revision 1.38 / (download) - annotate - [select for diffs], Wed Dec 1 02:06:41 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.37: +14 -0 lines
Diff to previous 1.37 (colored)

Add a license

Revision 1.37 / (download) - annotate - [select for diffs], Wed Dec 1 02:04:18 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.36: +2 -3 lines
Diff to previous 1.36 (colored)

We know where the firmware_patterns will live now

It's on the filesystem so we don't need to allow the possiblity of downloading
them.

Revision 1.36 / (download) - annotate - [select for diffs], Sat Nov 27 06:38:06 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.35: +1 -0 lines
Diff to previous 1.35 (colored)

Add OpenBSD RCS tag

Revision 1.35 / (download) - annotate - [select for diffs], Wed Nov 24 02:09:35 2021 UTC (2 years, 11 months ago) by afresh1
Branch: MAIN
Changes since 1.34: +2 -2 lines
Diff to previous 1.34 (colored)

Rename to fw_install

So we don't conflict with the fw_update that's based on pkg_add

Revision 1.34 / (download) - annotate - [select for diffs], Fri Nov 19 03:47:12 2021 UTC (3 years ago) by afresh1
Branch: MAIN
Changes since 1.33: +1 -1 lines
Diff to previous 1.33 (colored)

Fix assignment

Revision 1.33 / (download) - annotate - [select for diffs], Fri Nov 19 03:13:11 2021 UTC (3 years ago) by afresh1
Branch: MAIN
Changes since 1.32: +3 -3 lines
Diff to previous 1.32 (colored)

Inherit some variables from the environment

Specifically VNAME, VERSION, and FWURL

Not currently sure how I want to handle if we get a FWURL and do "something
different", but I'll think about it.

Revision 1.32 / (download) - annotate - [select for diffs], Fri Nov 19 03:00:54 2021 UTC (3 years ago) by afresh1
Branch: MAIN
Changes since 1.31: +0 -7 lines
Diff to previous 1.31 (colored)

Remove unused fail function

Switched to more installer-like wa of doing this

Revision 1.31 / (download) - annotate - [select for diffs], Thu Nov 18 02:18:32 2021 UTC (3 years ago) by afresh1
Branch: MAIN
Changes since 1.30: +0 -3 lines
Diff to previous 1.30 (colored)

Not worried about timing out installing firmware

Instead the installer can reset it just before calling us,
and maybe after if they're paranoid.

Revision 1.30 / (download) - annotate - [select for diffs], Thu Nov 18 02:15:34 2021 UTC (3 years ago) by afresh1
Branch: MAIN
Changes since 1.29: +1 -6 lines
Diff to previous 1.29 (colored)

Inline scan_dmesg call

It only confuses things and stuff outside fw_update() can be different from the
installer.

Revision 1.29 / (download) - annotate - [select for diffs], Thu Nov 18 01:44:30 2021 UTC (3 years ago) by afresh1
Branch: MAIN
Changes since 1.28: +1 -0 lines
Diff to previous 1.28 (colored)

Set default for MODE

Since we may not get it from the installer (well, at the moment we definitely don't)

Revision 1.28 / (download) - annotate - [select for diffs], Wed Nov 17 02:37:01 2021 UTC (3 years ago) by afresh1
Branch: MAIN
Changes since 1.27: +1 -1 lines
Diff to previous 1.27 (colored)

Missed mnt -> DESTDIR conversion

Revision 1.27 / (download) - annotate - [select for diffs], Tue Nov 16 02:40:45 2021 UTC (3 years ago) by afresh1
Branch: MAIN
Changes since 1.26: +3 -3 lines
Diff to previous 1.26 (colored)

Enable DESTDIR instead of hardcoding /mnt

So we can run fw_update.sh from the installer

Revision 1.26 / (download) - annotate - [select for diffs], Fri Nov 12 02:38:05 2021 UTC (3 years ago) by afresh1
Branch: MAIN
Changes since 1.25: +2 -0 lines
Diff to previous 1.25 (colored)

Mention that we're installing firmware

We say similar for sets, so makes sense to tell folks what's going on

Revision 1.25 / (download) - annotate - [select for diffs], Thu Nov 11 02:38:32 2021 UTC (3 years ago) by afresh1
Branch: MAIN
Changes since 1.24: +8 -9 lines
Diff to previous 1.24 (colored)

whitespace

Revision 1.24 / (download) - annotate - [select for diffs], Thu Nov 11 02:34:00 2021 UTC (3 years ago) by afresh1
Branch: MAIN
Changes since 1.23: +9 -8 lines
Diff to previous 1.23 (colored)

More variable cleanup and comments

Revision 1.23 / (download) - annotate - [select for diffs], Thu Nov 11 02:33:32 2021 UTC (3 years ago) by afresh1
Branch: MAIN
Changes since 1.22: +6 -4 lines
Diff to previous 1.22 (colored)

Use single tar command to extract firmware

That way we can get a progress bar

Revision 1.22 / (download) - annotate - [select for diffs], Thu Nov 11 02:05:56 2021 UTC (3 years ago) by afresh1
Branch: MAIN
Changes since 1.21: +50 -30 lines
Diff to previous 1.21 (colored)

Be more install.sub friendly

Revision 1.21 / (download) - annotate - [select for diffs], Thu Oct 21 01:25:32 2021 UTC (3 years, 1 month ago) by afresh1
Branch: MAIN
Changes since 1.20: +5 -5 lines
Diff to previous 1.20 (colored)

Fix whitespace

Revision 1.20 / (download) - annotate - [select for diffs], Thu Oct 21 01:17:27 2021 UTC (3 years, 1 month ago) by afresh1
Branch: MAIN
Changes since 1.19: +9 -6 lines
Diff to previous 1.19 (colored)

More variable adjustments and comments.

Revision 1.19 / (download) - annotate - [select for diffs], Thu Oct 21 01:02:52 2021 UTC (3 years, 1 month ago) by afresh1
Branch: MAIN
Changes since 1.18: +6 -8 lines
Diff to previous 1.18 (colored)

Inline installed_firmware function

Revision 1.18 / (download) - annotate - [select for diffs], Sun Oct 17 23:33:07 2021 UTC (3 years, 1 month ago) by afresh1
Branch: MAIN
Changes since 1.17: +4 -4 lines
Diff to previous 1.17 (colored)

More variable name fixes.

Revision 1.17 / (download) - annotate - [select for diffs], Sun Oct 17 23:24:55 2021 UTC (3 years, 1 month ago) by afresh1
Branch: MAIN
Changes since 1.16: +2 -1 lines
Diff to previous 1.16 (colored)

More similar to install.sub

Revision 1.16 / (download) - annotate - [select for diffs], Sun Oct 17 23:18:02 2021 UTC (3 years, 1 month ago) by afresh1
Branch: MAIN
Changes since 1.15: +3 -0 lines
Diff to previous 1.15 (colored)

Clean up previous SHA256 files

Revision 1.15 / (download) - annotate - [select for diffs], Sun Oct 17 22:56:24 2021 UTC (3 years, 1 month ago) by afresh1
Branch: MAIN
Changes since 1.14: +16 -16 lines
Diff to previous 1.14 (colored)

More variable name fixes

Revision 1.14 / (download) - annotate - [select for diffs], Sun Oct 17 22:25:14 2021 UTC (3 years, 1 month ago) by afresh1
Branch: MAIN
Changes since 1.13: +10 -0 lines
Diff to previous 1.13 (colored)

Note that we may install the wrong firmware in a corner case

Revision 1.13 / (download) - annotate - [select for diffs], Sun Oct 17 19:49:16 2021 UTC (3 years, 1 month ago) by afresh1
Branch: MAIN
Changes since 1.12: +2 -2 lines
Diff to previous 1.12 (colored)

DESTDIR fixes when installing and uninstalling

Revision 1.12 / (download) - annotate - [select for diffs], Sun Oct 17 19:29:01 2021 UTC (3 years, 1 month ago) by afresh1
Branch: MAIN
Changes since 1.11: +3 -5 lines
Diff to previous 1.11 (colored)

Be more consistent with /tmp and $_tmpsrc

Revision 1.11 / (download) - annotate - [select for diffs], Sun Oct 17 02:07:48 2021 UTC (3 years, 1 month ago) by afresh1
Branch: MAIN
Changes since 1.10: +112 -112 lines
Diff to previous 1.10 (colored)

Move body of fw_update into a function

Because that way it's easier to move.

While here, localize some variables.

I should probably split this a bit further to make the function less complex, but not right now.

Revision 1.10 / (download) - annotate - [select for diffs], Sun Oct 17 02:05:29 2021 UTC (3 years, 1 month ago) by afresh1
Branch: MAIN
Changes since 1.9: +6 -6 lines
Diff to previous 1.9 (colored)

Use array for files to remove

They could have spaces I guess

Revision 1.9 / (download) - annotate - [select for diffs], Sat Oct 16 18:42:43 2021 UTC (3 years, 1 month ago) by afresh1
Branch: MAIN
Changes since 1.8: +3 -3 lines
Diff to previous 1.8 (colored)

Fix more variable names

Revision 1.8 / (download) - annotate - [select for diffs], Sat Oct 16 18:31:13 2021 UTC (3 years, 1 month ago) by afresh1
Branch: MAIN
Changes since 1.7: +71 -28 lines
Diff to previous 1.7 (colored)

Be more like the installer

Although much stuff left to do to tidy it up, it's getting closer.

But, getting closer to being able to shim it in.

Revision 1.7 / (download) - annotate - [select for diffs], Thu Oct 14 02:00:02 2021 UTC (3 years, 1 month ago) by afresh1
Branch: MAIN
Changes since 1.6: +9 -7 lines
Diff to previous 1.6 (colored)

Set variables more like install.sub

That should make converting this to a function that runs from install.sub
easier

Revision 1.6 / (download) - annotate - [select for diffs], Thu Oct 14 01:39:43 2021 UTC (3 years, 1 month ago) by afresh1
Branch: MAIN
Changes since 1.5: +47 -0 lines
Diff to previous 1.5 (colored)

Pull in do_as, unpriv, and unpriv2 from install.sub

Revision 1.5 / (download) - annotate - [select for diffs], Thu Oct 14 01:26:31 2021 UTC (3 years, 1 month ago) by afresh1
Branch: MAIN
Changes since 1.4: +2 -2 lines
Diff to previous 1.4 (colored)

Swap comparison for clarity

Revision 1.4 / (download) - annotate - [select for diffs], Tue Oct 5 00:49:17 2021 UTC (3 years, 1 month ago) by afresh1
Branch: MAIN
Changes since 1.3: +1 -1 lines
Diff to previous 1.3 (colored)

Whitespace

Revision 1.3 / (download) - annotate - [select for diffs], Tue Oct 5 00:48:59 2021 UTC (3 years, 1 month ago) by afresh1
Branch: MAIN
Changes since 1.2: +3 -1 lines
Diff to previous 1.2 (colored)

Use fgrep unless the pattern start with ^

That way we are less likely to match the wrong thing due to some
"special" character in the pattern.

Revision 1.2 / (download) - annotate - [select for diffs], Tue Oct 5 00:39:05 2021 UTC (3 years, 1 month ago) by afresh1
Branch: MAIN
Changes since 1.1: +1 -1 lines
Diff to previous 1.1 (colored)

Use grep -q instead of sed to deal with / in patterns

I still don't trust it and have some ideas, but this fixes it for now.

Revision 1.1 / (download) - annotate - [select for diffs], Thu Sep 30 03:06:56 2021 UTC (3 years, 1 month ago) by afresh1
Branch: MAIN

Initial commit, works but needs polish

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.




FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>