19.01.2023 19:11, Jason McIntyre пишет:
> On Thu, Jan 19, 2023 at 06:50:14PM +0000, Klemens Nanni wrote:
>> $ man -h rdsetroot
>> rdsetroot [-dx] kernel [disk.fs]
>> vs.
>> $ rdsetroot
>> usage: rdsetroot [-dx] bsd [fs]
>>
>
> i have to say i think the man page has better argument names, but i've
> nothing against your changes. just as long as they match.
Either way is fine, just let them match.
>> Clarify that -x uses stdout (could be a default file like ktrace(1) does)
>> and switch 'standard in/output' to more common '.Va stdin/out' like the
>> related vnconfig(8) does.
>>
>
> i'm fine with your diff, but i think that "reads from standard input" is
> much easier to understand than the change you propose.
Sure, new version with both points incorporated.
Feedback? OK?
>
> jmc
>
>> Explaining how disk images can round trip through rdsetroot and vnconfig
>> is vaguely useful, imho, even less so in the description of -x, so briefly
>> mention the relation and let readers follow the reference for more.
Index: rdsetroot.8
===================================================================
RCS file: /cvs/src/usr.sbin/rdsetroot/rdsetroot.8,v
retrieving revision 1.2
diff -u -p -r1.2 rdsetroot.8
--- rdsetroot.8 5 Apr 2019 21:44:32 -0000 1.2
+++ rdsetroot.8 20 Jan 2023 12:33:31 -0000
@@ -24,30 +24,29 @@
.Nm rdsetroot
.Op Fl dx
.Ar kernel
-.Op Ar disk.fs
+.Op Ar disk
.Sh DESCRIPTION
The
.Nm
-utility inserts the file
-.Ar disk.fs
-into the reserved space inside a RAMDISK kernel.
+utility inserts the disk image
+.Ar disk
+into the reserved space inside the RAMDISK kernel
+.Ar bsd .
If
-.Ar disk.fs
-is not specified,
-.Nm
-reads from standard input.
+.Ar disk
+is not specified, standard input is used.
+Disk images can be used with
+.Xr vnconfig 8 .
.Pp
The options are as follows:
.Bl -tag -width Ds
.It Fl d
Debug.
.It Fl x
-Rather than inserting, extract the
-.Ar disk.fs
-image.
-The disk can be made accessible using
-.Xr vnconfig 8 ,
-filesystems can be manipulated, and finally re-inserted into the RAMDISK
kernel.
+Extract the disk image.
+If
+.Ar disk
+is not specified, standard output is used.
.El
.Sh SEE ALSO
.Xr config 8 ,
Index: rdsetroot.c
===================================================================
RCS file: /cvs/src/usr.sbin/rdsetroot/rdsetroot.c,v
retrieving revision 1.3
diff -u -p -r1.3 rdsetroot.c
--- rdsetroot.c 24 Oct 2021 21:24:19 -0000 1.3
+++ rdsetroot.c 20 Jan 2023 12:33:33 -0000
@@ -294,6 +294,6 @@ usage(void)
{
extern char *__progname;
- fprintf(stderr, "usage: %s [-dx] bsd [fs]\n", __progname);
+ fprintf(stderr, "usage: %s [-dx] kernel [disk]\n", __progname);
exit(1);
}
