Merge pull request #4078 from stgraber/master

lxc-checkconfig: Fix bashism
lxc · Feb 3, 2022 · cc07e2d · cc07e2d
2 parents 73bc39a + 2965130
commit cc07e2d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/doc/lxc.container.conf.sgml.in b/doc/lxc.container.conf.sgml.in
@@ -1652,7 +1652,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
         <itemizedlist>
           <listitem>
 	    <para>
-	      A allowlist device rule
+	      A denylist device rule
               <programlisting>
 	        lxc.cgroup2.devices.deny = a
               </programlisting>
@@ -1665,7 +1665,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
           <listitem>
 	    <para>
-	      A denylist device rule
+	      An allowlist device rule
               <programlisting>
 	        lxc.cgroup2.devices.allow = a
               </programlisting>
@@ -1755,7 +1755,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
           lxc.cgroup2.devices.deny = a
         </programlisting>
 	instead then the last line will cause LXC to reset the device list and
-	switch from a allowlist program to a denylist program.
+	switch from an allowlist program to a denylist program.
       </para>
       <variablelist>
         <varlistentry>

diff --git a/src/lxc/cmd/lxc-checkconfig.in b/src/lxc/cmd/lxc-checkconfig.in
@@ -111,7 +111,8 @@ KVER_MINOR=$($CAT $CONFIG | grep '^# Linux.*Kernel Configuration' | \
 fi
 
 if [ -z "${KVER_MAJOR}" ]; then
-    echo "WARNING: Unable to detect version from configuration, assuming latest\n"
+    echo "WARNING: Unable to detect version from configuration, assuming latest"
+    echo ""
     KVER_MAJOR="100"
     KVER_MINOR="0"
 fi