CVS commit: src/tests/bin/cp
Module Name:src
Committed By: rillig
Date: Fri Apr 26 01:33:23 UTC 2024
Modified Files:
src/tests/bin/cp: t_cp.sh
Log Message:
tests/cp: clean up
Replace the deprecated "eq:0" with "exit:0", remove redundant "-o empty"
and "-e empty".
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/bin/cp/t_cp.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/bin/cp/t_cp.sh
diff -u src/tests/bin/cp/t_cp.sh:1.1 src/tests/bin/cp/t_cp.sh:1.2
--- src/tests/bin/cp/t_cp.sh:1.1 Sat Mar 17 16:33:10 2012
+++ src/tests/bin/cp/t_cp.sh Fri Apr 26 01:33:23 2024
@@ -1,4 +1,4 @@
-# $NetBSD: t_cp.sh,v 1.1 2012/03/17 16:33:10 jruoho Exp $
+# $NetBSD: t_cp.sh,v 1.2 2024/04/26 01:33:23 rillig Exp $
#
# Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -62,7 +62,7 @@ file_to_file_simple() {
rm -f file2
umask 022
chmod 777 file
- atf_check -s eq:0 -o empty -e empty cp file file2
+ atf_check cp file file2
cp_compare file_to_file_simple file file2
if [ `stat -f "%Lp" file2` != "755" ]; then
atf_fail "new file not created with umask"
@@ -80,7 +80,7 @@ file_to_file_preserve() {
rm file3
chmod 644 file
chflags nodump file
- atf_check -s eq:0 -o empty -e empty cp -p file file3
+ atf_check cp -p file file3
finfo=`stat -f "%p%u%g%m%z%f" file`
f3info=`stat -f "%p%u%g%m%z%f" file3`
if [ $finfo != $f3info ]; then
@@ -92,7 +92,7 @@ file_to_file_noflags() {
rm file3
chmod 644 file
chflags nodump file
- atf_check -s eq:0 -o empty -e empty cp -p -N file file3
+ atf_check cp -p -N file file3
finfo=`stat -f "%f" file`
f3info=`stat -f "%f" file3`
if [ $finfo = $f3info ]; then
@@ -106,7 +106,7 @@ file_to_link_head() {
}
file_to_link_body() {
reset
- atf_check -s eq:0 -o empty -e empty cp file2 link
+ atf_check cp file2 link
cp_compare file_to_link file file2
}
@@ -117,8 +117,8 @@ link_to_file_head() {
link_to_file_body() {
reset
# file and link are identical (not copied).
- atf_check -s eq:1 -o empty -e ignore cp link file
- atf_check -s eq:0 -o empty -e empty cp link file2
+ atf_check -s exit:1 -e ignore cp link file
+ atf_check cp link file2
cp_compare link_to_file file file2
}
@@ -129,7 +129,7 @@ file_over_link_head() {
}
file_over_link_body() {
reset
- atf_check -s eq:0 -o empty -e empty cp -P file link
+ atf_check cp -P file link
cp_compare file_over_link file link
}
@@ -140,7 +140,7 @@ link_over_file_head() {
}
link_over_file_body() {
reset
- atf_check -s eq:0 -o empty -e empty cp -P link file
+ atf_check cp -P link file
if [ `readlink link` != `readlink file` ]; then
atf_fail "readlink link != readlink file"
fi
@@ -153,8 +153,8 @@ files_to_dir_head() {
files_to_dir_body() {
reset
# can't copy multiple files to a file
- atf_check -s eq:1 -o empty -e ignore cp file file2 file3
- atf_check -s eq:0 -o empty -e empty cp file file2 link dir
+ atf_check -s exit:1 -e ignore cp file file2 file3
+ atf_check cp file file2 link dir
cp_compare files_to_dir file "dir/file"
}
@@ -166,8 +166,8 @@ dir_to_file_head() {
dir_to_file_body() {
reset
# can't copy a dir onto a file
- atf_check -s eq:1 -o empty -e ignore cp dir file
- atf_check -s eq:1 -o empty -e ignore cp -R dir file
+ atf_check -s exit:1 -e ignore cp dir file
+ atf_check -s exit:1 -e ignore cp -R dir file
}
atf_test_case file_to_linkdir
@@ -177,12 +177,12 @@ file_to_linkdir_head() {
}
file_to_linkdir_body() {
reset
- atf_check -s eq:0 -o empty -e empty cp file dirlink
+ atf_check cp file dirlink
cp_compare file_to_linkdir file "dir/file"
# overwrite the link
- atf_check -s eq:0 -o empty -e empty cp -P file dirlink
- atf_check -s eq:1 -o empty -e empty readlink dirlink
+ atf_check cp -P file dirlink
+ atf_check -s exit:1 readlink dirlink
cp_compare file_to_linkdir file dirlink
}
@@ -194,21 +194,21 @@ linkdir_to_file_head() {
linkdir_to_file_body() {
reset
# cannot copy a dir onto a file
- atf_check -s eq:1 -o empty -e ignore cp dirlink file
+ atf_check -s exit:1 -e ignore cp dirlink file
# overwrite the link
- atf_check -s eq:0 -o empty -e empty cp -P dirlink file
+ atf_check cp -P dirlink file
if [ `readlink file` != `readlink dirlink` ]; then
atf_fail "readlink link != readlink file"
fi
}
dir_to_dne_no_R() {
- atf_check -s eq:1 -o empty -e ignore cp dir dir2
+ atf_check -s exit:1 -e ignore cp dir dir2
}
dir_to_dne() {
- atf_check -s eq:0 -o empty -e empty cp -R dir dir2
+ atf_check cp -R dir dir2
cp_compare dir_to_dne "dir/file" "dir2/file"
readlink dir2/link >/dev/null
if [ $? -gt 0 ]; then
@@ -218,12 +218,12 @@ dir_to_dne() {
dir_to_dir_H() {
dir_to_dir_setup
- atf_check -s eq:0 -o empty -e empty cp -R dir dir2
+ atf_check cp -R dir dir2
chmod 777 dir
# copy a dir into a dir, only command-line links are followed
- atf_check -s eq:0 -o empty -e empty cp -R -H dirlink dir2
+
CVS commit: src/tests/bin/cp
Module Name:src Committed By: rillig Date: Fri Apr 26 01:33:23 UTC 2024 Modified Files: src/tests/bin/cp: t_cp.sh Log Message: tests/cp: clean up Replace the deprecated "eq:0" with "exit:0", remove redundant "-o empty" and "-e empty". To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/bin/cp/t_cp.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/mac68k/dev
Module Name:src
Committed By: nat
Date: Fri Apr 26 00:59:08 UTC 2024
Modified Files:
src/sys/arch/mac68k/dev: pm_direct.c
Log Message:
Return early if PM data is not available.
This avoids random crashes on my Powerbook when using the mouse or keyboard.
The same was needed for the Powerbook 5xx/Duos (compile tested only).
XXX pullup-10, pullup-9, pullup-8.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/mac68k/dev/pm_direct.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mac68k/dev/pm_direct.c
diff -u src/sys/arch/mac68k/dev/pm_direct.c:1.30 src/sys/arch/mac68k/dev/pm_direct.c:1.31
--- src/sys/arch/mac68k/dev/pm_direct.c:1.30 Sat Aug 21 11:55:24 2021
+++ src/sys/arch/mac68k/dev/pm_direct.c Fri Apr 26 00:59:08 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: pm_direct.c,v 1.30 2021/08/21 11:55:24 andvar Exp $ */
+/* $NetBSD: pm_direct.c,v 1.31 2024/04/26 00:59:08 nat Exp $ */
/*
* Copyright (C) 1997 Takashi Hamada
@@ -32,7 +32,7 @@
/* From: pm_direct.c 1.3 03/18/98 Takashi Hamada */
#include
-__KERNEL_RCSID(0, "$NetBSD: pm_direct.c,v 1.30 2021/08/21 11:55:24 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pm_direct.c,v 1.31 2024/04/26 00:59:08 nat Exp $");
#include "opt_adb.h"
@@ -562,6 +562,7 @@ pm_intr_pm1(void *arg)
printf("pm: PM is not ready. error code=%08x\n", rval);
#endif
splx(s);
+ return;
}
if ((pmdata.data[2] & 0x10) == 0x10) {
@@ -821,6 +822,7 @@ pm_intr_pm2(void *arg)
printf("pm: PM is not ready. error code: %08x\n", rval);
#endif
splx(s);
+ return;
}
switch ((u_int)(pmdata.data[2] & 0xff)) {
CVS commit: src/sys/arch/mac68k/dev
Module Name:src Committed By: nat Date: Fri Apr 26 00:59:08 UTC 2024 Modified Files: src/sys/arch/mac68k/dev: pm_direct.c Log Message: Return early if PM data is not available. This avoids random crashes on my Powerbook when using the mouse or keyboard. The same was needed for the Powerbook 5xx/Duos (compile tested only). XXX pullup-10, pullup-9, pullup-8. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/arch/mac68k/dev/pm_direct.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/bin/cat
Module Name:src
Committed By: rillig
Date: Fri Apr 26 00:57:15 UTC 2024
Modified Files:
src/tests/bin/cat: t_cat.sh
Log Message:
tests/cat: clean up
Multiple arguments to atf_set are joined by spaces, there's no need for
an extra space.
The exit status on success must be 0, so don't ignore it.
Remove the unnecessary shell wrapper, as no redirection is going on.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/bin/cat/t_cat.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/bin/cat/t_cat.sh
diff -u src/tests/bin/cat/t_cat.sh:1.3 src/tests/bin/cat/t_cat.sh:1.4
--- src/tests/bin/cat/t_cat.sh:1.3 Thu Jun 16 01:04:58 2016
+++ src/tests/bin/cat/t_cat.sh Fri Apr 26 00:57:15 2024
@@ -1,4 +1,4 @@
-# $NetBSD: t_cat.sh,v 1.3 2016/06/16 01:04:58 sevan Exp $
+# $NetBSD: t_cat.sh,v 1.4 2024/04/26 00:57:15 rillig Exp $
#
# Copyright (c) 2012 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -30,37 +30,37 @@
atf_test_case align
align_head() {
- atf_set "descr" "Test that cat(1) aligns the output " \
+ atf_set "descr" "Test that cat(1) aligns the output" \
"right with options '-be' (PR bin/4841)"
}
align_body() {
- atf_check -s ignore -o file:$(atf_get_srcdir)/d_align.out \
- -x "cat -be $(atf_get_srcdir)/d_align.in"
+ atf_check -o file:$(atf_get_srcdir)/d_align.out \
+ cat -be $(atf_get_srcdir)/d_align.in
}
atf_test_case nonexistent
nonexistent_head() {
- atf_set "descr" "Test that cat(1) doesn't return zero exit " \
+ atf_set "descr" "Test that cat(1) doesn't return zero exit" \
"status for a nonexistent file (PR bin/3538)"
}
nonexistent_body() {
- atf_check -s not-exit:0 -o empty -e not-empty \
- -x "cat /some/name/that/does/not/exist"
+ atf_check -s not-exit:0 -e not-empty \
+ cat /some/name/that/does/not/exist
}
atf_test_case se_output
se_output_head() {
- atf_set "descr" "Test that cat(1) prints a $ sign " \
+ atf_set "descr" "Test that cat(1) prints a $ sign" \
"on blank lines with options '-se' (PR bin/51250)"
}
se_output_body() {
- atf_check -s ignore -o file:$(atf_get_srcdir)/d_se_output.out \
- -x "cat -se $(atf_get_srcdir)/d_se_output.in"
+ atf_check -o file:$(atf_get_srcdir)/d_se_output.out \
+ cat -se $(atf_get_srcdir)/d_se_output.in
}
atf_init_test_cases()
CVS commit: src/tests/bin/cat
Module Name:src Committed By: rillig Date: Fri Apr 26 00:57:15 UTC 2024 Modified Files: src/tests/bin/cat: t_cat.sh Log Message: tests/cat: clean up Multiple arguments to atf_set are joined by spaces, there's no need for an extra space. The exit status on success must be 0, so don't ignore it. Remove the unnecessary shell wrapper, as no redirection is going on. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/tests/bin/cat/t_cat.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: rillig Date: Thu Apr 25 17:22:49 UTC 2024 Modified Files: src/doc: CHANGES Log Message: CHANGES: fix typo To generate a diff of this commit: cvs rdiff -u -r1.3050 -r1.3051 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.3050 src/doc/CHANGES:1.3051 --- src/doc/CHANGES:1.3050 Wed Apr 24 15:41:41 2024 +++ src/doc/CHANGES Thu Apr 25 17:22:48 2024 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.3050 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.3051 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -137,7 +137,7 @@ Changes from NetBSD 10.0 to NetBSD 11.0: [gutteridge 20230630] tetris(6): Support the informal standard of allowing setting NO_COLOR in the environment to disable the use of color. [nia 20230701] - lint(1): Initial support for C23. [rilling 20230702] + lint(1): Initial support for C23. [rillig 20230702] heartbeat(9): New mechanism to check progress of kernel. This uses hard interrupts to check progress of low-priority soft interrupts, and one CPU to check progress of another CPU. @@ -230,7 +230,7 @@ Changes from NetBSD 10.0 to NetBSD 11.0: kernel: Replace various usage of extent(9) with vmem(9). [thorpej 20231201] indent(1): Use line number of the token start in diagnostics - [rilling 20231203] + [rillig 20231203] vmem(9): Add the notion of "private boundary tags", allowing vmem to be used VERY early in boot. [thorpej 20231203] kernel: Modularize compat90. [pgoyette 20231209] @@ -314,7 +314,7 @@ Changes from NetBSD 10.0 to NetBSD 11.0: be matched by ugen(4) and accessed through libusb. [thorpej 20240326] moused(8): Remove undocumented and unused option 'C'. - [rilling 20240329] + [rillig 20240329] ugen(4): Add a "ugen-unit" device property which devpubd(8) scripts can query to determine which /dev/ugenN.xx nodes a given ugen or ugenif device is using. [thorpej 20240329]
CVS commit: src/doc
Module Name:src Committed By: rillig Date: Thu Apr 25 17:22:49 UTC 2024 Modified Files: src/doc: CHANGES Log Message: CHANGES: fix typo To generate a diff of this commit: cvs rdiff -u -r1.3050 -r1.3051 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib
Module Name:src
Committed By: nia
Date: Thu Apr 25 11:56:51 UTC 2024
Modified Files:
src/distrib/common: Makefile.bootcd
src/distrib/common/bootimage: Makefile.installimage
src/distrib/i386/cdroms/installcd: Makefile
Log Message:
remove redundant kernels and floppies from the space-starved i386 ISO
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/distrib/common/Makefile.bootcd
cvs rdiff -u -r1.10 -r1.11 src/distrib/common/bootimage/Makefile.installimage
cvs rdiff -u -r1.11 -r1.12 src/distrib/i386/cdroms/installcd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/Makefile.bootcd
diff -u src/distrib/common/Makefile.bootcd:1.47 src/distrib/common/Makefile.bootcd:1.48
--- src/distrib/common/Makefile.bootcd:1.47 Wed Apr 24 11:29:34 2024
+++ src/distrib/common/Makefile.bootcd Thu Apr 25 11:56:51 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootcd,v 1.47 2024/04/24 11:29:34 nia Exp $
+# $NetBSD: Makefile.bootcd,v 1.48 2024/04/25 11:56:51 nia Exp $
#
# Makefile snipped to create a CD/DVD ISO
#
@@ -53,7 +53,7 @@ CDROMS_RELEASEDIR?= ${MACHINE}/installat
CDROMS_RELEASEDIR?= images
.endif
.if defined(CDRELEASE_NOISOS)
-CDRELEASE_EXCLUDE= -s ',./installation/cdrom.*,,gp'
+CDRELEASE_EXCLUDE+= -s ',./installation/cdrom.*,,gp'
.endif
.if defined(CDRELEASE_NOCOMPAT)
. for sufx in tgz tar.xz
Index: src/distrib/common/bootimage/Makefile.installimage
diff -u src/distrib/common/bootimage/Makefile.installimage:1.10 src/distrib/common/bootimage/Makefile.installimage:1.11
--- src/distrib/common/bootimage/Makefile.installimage:1.10 Sat Sep 25 21:26:03 2021
+++ src/distrib/common/bootimage/Makefile.installimage Thu Apr 25 11:56:51 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.installimage,v 1.10 2021/09/25 21:26:03 maya Exp $
+# $NetBSD: Makefile.installimage,v 1.11 2024/04/25 11:56:51 nia Exp $
#
# Common Makefile to create a bootable installation image for USB flash etc.
#
@@ -46,7 +46,8 @@ DISKPROTO_IN?= ${NETBSDSRCDIR}/distrib/c
# XXX: no permission info for makefs(8)
IMGDIR_EXTRA= ${RELEASEDIR}/${RELEASEMACHINEDIR} ${RELEASEMACHINEDIR}
-IMGDIR_EXCLUDE= -s ',./installation/cdrom.*,,gp'
+IMGDIR_EXCLUDE+= -s ',./installation/floppy/.*,,gp'
+IMGDIR_EXCLUDE+= -s ',./installation/cdrom.*,,gp'
IMGDIR_EXCLUDE+= -s ',./installation/liveimage.*,,gp'
IMGDIR_EXCLUDE+= -s ',./installation/installimage.*,,gp'
.if defined(MD_IMGDIR_EXCLUDE)
Index: src/distrib/i386/cdroms/installcd/Makefile
diff -u src/distrib/i386/cdroms/installcd/Makefile:1.11 src/distrib/i386/cdroms/installcd/Makefile:1.12
--- src/distrib/i386/cdroms/installcd/Makefile:1.11 Tue Apr 23 20:37:08 2024
+++ src/distrib/i386/cdroms/installcd/Makefile Thu Apr 25 11:56:51 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2024/04/23 20:37:08 nia Exp $
+# $NetBSD: Makefile,v 1.12 2024/04/25 11:56:51 nia Exp $
#
# Install CD, to be made after 'build.sh release'
@@ -15,6 +15,21 @@ CDRELEASE_NOTESTS= true
CDBUILDEXTRA+= boot.cfg # Add boot.cfg file
CLEANFILES+= boot.cfg
+# already (probably) booting from CD if using this and the floppy images
+# are 20MB+ when combined
+CDRELEASE_EXCLUDE+= -s ',./installation/floppy/.*,,gp'
+
+# MONOLITHIC (i386-only) was originally added to the release build
+# for upgrades from netbsd-5, and now primarily exists so the no-modules
+# build can continue to be tested. this takes up 20MB+ space.
+. for sufx in tgz tar.xz
+CDRELEASE_EXCLUDE+= -s ',./binary/sets/kern-INSTALL.${sufx},,gp'
+CDRELEASE_EXCLUDE+= -s ',./binary/sets/kern-MONOLITHIC.${sufx},,gp'
+. endfor
+
+CDRELEASE_EXCLUDE+= -s ',./binary/kernel/netbsd-INSTALL.gz,,gp'
+CDRELEASE_EXCLUDE+= -s ',./binary/kernel/netbsd-MONOLITHIC.gz,,gp'
+
prepare_md_post:
${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" < ${.CURDIR}/boot.cfg.in > boot.cfg
CVS commit: src/distrib
Module Name:src Committed By: nia Date: Thu Apr 25 11:56:51 UTC 2024 Modified Files: src/distrib/common: Makefile.bootcd src/distrib/common/bootimage: Makefile.installimage src/distrib/i386/cdroms/installcd: Makefile Log Message: remove redundant kernels and floppies from the space-starved i386 ISO To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/distrib/common/Makefile.bootcd cvs rdiff -u -r1.10 -r1.11 src/distrib/common/bootimage/Makefile.installimage cvs rdiff -u -r1.11 -r1.12 src/distrib/i386/cdroms/installcd/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: hannken
Date: Thu Apr 25 11:25:09 UTC 2024
Modified Files:
src/usr.sbin/sysinst: msg.mi.de msg.mi.en msg.mi.es msg.mi.pl util.c
Log Message:
Increase length of set description to 40 characters so recent additions fit.
Ok: martin@
Fixes PR install/58188 "sysinst fails to display status of base32 set"
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/usr.sbin/sysinst/msg.mi.de
cvs rdiff -u -r1.50 -r1.51 src/usr.sbin/sysinst/msg.mi.en
cvs rdiff -u -r1.42 -r1.43 src/usr.sbin/sysinst/msg.mi.es
cvs rdiff -u -r1.48 -r1.49 src/usr.sbin/sysinst/msg.mi.pl
cvs rdiff -u -r1.76 -r1.77 src/usr.sbin/sysinst/util.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/msg.mi.de
diff -u src/usr.sbin/sysinst/msg.mi.de:1.47 src/usr.sbin/sysinst/msg.mi.de:1.48
--- src/usr.sbin/sysinst/msg.mi.de:1.47 Mon Apr 22 14:41:26 2024
+++ src/usr.sbin/sysinst/msg.mi.de Thu Apr 25 11:25:08 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.de,v 1.47 2024/04/22 14:41:26 nia Exp $ */
+/* $NetBSD: msg.mi.de,v 1.48 2024/04/25 11:25:08 hannken Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -875,8 +875,8 @@ message cur_distsets
}
message cur_distsets_header
-{ Distributionspaket Ausgewählt
- --
+{ Distributionspaket Ausgewählt
+ -- --
}
message set_base
Index: src/usr.sbin/sysinst/msg.mi.en
diff -u src/usr.sbin/sysinst/msg.mi.en:1.50 src/usr.sbin/sysinst/msg.mi.en:1.51
--- src/usr.sbin/sysinst/msg.mi.en:1.50 Mon Apr 22 14:41:26 2024
+++ src/usr.sbin/sysinst/msg.mi.en Thu Apr 25 11:25:08 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.en,v 1.50 2024/04/22 14:41:26 nia Exp $ */
+/* $NetBSD: msg.mi.en,v 1.51 2024/04/25 11:25:08 hannken Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -809,8 +809,8 @@ message cur_distsets
}
message cur_distsets_header
-{ Distribution set Selected
-
+{ Distribution set Selected
+ --
}
message set_base
Index: src/usr.sbin/sysinst/msg.mi.es
diff -u src/usr.sbin/sysinst/msg.mi.es:1.42 src/usr.sbin/sysinst/msg.mi.es:1.43
--- src/usr.sbin/sysinst/msg.mi.es:1.42 Mon Apr 22 14:41:26 2024
+++ src/usr.sbin/sysinst/msg.mi.es Thu Apr 25 11:25:08 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.es,v 1.42 2024/04/22 14:41:26 nia Exp $ */
+/* $NetBSD: msg.mi.es,v 1.43 2024/04/25 11:25:08 hannken Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -834,8 +834,8 @@ message cur_distsets
}
message cur_distsets_header
-{ Conjunto de distribución Selecc.
-
+{ Conjunto de distribución Selecc.
+ --
}
message set_base
Index: src/usr.sbin/sysinst/msg.mi.pl
diff -u src/usr.sbin/sysinst/msg.mi.pl:1.48 src/usr.sbin/sysinst/msg.mi.pl:1.49
--- src/usr.sbin/sysinst/msg.mi.pl:1.48 Mon Apr 22 14:41:26 2024
+++ src/usr.sbin/sysinst/msg.mi.pl Thu Apr 25 11:25:08 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.pl,v 1.48 2024/04/22 14:41:26 nia Exp $ */
+/* $NetBSD: msg.mi.pl,v 1.49 2024/04/25 11:25:08 hannken Exp $ */
/* Based on english version: */
/* NetBSD: msg.mi.pl,v 1.36 2004/04/17 18:55:35 atatat Exp */
@@ -806,8 +806,8 @@ message cur_distsets
}
message cur_distsets_header
-{Pakiet dystrybucyjny Uzyc?
-- -
+{Pakiet dystrybucyjny Uzyc?
+--- -
}
message set_base
Index: src/usr.sbin/sysinst/util.c
diff -u src/usr.sbin/sysinst/util.c:1.76 src/usr.sbin/sysinst/util.c:1.77
--- src/usr.sbin/sysinst/util.c:1.76 Mon Apr 22 14:41:26 2024
+++ src/usr.sbin/sysinst/util.c Thu Apr 25 11:25:08 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.76 2024/04/22 14:41:26 nia Exp $ */
+/* $NetBSD: util.c,v 1.77 2024/04/25 11:25:08 hannken Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -246,7 +246,7 @@ init_set_status(int flags)
i = strlen(msg_all); if (i > len) {len = i; longest = msg_all; }
i = strlen(msg_some); if (i > len) {len = i; longest = msg_some; }
i = strlen(msg_none); if (i > len) {len = i; longest = msg_none; }
- select_menu_width = snprintf(NULL, 0, "%-30s %s", "", longest);
+ select_menu_width = snprintf(NULL, 0, "%-40s %s", "", longest);
/* Give the md code a chance to choose the right kernel, etc. */
md_init_set_status(flags);
@@ -870,7 +870,7 @@ set_label(menudesc *menu, int opt, void
}
}
- wprintw(menu->mw, "%-30s %s", msg_string(desc), selected);
+ wprintw(menu->mw, "%-40s %s", msg_string(desc), selected);
}
static int set_sublist(menudesc *menu, void *arg);
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: hannken Date: Thu Apr 25 11:25:09 UTC 2024 Modified Files: src/usr.sbin/sysinst: msg.mi.de msg.mi.en msg.mi.es msg.mi.pl util.c Log Message: Increase length of set description to 40 characters so recent additions fit. Ok: martin@ Fixes PR install/58188 "sysinst fails to display status of base32 set" To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/usr.sbin/sysinst/msg.mi.de cvs rdiff -u -r1.50 -r1.51 src/usr.sbin/sysinst/msg.mi.en cvs rdiff -u -r1.42 -r1.43 src/usr.sbin/sysinst/msg.mi.es cvs rdiff -u -r1.48 -r1.49 src/usr.sbin/sysinst/msg.mi.pl cvs rdiff -u -r1.76 -r1.77 src/usr.sbin/sysinst/util.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
