diff options
| author | Florian Obser <florian@cvs.openbsd.org> | 2020-05-26 16:21:01 +0000 |
|---|---|---|
| committer | Florian Obser <florian@cvs.openbsd.org> | 2020-05-26 16:21:01 +0000 |
| commit | 24171d20813cfc29dd6d9b4e631ea14e607358bf (patch) | |
| tree | b85d82f8450f4836e65be9f370d449cb477505d1 | |
| parent | aefa54cee75b424651419b62d606a4bcfe14859b (diff) | |
In the first version of sysupgrade(8) I made the mistake of generating
auto_upgrade.conf in bsd.rd instead of sysupgrade(8) itself.
ajacoutot@ fixed this, but had to introduce a bunch of compat code in
bsd.rd.
It is time to retire this. Only 6.5-current contained this flaw,
sysupgrade(8)ing from there to -current will no longer work but we
never made any promises that it would anyway.
OK deraadt, ajacoutot
| -rw-r--r-- | distrib/miniroot/install.sub | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index ff71ef5c1b0..066bd224aa5 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sub,v 1.1153 2020/05/22 13:38:43 kn Exp $ +# $OpenBSD: install.sub,v 1.1154 2020/05/26 16:21:00 florian Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org> @@ -2881,13 +2881,6 @@ do_autoinstall() { # Email autoinstall protocol to root on next boot. prep_root_mail /tmp/ai/ai.log "$(hostname) $AI_MODE log" - # SYSUP-COMPAT - if $UU; then - cat <<__EOT >>/mnt/etc/rc.firsttime -[[ ! -e /home/_sysupgrade/keep ]] && rm -f /home/_sysupgrade/* -__EOT - fi - exec reboot } @@ -3226,26 +3219,9 @@ check_unattendedupgrade() { if [[ -n $_d ]]; then make_dev $_d if mount -t ffs -r /dev/${_d}a /mnt; then - ### NOTYET (uncomment once SYSUP-COMPAT is gone) - #[[ -f /mnt/bsd.upgrade && -f /mnt/auto_upgrade.conf ]] - #_rc=$? - #((_rc == 0)) && cp /mnt/auto_upgrade.conf / - ### BEGIN SYSUP-COMPAT - ls /mnt/bsd.upgrade + [[ -f /mnt/bsd.upgrade && -f /mnt/auto_upgrade.conf ]] _rc=$? - if ((_rc == 0)); then - if [[ -f /mnt/auto_upgrade.conf ]]; then - cp /mnt/auto_upgrade.conf / - else - cat <<__EOT >/auto_upgrade.conf -Location of sets = disk -Pathname to the sets = /home/_sysupgrade/ -Set name(s) = done -Directory does not contain SHA256.sig. Continue without verification = yes -__EOT - fi - fi - ### END SYSUP-COMPAT + ((_rc == 0)) && cp /mnt/auto_upgrade.conf / umount -f /mnt fi rm -f /dev/{r,}$_d? |