diff options
| author |   deraadt <deraadt@openbsd.org> | 2011-08-02 20:40:52 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2011-08-02 20:40:52 +0000 |
| commit | cdcbf492a6fe2b7ebf4fd8a0f80b1f1eb529e8d9 (patch) | |
| tree | ae2457902bbf54f03072fbd18bb1cd15b79c8bc5 | |
| parent | After the MANIFEST-based symbolic link creation loop, there is a check (diff) | |
| download | wireguard-openbsd-cdcbf492a6fe2b7ebf4fd8a0f80b1f1eb529e8d9.tar.xz wireguard-openbsd-cdcbf492a6fe2b7ebf4fd8a0f80b1f1eb529e8d9.zip | |
Disable upgrade-time sysmerge for the 5.0 release. Between 4.9 and 5.0
/etc has changed in substantial ways. Perhaps on the 5.0->5.1 transition
this will not be so scary. As it is now, it is way too tempting for
inexperienced users with incredibly complex configurations to go into
sysmerge and cause themselves major havoc.
| -rw-r--r-- | distrib/miniroot/install.sub | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index b471d650a28..56d95cf7b86 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.649 2011/08/02 15:52:04 deraadt Exp $ +# $OpenBSD: install.sub,v 1.650 2011/08/02 20:40:52 deraadt Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback @@ -1635,12 +1635,13 @@ install_sets() { } run_sysmerge() { - if [[ -n "$SM_ARGS" || -n "$SM_ARGSX" ]]; then - ask_yn "Merge the new etc/xetc install sets using sysmerge(8)?" no - if [[ $resp == y ]]; then \ - /mnt/usr/sbin/chroot /mnt /usr/sbin/sysmerge $SM_ARGS $SM_ARGSX - fi - fi + echo "Please run sysmerge(8) after rebooting to repair your /etc configuration." + #if [[ -n "$SM_ARGS" || -n "$SM_ARGSX" ]]; then + # ask_yn "Merge the new etc/xetc install sets using sysmerge(8)?" no + # if [[ $resp == y ]]; then \ + # /mnt/usr/sbin/chroot /mnt /usr/sbin/sysmerge $SM_ARGS $SM_ARGSX + # fi + #fi } update_firmware() { |