 @@ -1,14 +1,14 @@
-/*	$NetBSD: menus.mi,v 1.22 2020/10/24 16:13:15 martin Exp $	*/
+/*	$NetBSD: menus.mi,v 1.23 2020/10/27 15:28:01 martin Exp $	*/
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by David Laight.
+ *
  * 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.
 @@ -453,34 +453,35 @@ menu floppysource, y=-4, x=0, w=70, no b
 	display action { msg_display(MSG_floppysource); };
 	option {src_legend(menu, MSG_Device, fd_dev);},
 		action { src_prompt(MSG_dev, fd_dev, sizeof fd_dev); };
 	option {src_legend(menu, MSG_fd_type, fd_type);}, sub menu fd_type;
 	option {src_legend(menu, MSG_Xfer_dir, xfer_dir);},
 		action { src_prompt(MSG_Xfer_dir, xfer_dir, sizeof xfer_dir); };
 	option {src_legend(menu, MSG_delete_xfer_file,
 			clean_xfer_dir ? MSG_Yes : MSG_No);},
 		action {clean_xfer_dir = ask_yesno(MSG_delete_xfer_file); };
 	option MSG_exit_menu_generic, exit, action { *((int*)arg) = SET_RETRY; };
 menu cdromsource, y=-4, x=0, w=70, no box, no clear, exitstring MSG_Continue;
 	display action { const char suff[] = "." SETS_TAR_SUFF;
-		msg_display_subst(MSG_cdromsource, 1, &suff); };
+		msg_display_add_subst(MSG_cdromsource, 1, &suff); };
 	option {src_legend(menu, MSG_Device, cdrom_dev);},
 		action { src_prompt(MSG_dev, cdrom_dev, sizeof cdrom_dev); };
 	option {src_legend(menu, MSG_Set_dir_bin, set_dir_bin);},
 		action { src_prompt(MSG_Set_dir_bin, set_dir_bin, sizeof set_dir_bin); };
 	option {src_legend(menu, MSG_Set_dir_src, set_dir_src);},
 		action { src_prompt(MSG_Set_dir_src, set_dir_src, sizeof set_dir_src); };
-	option MSG_exit_menu_generic, exit, action { *((int*)arg) = SET_RETRY; };
+	option MSG_abort_install, exit, action { *((int*)arg) = SET_ABANDON; };
 	option MSG_source_sel_retry, exit, action { *((int*)arg) = SET_RETRY; };
 menu localfssource, y=-4, x=0, w=70, no box, no clear, exitstring MSG_Continue;
 	display action { const char suff[] = "." SETS_TAR_SUFF;
 		msg_display_subst(MSG_localfssource, 1, &suff); };
 	option {src_legend(menu, MSG_Device, localfs_dev);},
 		action { src_prompt(MSG_dev, localfs_dev, sizeof localfs_dev);};
 	option {src_legend(menu, MSG_File_system, localfs_fs);},
 		action { src_prompt(MSG_filesys, localfs_fs, sizeof localfs_fs); };
 	option {src_legend(menu, MSG_Base_dir, localfs_dir);},
 		action { src_prompt(MSG_Base_dir, localfs_dir, sizeof localfs_dir);};
 	option {src_legend(menu, MSG_Set_dir_bin, set_dir_bin);},
 		action { src_prompt(MSG_Set_dir_bin, set_dir_bin, sizeof set_dir_bin); };
 	option {src_legend(menu, MSG_Set_dir_src, set_dir_src);},

 @@ -1,14 +1,14 @@
-/*	$NetBSD: msg.mi.de,v 1.25 2020/10/24 16:13:15 martin Exp $	*/
+/*	$NetBSD: msg.mi.de,v 1.26 2020/10/27 15:28:01 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
 @@ -541,27 +541,36 @@ Verzeichnis der Diskette liegen.
+}
 /* Called with: 			Example
  *  $0 = sets suffix			.tgz
  */
 message cdromsource
 {Geben Sie das CD-Laufwerk und das entsprechende Verzeichnis an, in dem
 die Distribution zu finden ist.
 (Das Verzeichnis muss $0 Dateien enthalten.)
+}
 message No_cd_found
-{Kein CD Laufwerk enth�lt eine CD mit den Distributions-Dateien!}
+{Kein CD Laufwerk enth�lt eine CD mit den Distributions-Dateien!
 Geben Sie die korrekten Daten manuel ein, oder legen Sie eine CD
 ein und versuchen Sie es erneut.
+}
 message abort_install
 {Installation abbrechen}
 message source_sel_retry
 {Zur�ck zur Quellauswahl}
 message Available_cds
 {Verf�gbare CDs}
 message ask_cd
 {Es wurden mehrere CDs gefunden. Bitte w�hlen Sie die Installations CD aus.}
 message cd_path_not_found
 {Die Installationsdateien wurden auf der ausgew�hlten CD nicht gefunden. Bitte
 pr�fen Sie den Ger�tenamen und Pfad der Installationsdateien.}
 /* Called with: 			Example
  *  $0 = sets suffix			.tgz

 @@ -1,14 +1,14 @@
-/*	$NetBSD: msg.mi.en,v 1.33 2020/10/24 16:13:15 martin Exp $	*/
+/*	$NetBSD: msg.mi.en,v 1.34 2020/10/27 15:28:01 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
 @@ -520,28 +520,35 @@ file system.  The set files must be in t
+}
 /* Called with: 			Example
  *  $0 = sets suffix			.tgz
  */
 message cdromsource
 {Enter the CDROM device to be used and directory on the CDROM where
 the distribution is located.
 Remember, the directory should contain the $0 files.
+}
 message No_cd_found
