diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2016-04-25 09:55:23 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2016-04-25 09:55:23 +0000 |
| commit | a48b1d16ce2655924c243af8e4d65b651f648bd1 (patch) | |
| tree | 049581d27a79905483ec134306f8cddaf1384456 | |
| parent | Implement atomic operations using the atomic instructions available (diff) | |
| download | wireguard-openbsd-a48b1d16ce2655924c243af8e4d65b651f648bd1.tar.xz wireguard-openbsd-a48b1d16ce2655924c243af8e4d65b651f648bd1.zip | |
In upgrade mode, automatically run sysmerge(8) in batch mode before fw_update(1).
Putting this at the beginning of the p2k16 hackathon so we can see if anything
breaks and to get feedback about the output etc
If sysmerge cannot merge/install a file automatically, login into the machine
and running it interactively will ask you what you want to do with it.
It may not stay in this exact form, but that's a first step and now is a good
time to get it in.
discussed with deraadt@ for a while
ok rpe@
| -rw-r--r-- | distrib/miniroot/install.sub | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 45c1a3281b2..3049ef93a20 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sub,v 1.892 2016/04/11 19:04:30 rpe Exp $ +# $OpenBSD: install.sub,v 1.893 2016/04/25 09:55:23 ajacoutot Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org> @@ -2300,6 +2300,9 @@ finish_up() { fi # Ensure that fw_update is run on reboot. + [[ $MODE == upgrade ]] && + echo 'echo "running sysmerge..."' >>/mnt/etc/rc.firsttime && + echo "/usr/sbin/sysmerge -b" >>/mnt/etc/rc.firsttime echo "/usr/sbin/fw_update -v" >>/mnt/etc/rc.firsttime store_random @@ -2316,8 +2319,6 @@ using the 'mail' command. __EOT md_congrats - [[ $MODE == upgrade ]] && \ - echo "After rebooting, run sysmerge(8) to update your system configuration." $AUTO && >/ai.done } |