Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.sbin/sysinst Make re-install sets also work for an expli...



details:   https://anonhg.NetBSD.org/src/rev/c37989fda500
branches:  trunk
changeset: 969064:c37989fda500
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Feb 06 19:50:04 2020 +0000

description:
Make re-install sets also work for an explicit selected root wedge

diffstat:

 usr.sbin/sysinst/upgrade.c |  11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diffs (26 lines):

diff -r c64cffbd5fb3 -r c37989fda500 usr.sbin/sysinst/upgrade.c
--- a/usr.sbin/sysinst/upgrade.c        Thu Feb 06 19:41:57 2020 +0000
+++ b/usr.sbin/sysinst/upgrade.c        Thu Feb 06 19:50:04 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: upgrade.c,v 1.15 2020/02/06 19:08:38 martin Exp $      */
+/*     $NetBSD: upgrade.c,v 1.16 2020/02/06 19:50:04 martin Exp $      */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -209,14 +209,9 @@
        if (find_disks(msg_string(MSG_reinstall), !root_is_read_only()) < 0)
                return;
 
-       if (!pm->cur_system) {
-               if (pm->parts == NULL) {
-                       hit_enter_to_continue(MSG_noroot, NULL);
-                       return;
-               }
-
+       if (!pm->cur_system && pm->parts != NULL) {
                install_desc_from_parts(&install, pm->parts);
-       } else {
+       } else if (pm->cur_system) {
                install.cur_system = true;
        }
 



Home | Main Index | Thread Index | Old Index