-{Could not locate a CD medium in any drive with the distribution sets.
+{Could not locate a CD medium in any drive with the distribution sets!
-Check the proper medium and retry!}
+Enter the correct data manually, or insert a disk and retry.
+}
 message abort_install
 {Cancel installation}
 message source_sel_retry
 {Back to source selection & retry}
 message Available_cds
 {Available CDs }
 message ask_cd
 {Multiple CDs found.  Please select the one containing the install CD.}
 message cd_path_not_found
 {The installation sets have not been found at the default location on this
 CD.  Please check the device and path name.}
 /* Called with: 			Example
  *  $0 = sets suffix			.tgz

 @@ -1,14 +1,14 @@
-/*	$NetBSD: msg.mi.pl,v 1.33 2020/10/24 16:13:15 martin Exp $	*/
+/*	$NetBSD: msg.mi.pl,v 1.34 2020/10/27 15:28:01 martin Exp $	*/
 /*	Based on english version: */
 /*	NetBSD: msg.mi.pl,v 1.36 2004/04/17 18:55:35 atatat 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
 @@ -514,28 +514,35 @@ znajdowac sie w glownym katalogu dyskiet
+}
 /* Called with: 			Example
  *  $0 = sets suffix			.tgz
  */
 message cdromsource
 {Podaj urzadzenie CDROM oraz katalog na CDROMie, w ktorym znajduje sie
 dystrybucja.
 Pamietaj, ze katalog musi zawierac pliki $0.
+}
 message No_cd_found
-{Could not locate a CD medium in any drive with the distribution sets.
+{Could not locate a CD medium in any drive with the distribution sets!
-Check the proper medium and retry!}
+Enter the correct data manually, or insert a disk and retry.
+}
 message abort_install
 {Cancel installation}
 message source_sel_retry
 {Back to source selection & retry}
 message Available_cds
 {Dostepne napedy CD}
 message ask_cd
 {Znaleziono kilka napedow CD, prosze wybrac ten, ktory zawiera
 nosnik instalacyjny.}
 message cd_path_not_found
 {Zbiory instalacyjne nie zostaly znalezione w domyslnym polozeniu na tym
 CD. Prosze sprawdzic urzadzenie i sciezke.}
 /* Called with: 			Example

 @@ -1,14 +1,14 @@
-/*	$NetBSD: msg.mi.es,v 1.27 2020/10/24 16:13:15 martin Exp $	*/
+/*	$NetBSD: msg.mi.es,v 1.28 2020/10/27 15:28:01 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
 @@ -536,28 +536,35 @@ en el directorio ra�z de los disquetes.
+}
 /* Called with: 			Example
  *  $0 = sets suffix			.tgz
  */
 message cdromsource
 {Introduzca el dispositivo de CDROM a usar y el directorio del CDROM
 donde se encuentre la distribuci�n.
 Recuerde, el directorio debe contener los archivos $0.
+}
 message No_cd_found
