Module Name: src
Committed By: martin
Date: Thu Feb 6 19:50:04 UTC 2020
Modified Files:
src/usr.sbin/sysinst: upgrade.c
Log Message:
Make re-install sets also work for an explicit selected root wedge
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/sysinst/upgrade.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/upgrade.c
diff -u src/usr.sbin/sysinst/upgrade.c:1.15 src/usr.sbin/sysinst/upgrade.c:1.16
--- src/usr.sbin/sysinst/upgrade.c:1.15 Thu Feb 6 19:08:38 2020
+++ src/usr.sbin/sysinst/upgrade.c Thu Feb 6 19:50:04 2020
@@ -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 @@ do_reinstall_sets()
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;
}
