summaryrefslogtreecommitdiffstats
path: root/sbin
diff options
context:
space:
mode:
Diffstat (limited to 'sbin')
-rw-r--r--sbin/camcontrol/camcontrol.c23
-rw-r--r--sbin/ipfw/ipfw.82
-rw-r--r--sbin/mount_nfs/mount_nfs.c2
-rw-r--r--sbin/savecore/savecore.88
4 files changed, 18 insertions, 17 deletions
diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c
index 1bba49c..7da0200 100644
--- a/sbin/camcontrol/camcontrol.c
+++ b/sbin/camcontrol/camcontrol.c
@@ -1055,23 +1055,22 @@ atacapprint(struct ata_params *parm)
printf("\n");
printf("PIO supported PIO");
- if (parm->atavalid & ATA_FLAG_64_70) {
- if (parm->apiomodes & 0x02)
- printf("4");
- else if (parm->apiomodes & 0x01)
- printf("3");
- } else if (parm->mwdmamodes & 0x04)
+ switch (ata_max_pmode(parm)) {
+ case ATA_PIO4:
printf("4");
- else if (parm->mwdmamodes & 0x02)
+ break;
+ case ATA_PIO3:
printf("3");
- else if (parm->mwdmamodes & 0x01)
+ break;
+ case ATA_PIO2:
printf("2");
- else if ((parm->retired_piomode & ATA_RETIRED_PIO_MASK) == 0x200)
- printf("2");
- else if ((parm->retired_piomode & ATA_RETIRED_PIO_MASK) == 0x100)
+ break;
+ case ATA_PIO1:
printf("1");
- else
+ break;
+ default:
printf("0");
+ }
printf("\n");
printf("DMA%ssupported ",
diff --git a/sbin/ipfw/ipfw.8 b/sbin/ipfw/ipfw.8
index 0d08665..f8b0746 100644
--- a/sbin/ipfw/ipfw.8
+++ b/sbin/ipfw/ipfw.8
@@ -869,7 +869,7 @@ The packet is tagged so as to use the FIB (routing table)
.Ar fibnum
in any subsequent forwarding decisions.
Initially this is limited to the values 0 through 15, see
-.Xr setfib 8 .
+.Xr setfib 1 .
Processing continues at the next rule.
.It Cm reass
Queue and reassemble ip fragments.
diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c
index 9451fd7..7d4f3f6 100644
--- a/sbin/mount_nfs/mount_nfs.c
+++ b/sbin/mount_nfs/mount_nfs.c
@@ -104,7 +104,7 @@ struct nfhret {
#define OF_NOINET6 8
int retrycnt = -1;
int opflags = 0;
-int nfsproto = IPPROTO_UDP;
+int nfsproto = IPPROTO_TCP;
int mnttcp_ok = 1;
int noconn = 0;
char *portspec = NULL; /* Server nfs port; NULL means look up via rpcbind. */
diff --git a/sbin/savecore/savecore.8 b/sbin/savecore/savecore.8
index 25b9aa6..01be723 100644
--- a/sbin/savecore/savecore.8
+++ b/sbin/savecore/savecore.8
@@ -101,14 +101,16 @@ checks the core dump in various ways to make sure that it is complete.
If it passes these checks, it saves the core image in
.Ar directory Ns Pa /vmcore.#
and information about the core in
-.Ar directory Ns Pa /info.#
+.Ar directory Ns Pa /info.# .
For kernel textdumps generated with the
.Xr textdump 4
facility, output will be stored in the
.Xr tar 5
format and named
-.Ar director Ns Pa /textdump.tar.#
-The ``#'' is the number from the first line of the file
+.Ar directory Ns Pa /textdump.tar.# .
+The
+.Dq #
+is the number from the first line of the file
.Ar directory Ns Pa /bounds ,
and it is incremented and stored back into the file each time
.Nm
OpenPOWER on IntegriCloud