mir/lxc
2
0
Fork 0
mirror of git://github.com/lxc/lxc synced 2025-08-29 16:49:53 +00:00
Code Issues Releases Wiki Activity

Merge pull request #4078 from stgraber/master

Browse Source 
lxc-checkconfig: Fix bashism
This commit is contained in:
Christian Brauner 2022-02-03 07:08:40 +01:00 committed by GitHub
commit cc07e2d6c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/lxc.container.conf.sgml.in
View File

@ -1652,7 +1652,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
<itemizedlist> <itemizedlist>
<listitem> <listitem>
<para> <para>
A allowlist device rule A denylist device rule
<programlisting> <programlisting>
lxc.cgroup2.devices.deny = a lxc.cgroup2.devices.deny = a
</programlisting> </programlisting>
@ -1665,7 +1665,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
<listitem> <listitem>
<para> <para>
A denylist device rule An allowlist device rule
<programlisting> <programlisting>
lxc.cgroup2.devices.allow = a lxc.cgroup2.devices.allow = a
</programlisting> </programlisting>
@ -1755,7 +1755,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
lxc.cgroup2.devices.deny = a lxc.cgroup2.devices.deny = a
</programlisting> </programlisting>
instead then the last line will cause LXC to reset the device list and 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> </para>
<variablelist> <variablelist>
<varlistentry> <varlistentry>

3
src/lxc/cmd/lxc-checkconfig.in
View File

@ -111,7 +111,8 @@ KVER_MINOR=$($CAT $CONFIG | grep '^# Linux.*Kernel Configuration' | \
fi fi
if [ -z "${KVER_MAJOR}" ]; then 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_MAJOR="100"
KVER_MINOR="0" KVER_MINOR="0"
fi fi