Fix typo in nvme(4)

[asomers]

Summary

Fix typo in nvme(4)

[jimharris]

share/man/man4/nvme.4

57 ↗

(On Diff #26086)

The original word "surface" is actually what I intended - i.e. nvd(4) surfaces (or exposes) the namespaces as GEOM block devices. But I'm OK with "service" too - I think either one gets the point across.

head/share/man/man4/nvme.4

+#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
+# Copyright (c) 2019 Ahsan Barkati
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# $FreeBSD$
+#
+
+. $(atf_get_srcdir)/../../common/vnet.subr
+
+firewall_config()
+{
+        jname=$1
+        shift
+        fw=$1
+        shift
+
+        while [ $# -gt 0 ]; do
+                if [ $(is_firewall $fw) -eq  1 ]; then
+                        current_fw="$1"
+                        shift
+                        filename=${current_fw}.rule
+                        cwd=$(pwd)
+                        if [ -f ${current_fw}.rule ]; then
+                                rm ${current_fw}.rule
+                        fi
+                fi
+                rule=$1
+                echo $rule >> $filename
+                shift
+        done
+
+        if [ ${fw} == "ipfw" ]; then
+                jexec ${jname} ipfw -q -f flush
+                jexec ${jname} /bin/sh $cwd/ipfw.rule
+        elif [ ${fw} == "pf" ]; then
+                jexec ${jname} pfctl -e
+                jexec ${jname} pfctl -F all
+                jexec ${jname} pfctl -f $cwd/pf.rule
+        elif [ ${fw} == "ipf" ]; then
+                jexec ${jname} ipf -E
+                jexec ${jname} ipf -Fa -f $cwd/ipf.rule
+        elif [ ${fw} == "ipfnat" ]; then
+                jexec ${jname} service ipfilter start
+                jexec ${jname} ipnat -CF -f $cwd/ipfnat.rule
+        else
+                atf_fail "$fw is not a valid firewall to configure"
+        fi
+}
+
+firewall_cleanup()
+{
+        firewall=$1
+        echo "Cleaning $firewall"
+        vnet_cleanup
+}
+
+firewall_init()
+{
+        firewall=$1
+        vnet_init
+
+        if [ ${firewall} == "ipfw" ]; then
+                if ! kldstat -q -m ipfw; then
+                        atf_skip "This test requires ipfw"
+                fi
+        elif [ ${firewall} == "pf" ]; then
+                if [ ! -c /dev/pf ]; then
+                        atf_skip "This test requires pf"
+                fi
+        elif [ ${firewall} == "ipf" ]; then
+                if ! kldstat -q -m ipfilter; then
+                        atf_skip "This test requires ipf"
+                fi
+        elif [ ${firewall} == "ipfnat" ]; then
+                if ! kldstat -q -m ipfw_nat; then
+                        atf_skip "This test requires ipfw_nat"
+                fi
+        else
+                atf_fail "$fw is not a valid firewall to initialize"
+        fi
+
+}
+
+is_firewall()
+{
+        if [ "$1" = "pf" -o "$1" = "ipfw" -o "$1" = "ipf" -o "$1" = "ipfnat" ]; then
+                echo 1
+        else
+                echo 0
+        fi
+}
 No newline at end of file