Module Name: src
Committed By: sborrill
Date: Thu Nov 2 14:08:17 UTC 2023
Modified Files:
src/usr.sbin/sysinst [netbsd-10]: label.c msg.mi.de msg.mi.en msg.mi.es
msg.mi.fr msg.mi.pl
Log Message:
Pull up the following revisions(s) (requested by martin in ticket #442):
usr.sbin/sysinst/label.c: revision 1.49
usr.sbin/sysinst/msg.mi.de: revision 1.44
usr.sbin/sysinst/msg.mi.en: revision 1.47
usr.sbin/sysinst/msg.mi.es: revision 1.40
usr.sbin/sysinst/msg.mi.fr: revision 1.45
usr.sbin/sysinst/msg.mi.pl: revision 1.46
Switch to "-" (single minus) as input denotation for "no mount point"
in all translations and adjust the code accordingly.
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.46.2.1 src/usr.sbin/sysinst/label.c \
src/usr.sbin/sysinst/msg.mi.en
cvs rdiff -u -r1.43 -r1.43.2.1 src/usr.sbin/sysinst/msg.mi.de
cvs rdiff -u -r1.39 -r1.39.2.1 src/usr.sbin/sysinst/msg.mi.es
cvs rdiff -u -r1.44 -r1.44.2.1 src/usr.sbin/sysinst/msg.mi.fr
cvs rdiff -u -r1.45 -r1.45.2.1 src/usr.sbin/sysinst/msg.mi.pl
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/label.c
diff -u src/usr.sbin/sysinst/label.c:1.46 src/usr.sbin/sysinst/label.c:1.46.2.1
--- src/usr.sbin/sysinst/label.c:1.46 Thu Dec 15 20:21:16 2022
+++ src/usr.sbin/sysinst/label.c Thu Nov 2 14:08:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: label.c,v 1.46 2022/12/15 20:21:16 martin Exp $ */
+/* $NetBSD: label.c,v 1.46.2.1 2023/11/02 14:08:17 sborrill Exp $ */
/*
* Copyright 1997 Jonathan Stone
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: label.c,v 1.46 2022/12/15 20:21:16 martin Exp $");
+__RCSID("$NetBSD: label.c,v 1.46.2.1 2023/11/02 14:08:17 sborrill Exp $");
#endif
#include <sys/types.h>
@@ -441,7 +441,7 @@ edit_fs_mountpt(menudesc *m, void *arg)
if (last != NULL)
last[1] = 0;
- if (first == NULL || *first == 0 || strcmp(first, "none") == 0) {
+ if (first == NULL || *first == 0 || strcmp(first, "-") == 0) {
edit->wanted->mount[0] = 0;
edit->wanted->instflags &= ~PUIINST_MOUNT;
return 0;
@@ -454,6 +454,7 @@ edit_fs_mountpt(menudesc *m, void *arg)
} else {
strlcpy(edit->wanted->mount, first, sizeof edit->wanted->mount);
}
+ edit->wanted->instflags |= PUIINST_MOUNT;
return 0;
}
Index: src/usr.sbin/sysinst/msg.mi.en
diff -u src/usr.sbin/sysinst/msg.mi.en:1.46 src/usr.sbin/sysinst/msg.mi.en:1.46.2.1
--- src/usr.sbin/sysinst/msg.mi.en:1.46 Thu Dec 15 15:32:04 2022
+++ src/usr.sbin/sysinst/msg.mi.en Thu Nov 2 14:08:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.en,v 1.46 2022/12/15 15:32:04 martin Exp $ */
+/* $NetBSD: msg.mi.en,v 1.46.2.1 2023/11/02 14:08:17 sborrill Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -143,7 +143,7 @@ message sectors
{sectors}
message mountpoint
-{mount point (or 'none')}
+{mount point (or '-')}
message cylname
{cyl}
Index: src/usr.sbin/sysinst/msg.mi.de
diff -u src/usr.sbin/sysinst/msg.mi.de:1.43 src/usr.sbin/sysinst/msg.mi.de:1.43.2.1
--- src/usr.sbin/sysinst/msg.mi.de:1.43 Thu Dec 15 15:32:04 2022
+++ src/usr.sbin/sysinst/msg.mi.de Thu Nov 2 14:08:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.de,v 1.43 2022/12/15 15:32:04 martin Exp $ */
+/* $NetBSD: msg.mi.de,v 1.43.2.1 2023/11/02 14:08:17 sborrill Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -152,7 +152,7 @@ message sectors
{Sektoren}
message mountpoint
-{Mountpoint (oder 'kein(e)'))}
+{Mountpoint (oder '-')}
message cylname
{Zyl}
Index: src/usr.sbin/sysinst/msg.mi.es
diff -u src/usr.sbin/sysinst/msg.mi.es:1.39 src/usr.sbin/sysinst/msg.mi.es:1.39.2.1
--- src/usr.sbin/sysinst/msg.mi.es:1.39 Thu Dec 15 15:32:04 2022
+++ src/usr.sbin/sysinst/msg.mi.es Thu Nov 2 14:08:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.es,v 1.39 2022/12/15 15:32:04 martin Exp $ */
+/* $NetBSD: msg.mi.es,v 1.39.2.1 2023/11/02 14:08:17 sborrill Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -150,7 +150,7 @@ message sectors
{sectores}
message mountpoint
-{punto de montaje (o 'ninguno')}
+{punto de montaje (o '-')}
message cylname
{cil}
Index: src/usr.sbin/sysinst/msg.mi.fr
diff -u src/usr.sbin/sysinst/msg.mi.fr:1.44 src/usr.sbin/sysinst/msg.mi.fr:1.44.2.1
--- src/usr.sbin/sysinst/msg.mi.fr:1.44 Thu Dec 15 15:32:04 2022
+++ src/usr.sbin/sysinst/msg.mi.fr Thu Nov 2 14:08:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.fr,v 1.44 2022/12/15 15:32:04 martin Exp $ */
+/* $NetBSD: msg.mi.fr,v 1.44.2.1 2023/11/02 14:08:17 sborrill Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -152,7 +152,7 @@ message sectors
{secteurs}
message mountpoint
-{point de montage (ou 'aucun')}
+{point de montage (ou '-')}
message cylname
{cyl}
Index: src/usr.sbin/sysinst/msg.mi.pl
diff -u src/usr.sbin/sysinst/msg.mi.pl:1.45 src/usr.sbin/sysinst/msg.mi.pl:1.45.2.1
--- src/usr.sbin/sysinst/msg.mi.pl:1.45 Thu Dec 15 15:32:04 2022
+++ src/usr.sbin/sysinst/msg.mi.pl Thu Nov 2 14:08:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.pl,v 1.45 2022/12/15 15:32:04 martin Exp $ */
+/* $NetBSD: msg.mi.pl,v 1.45.2.1 2023/11/02 14:08:17 sborrill Exp $ */
/* Based on english version: */
/* NetBSD: msg.mi.pl,v 1.36 2004/04/17 18:55:35 atatat Exp */
@@ -147,7 +147,7 @@ message sectors
{sektory}
message mountpoint
-{punkt montowania (lub 'zaden')}
+{punkt montowania (lub '-')}
message cylname
{cyl}
