diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2016-04-27 14:50:19 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2016-04-27 14:50:19 +0000 |
| commit | 2d8b60308e1436a2350d4eb42c3411905e213ed2 (patch) | |
| tree | b2ac316c720ce0ed96d07bc0cf4466b61c1b683f /distrib | |
| parent | 5b14d3e801201db41451aca3b76f16846ef5ac28 (diff) | |
rc.firsttime -> rc.sysmerge for running sysmerge(8) after an upgrade.
While here, don't echo 'running sysmerge...' since that'd get us a mail each
time we upgrade even when nothing changed.
ok deraadt@ rpe@
Diffstat (limited to 'distrib')
| -rw-r--r-- | distrib/miniroot/install.sub | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 3049ef93a20..81e968465ba 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sub,v 1.893 2016/04/25 09:55:23 ajacoutot Exp $ +# $OpenBSD: install.sub,v 1.894 2016/04/27 14:50:18 ajacoutot Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org> @@ -2301,8 +2301,7 @@ finish_up() { # 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/sysmerge -b" >>/mnt/etc/rc.sysmerge echo "/usr/sbin/fw_update -v" >>/mnt/etc/rc.firsttime store_random |