-{Could not locate a CD medium in any drive with the distribution sets.
+{Could not locate a CD medium in any drive with the distribution sets!
-Check the proper medium and retry!}
+Enter the correct data manually, or insert a disk and retry.
+}
 message abort_install
 {Cancel installation}
 message source_sel_retry
 {Back to source selection & retry}
 message Available_cds
 {Available CDs}
 message ask_cd
 {Multiple CDs found, please select the one containing the install CD.}
 message cd_path_not_found
 {The installation sets have not been found at the default location on this
 CD. Please check device and path name.}
 /* Called with: 			Example
  *  $0 = sets suffix			.tgz

 @@ -1,14 +1,14 @@
-/*	$NetBSD: msg.mi.fr,v 1.32 2020/10/24 16:13:15 martin Exp $	*/
+/*	$NetBSD: msg.mi.fr,v 1.33 2020/10/27 15:28:01 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
 @@ -532,28 +532,35 @@ Les fichiers d'installation devront se t
 de chaque disquette.
+}
 message cdromsource
 {Veuillez sp�cifier le nom du lecteur CD-ROM � utiliser,
 ainsi que le nom du r�pertoire contenant les fichiers d'installation.
 Ils doivent �tre plac�s � sa racine, sous la forme de fichiers
 tgz.
+}
 message No_cd_found
-{Could not locate a CD medium in any drive with the distribution sets.
+{Could not locate a CD medium in any drive with the distribution sets!
-Check the proper medium and retry!}
+Enter the correct data manually, or insert a disk and retry.
+}
 message abort_install
 {Cancel installation}
 message source_sel_retry
 {Back to source selection & retry}
 message Available_cds
 {CD-ROM disponibles}
 message ask_cd
 {Plusieurs CD-ROM ont �t� trouv�s.  S�lectionnez celui contenant le syst�me
 d'installation de NetBSD.}
 message cd_path_not_found
 {Les archives d'installation ne peuvent �tre trouv�es � l'emplacement sp�cifi�
 sur ce CD-ROM.  Assurez-vous que le p�riph�rique et le chemin sont les bons.}
 message localfssource

 @@ -1,14 +1,14 @@
-/*	$NetBSD: util.c,v 1.51 2020/10/26 20:18:33 martin Exp $	*/
+/*	$NetBSD: util.c,v 1.52 2020/10/27 15:28:01 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
 @@ -529,26 +529,31 @@ get_available_cds(void)
 		data.num_mounted = m;
+	}
 	enumerate_disks(&data, get_available_cds_helper);
 	free(data.mounted);
 	return data.count;
+}
 static int
 cd_has_sets(void)
+{
 	/* sanity check */
 	if (cdrom_dev[0] == 0)
 		return 0;
 	/* Mount it */
 	if (run_program(RUN_SILENT, "/sbin/mount -rt cd9660 /dev/%s /mnt2",
 	    cdrom_dev) != 0)
 		return 0;
 	mnt2_mounted = 1;
 	snprintf(ext_dir_bin, sizeof ext_dir_bin, "%s/%s", "/mnt2", set_dir_bin);
 	snprintf(ext_dir_src, sizeof ext_dir_src, "%s/%s", "/mnt2", set_dir_src);
 	return dir_exists_p(ext_dir_bin);
+}
 /*
 @@ -586,86 +591,83 @@ root_is_read_only(void)
+}
 /*
  * 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];
 	char rootdev[SSTRSIZE] = "";
 	size_t varlen;
 	/* If root is not md(4) and we have set dir, skip this step. */
 	mib[0] = CTL_KERN;
 	mib[1] = KERN_ROOT_DEVICE;
 	varlen = sizeof(rootdev);
 	(void)sysctl(mib, 2, rootdev, &varlen, NULL, 0);
 	if (stat(set_dir_bin, &sb) == 0 && S_ISDIR(sb.st_mode) &&
 	    strncmp("md", rootdev, 2) != 0) {
 	    	strlcpy(ext_dir_bin, set_dir_bin, sizeof ext_dir_bin);
 	    	strlcpy(ext_dir_src, set_dir_src, sizeof ext_dir_src);
 		return SET_OK;
+	}
 	memset(cd_menu, 0, sizeof(cd_menu));
 	num_cds = get_available_cds();
 	if (num_cds <= 0) {
-		hit_enter_to_continue(MSG_No_cd_found, NULL);
+		msg_display(MSG_No_cd_found);
-		return SET_RETRY;
+		cdrom_dev[0] = 0;
 	} else if (num_cds == 1) {
 		/* single CD found, check for sets on it */
 		strcpy(cdrom_dev, cds[0].device_name);
 		if (cd_has_sets())
 			return SET_OK;
 	} else {
 		for (i = 0; i< num_cds; i++) {
 			cd_menu[i].opt_name = cds[i].menu;
 			cd_menu[i].opt_flags = OPT_EXIT;
 			cd_menu[i].opt_action = set_menu_select;
+		}
 		/* create a menu offering available choices */
 		menu_cd = new_menu(MSG_Available_cds,
 			cd_menu, num_cds, -1, 4, 0, 0,
 			MC_SCROLL | MC_NOEXITOPT,
 			NULL, NULL, NULL, NULL, NULL);
 		if (menu_cd == -1)
 			return SET_RETRY;
 		msg_display(MSG_ask_cd);
 		process_menu(menu_cd, &selected_cd);
 		free_menu(menu_cd);
 		strcpy(cdrom_dev, cds[selected_cd].device_name);
 		if (cd_has_sets())
 			return SET_OK;
+	}
-	if (silent)
+	if (num_cds >= 1 && mnt2_mounted) {
 		msg_display("");
 	else {
 		umount_mnt2();
 		hit_enter_to_continue(MSG_cd_path_not_found, NULL);
+	}
 	/* ask for paths on the CD */
 	rv = -1;
 	process_menu(MENU_cdromsource, &rv);
-	if (rv == SET_RETRY)
+	if (rv == SET_RETRY || rv == SET_ABANDON)
-		return SET_RETRY;
+		return rv;
 	if (cd_has_sets())
 		return SET_OK;
 	return SET_RETRY;
+}
 /*
  * Get from a pathname inside an unmounted local filesystem
  * (e.g., where sets were preloaded onto a local DOS partition)
  */
 int