 @@ -1,14 +1,14 @@
-/*	$NetBSD: defs.h,v 1.43 2019/08/07 10:08:04 martin Exp $	*/
+/*	$NetBSD: defs.h,v 1.44 2019/08/27 14:11:00 martin Exp $	*/
 /*
  * Copyright 1997 Piermont Information Systems Inc.
  * All rights reserved.
+ *
  * Written by Philip A. Nelson for Piermont Information Systems Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -702,26 +702,27 @@ const struct disk_partitioning_scheme *s
     const char *title);
 bool	edit_outer_parts(struct disk_partitions*);
 bool	parts_use_wholedisk(struct disk_partitions*,
 	     size_t add_ext_parts, const struct disk_part_info *ext_parts);
 /*
  * Machine dependent partitioning function, only used when
  * innern/outer partitioning schemes are in use - this sets
  * up the outer scheme for maximum NetBSD usage.
  */
 bool	md_parts_use_wholedisk(struct disk_partitions*);
 /* from util.c */
 bool	root_is_read_only(void);
 void	get_ptn_alignment(const struct disk_partitions *parts, daddr_t *align, daddr_t *p0off);
 char*	str_arg_subst(const char *, size_t, const char **);
 void	msg_display_subst(const char *, size_t, ...);
 void	msg_display_add_subst(const char *, size_t, ...);
 int	ask_yesno(const char *);
 int	ask_noyes(const char *);
 void	hit_enter_to_continue(const char *msg, const char *title);
 /*
  * return value:
  *  0 -> abort
  *  1 -> re-edit
  *  2 -> continue installation
 */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: upgrade.c,v 1.12 2019/07/23 18:13:40 martin Exp $	*/
+/*	$NetBSD: upgrade.c,v 1.13 2019/08/27 14:11:00 martin Exp $	*/
 /*
  * Copyright 1997 Piermont Information Systems Inc.
  * All rights reserved.
+ *
  * Written by Philip A. Nelson for Piermont Information Systems Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -54,27 +54,27 @@ static int merge_X(const char *);
 void
 do_upgrade(void)
+{
 	struct install_partition_desc install = {};
 	int retcode = 0;
 	partman_go = 0;
 	msg_display(MSG_upgradeusure);
 	if (!ask_noyes(NULL))
 		return;
 	get_ramsize();
-	if (find_disks(msg_string(MSG_upgrade), true) < 0)
+	if (find_disks(msg_string(MSG_upgrade), !root_is_read_only()) < 0)
 		return;
 	if (pm->parts == NULL && !pm->cur_system) {
 		hit_enter_to_continue(MSG_noroot, NULL);
 		return;
+	}
 	if (!pm->cur_system) {
 		if (pm->parts->pscheme->pre_update_verify) {
 			if (pm->parts->pscheme->pre_update_verify(pm->parts))
 				pm->parts->pscheme->write_to_disk(pm->parts);
+		}
 @@ -198,27 +198,27 @@ merge_X(const char *xroot)
  */
 void
 do_reinstall_sets()
+{
 	struct install_partition_desc install = {};
 	int retcode = 0;
 	partman_go = 0;
 	unwind_mounts();
 	msg_display(MSG_reinstallusure);
 	if (!ask_noyes(NULL))
 		return;
-	if (find_disks(msg_string(MSG_reinstall), true) < 0)
+	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;
+		}
 		install_desc_from_parts(&install, pm->parts);
 	} else {
 		install.cur_system = true;
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: util.c,v 1.31 2019/08/17 18:03:12 martin Exp $	*/
+/*	$NetBSD: util.c,v 1.32 2019/08/27 14:11:00 martin Exp $	*/
 /*
  * Copyright 1997 Piermont Information Systems Inc.
  * All rights reserved.
+ *
  * Written by Philip A. Nelson for Piermont Information Systems Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -527,26 +527,37 @@ boot_media_still_needed(void)
 	struct statvfs sb;
 	if (statvfs("/", &sb) == 0) {
 		if (!(sb.f_flag & ST_LOCAL))
 			return -1;
 		if (strcmp(sb.f_fstypename, MOUNT_CD9660) == 0
 			   || strcmp(sb.f_fstypename, MOUNT_UDF) == 0)
 			return 1;
+	}
 	return 0;
+}
 bool
 root_is_read_only(void)
+{
 	struct statvfs sb;
 	if (statvfs("/", &sb) == 0)
 		return sb.f_flag & ST_RDONLY;
 	return false;
+}
 /*
  * Get from a CDROM distribution.
  * Also used on "installation using bootable install media"
  * as the default option in the "distmedium" menu.
  */
 int
 get_via_cdrom(void)
+{
 	menu_ent cd_menu[MAX_CD_INFOS];
 	struct stat sb;
 	int rv, num_cds, menu_cd, i, selected_cd = 0;
 	bool silent = false;
 	int mib[2];