CVS commit: src/bin/sh
Module Name:src
Committed By: kre
Date: Tue Jan 30 19:05:07 UTC 2024
Modified Files:
src/bin/sh: jobs.c
Log Message:
PR bin/57894
For jobs -p for a non-job-control job, avoid just printing 0 (as
there is no process group pid) and instead output what we used to,
the pid of one of the processes in the job (usually the right one!)
XXX pullup -10 (9 and earlier not affected).
To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 src/bin/sh/jobs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/jobs.c
diff -u src/bin/sh/jobs.c:1.118 src/bin/sh/jobs.c:1.119
--- src/bin/sh/jobs.c:1.118 Fri Apr 7 10:34:13 2023
+++ src/bin/sh/jobs.c Tue Jan 30 19:05:07 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: jobs.c,v 1.118 2023/04/07 10:34:13 kre Exp $ */
+/* $NetBSD: jobs.c,v 1.119 2024/01/30 19:05:07 kre Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)jobs.c 8.5 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: jobs.c,v 1.118 2023/04/07 10:34:13 kre Exp $");
+__RCSID("$NetBSD: jobs.c,v 1.119 2024/01/30 19:05:07 kre Exp $");
#endif
#endif /* not lint */
@@ -439,7 +439,8 @@ showjob(struct output *out, struct job *
#if JOBS
if (mode & SHOW_PGID) {
/* output only the process group ID (lead process ID) */
- outfmt(out, "%ld\n", (long)jp->pgrp);
+ outfmt(out, "%ld\n",
+ jp->pgrp != 0 ? (long)jp->pgrp : (long)jp->ps->pid);
return;
}
#endif
CVS commit: src/bin/sh
Module Name:src Committed By: kre Date: Tue Jan 30 19:05:07 UTC 2024 Modified Files: src/bin/sh: jobs.c Log Message: PR bin/57894 For jobs -p for a non-job-control job, avoid just printing 0 (as there is no process group pid) and instead output what we used to, the pid of one of the processes in the job (usually the right one!) XXX pullup -10 (9 and earlier not affected). To generate a diff of this commit: cvs rdiff -u -r1.118 -r1.119 src/bin/sh/jobs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/usr.bin/mtree
Module Name:src Committed By: martin Date: Tue Jan 30 16:57:32 UTC 2024 Modified Files: src/tests/usr.bin/mtree: t_sets.sh Log Message: Skip the dtb set if the /boot partition is not mounted. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/mtree/t_sets.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/usr.bin/mtree/t_sets.sh diff -u src/tests/usr.bin/mtree/t_sets.sh:1.3 src/tests/usr.bin/mtree/t_sets.sh:1.4 --- src/tests/usr.bin/mtree/t_sets.sh:1.3 Sun Jan 28 19:08:06 2024 +++ src/tests/usr.bin/mtree/t_sets.sh Tue Jan 30 16:57:32 2024 @@ -1,4 +1,4 @@ -# $NetBSD: t_sets.sh,v 1.3 2024/01/28 19:08:06 riastradh Exp $ +# $NetBSD: t_sets.sh,v 1.4 2024/01/30 16:57:32 martin Exp $ # # Copyright (c) 2024 The NetBSD Foundation, Inc. # All rights reserved. @@ -77,6 +77,13 @@ atf_init_test_cases() base) # Handled above already. continue ;; + dtb) + # contents of this set go to the boot partition, + # which may not be mounted during normal operation + if [ ! -d /boot/dtb ]; then +continue; + fi + ;; etc|xetc) # etc and xetc have files that may be modified # on installation, and also contain log files,
CVS commit: src/tests/usr.bin/mtree
Module Name:src Committed By: martin Date: Tue Jan 30 16:57:32 UTC 2024 Modified Files: src/tests/usr.bin/mtree: t_sets.sh Log Message: Skip the dtb set if the /boot partition is not mounted. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/mtree/t_sets.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets
Module Name:src
Committed By: martin
Date: Tue Jan 30 10:24:39 UTC 2024
Modified Files:
src/distrib/sets: maketars
Log Message:
Fix previous, use sed to fix up the set.${set} line in non-METAFILE mode
To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/distrib/sets/maketars
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/maketars
diff -u src/distrib/sets/maketars:1.99 src/distrib/sets/maketars:1.100
--- src/distrib/sets/maketars:1.99 Mon Jan 29 15:56:49 2024
+++ src/distrib/sets/maketars Tue Jan 30 10:24:39 2024
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: maketars,v 1.99 2024/01/29 15:56:49 martin Exp $
+# $NetBSD: maketars,v 1.100 2024/01/30 10:24:39 martin Exp $
#
# Make release tar files for some or all lists. Usage:
# maketars [-b] [-x] [-i installdir] [-a arch] [-m machine] [-s setsdir]
@@ -199,9 +199,10 @@ for setname in ${lists}; do
# because we depend on it as an input.
else
${MTREE} -c -p "${dest}" -k all \
- -R "${skipkeys},set.${setname}" \
+ -R "${skipkeys}" \
-N "${etcdir}" -O "${SDIR}/flist.${setname}" \
| ${MTREE} -C -k all -N "${etcdir}" \
+ | ${SED} -e "s:^./etc/mtree/set.${setname}.*\$:./etc/mtree/set.${setname} type=file mode=0444:" \
> "${setlistdir}/set.${setname}"
fi
done
CVS commit: src/distrib/sets
Module Name:src
Committed By: martin
Date: Tue Jan 30 10:24:39 UTC 2024
Modified Files:
src/distrib/sets: maketars
Log Message:
Fix previous, use sed to fix up the set.${set} line in non-METAFILE mode
To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/distrib/sets/maketars
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
