Skip to content

Commit

Permalink
Merge branch 'maintenance/SLE15SP4' into maintenance/SLE_Micro_5.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@lvicoun
lvicoun committed Jul 1, 2024
2 parents ff2e60a + 911b039 commit af996bc
Show file tree
Hide file tree
Showing 6 changed files with 114 additions and 79 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/docbook.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
allow-build: ${{ steps.select-dc-build.outputs.allow-build }}
relevant-branches: ${{ steps.select-dc-build.outputs.relevant-branches }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Checking basic soundness of DC files
uses: openSUSE/doc-ci@gha-select-dcs
Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
matrix:
dc-files: ${{ fromJson(needs.select-dc-files.outputs.validate-list) }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Validating DC file(s) ${{ matrix.dc-files }}
uses: openSUSE/doc-ci@gha-validate
with:
Expand All @@ -68,14 +68,14 @@ jobs:
matrix:
dc-files: ${{ fromJson(needs.select-dc-files.outputs.build-list) }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Building DC file(s) ${{ matrix.dc-files }}
id: build-dc
uses: openSUSE/doc-ci@gha-build
with:
dc-files: ${{ matrix.dc-files }}
- name: Uploading builds as artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ steps.build-dc.outputs.artifact-name }}
path: ${{ steps.build-dc.outputs.artifact-dir }}/*
Expand All @@ -89,7 +89,7 @@ jobs:
continue-on-error: true
steps:
- name: Downloading all build artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
path: artifact-dir
- name: Publishing builds on susedoc.github.io
Expand Down
29 changes: 29 additions & 0 deletions xml/aarch64_inst_problem.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,35 @@
</para>
</listitem>
</itemizedlist>
<sect3 xml:id="sec-install-ipmi">
<title>Remote installation using an IPMI console</title>
<para>
When installing remotely using an IPMI console, you may face problems with the installation.
To fix the problems and install &productnameshort;, proceed as follows:
</para>
<procedure>
<step>
<para>
Press <keycap>e</keycap> during the start of the installer to enter the GRUB menu.
</para>
</step>
<step>
<para>
Replace <literal>splash=silent</literal> with <literal>ConsoleDevice=/dev/tty1</literal>.
</para>
</step>
<step>
<para>
Continue to boot with <keycombo><keycap function="control"/><keycap>x</keycap></keycombo> or <keycap>F10</keycap>. Press <keycombo><keycap function="alt"/><keycap>F1</keycap></keycombo> to launch the installer in a terminal window.
</para>
</step>
</procedure>
<para>
When installing &productnameshort; using &pxename; network boot, add the following parameter
to the kernel parameter list:
</para>
<screen>console=tty</screen>
</sect3>
</sect2>

<sect2 xml:id="sec-bootproblem-aarch64-redirect">
Expand Down
4 changes: 2 additions & 2 deletions xml/ay_erb_templates.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -404,14 +404,14 @@
<example>
<title>Configure the connected network cards</title>
<screen>&lt;interfaces t="list"&gt;
&lt;% with_link = netword_cards.sort_by { |n| n[:name] }.find { |n| n[:link] } %&gt;
&lt;% with_link = network_cards.sort_by { |n| n[:name] }.find { |n| n[:link] } %&gt;
&lt;% if with_link %&gt;
&lt;interface&gt;
&lt;device&gt;&lt;%= with_link[:device] %&gt;&lt;/device&gt;
&lt;startmode&gt;auto&lt;/startmode&gt;
&lt;bootproto&gt;dhcp&lt;/bootproto&gt;
&lt;/interface&gt;
&lt;% end &gt;
&lt;% end %&gt;
&lt;/interfaces&gt;
</screen>
</example>
Expand Down
45 changes: 16 additions & 29 deletions xml/bootconcept.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,41 +278,13 @@
when you need to regenerate an <systemitem>initramfs</systemitem>
manually:
</para>
<itemizedlist>
<listitem>
<para>
<!-- Adding Drivers Because of Hardware Changes -->
<xref xrefstyle="select:title" linkend="var-initrd-regenerate-drivers"/>
</para>
</listitem>
<listitem>
<para>
<!-- Moving System Directories to a RAID or LVM -->
<xref xrefstyle="select:title" linkend="var-initrd-regenerate-raidroot"/>
</para>
</listitem>
<listitem>
<para>
<!--
Adding Physical Volumes to a LVM Group Containg the Root File System
-->
<xref xrefstyle="select:title" linkend="var-initrd-regenerate-lvmadd"/>
</para>
</listitem>
<listitem>
<para>
<!-- Changing Kernel Variables -->
<xref xrefstyle="select:title" linkend="var-initrd-regenerate-kernelvars"/>
</para>
</listitem>
</itemizedlist>

<variablelist>
<varlistentry xml:id="var-initrd-regenerate-drivers">
<term>Adding drivers because of hardware changes</term>
<listitem>
<para>
If you need to change hardware (for example, hard disks), and this
If you need to change hardware, for example, hard disks, and this
hardware requires different drivers to be in the kernel at boot time,
you must update the <systemitem>initramfs</systemitem> file.
</para>
Expand Down Expand Up @@ -383,6 +355,21 @@
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>Adding or removing swap devices, re-creating swap area</term>
<listitem>
<para>
Whenever you add or remove a swap device, or re-create a swap area
with a different UUID, update the initramfs as
outlined in <xref linkend="pro-generate-initramfs"/>. You may also
need to update <option>GRUB_CMDLINE_*</option> variables that
include the <option>resume=</option> option in
<filename>/etc/default/grub</filename>, and then regenerate
<filename>/boot/grub2/grub.cfg</filename> as outlined in <xref
linkend="sec-grub2-cfg"/>.
</para>
</listitem>
</varlistentry>
</variablelist>

<procedure xml:id="pro-generate-initramfs">
Expand Down
10 changes: 8 additions & 2 deletions xml/deployment_images_ignition.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,7 @@
The <literal>storage</literal> attribute is used to configure
partitions, RAID, define file systems, create files, etc. To define
partitions, use the <literal>disks</literal> attribute. The
<literal>filesystem</literal> attribute is used to format partitions
and define mount points of particular partitions. The
<literal>filesystem</literal> attribute is used to format partitions. The
<literal>files</literal> attribute can be used to create files in the
file system. Each of the mentioned attributes is described in the
following sections.
Expand Down Expand Up @@ -286,6 +285,13 @@ storage:
</sect4>
<sect4 xml:id="sec-storage-filesystem">
<title>The <literal>filesystem</literal> attribute</title>
<note>
<title>&ignition; does not perform modifications to mount units</title>
<para>
The <literal>file system</literal> attribute does not modify mount units. If you add a new partition or remove an
existing partition, you must manually adjust the mount units.
</para>
</note>
<para>
<literal>filesystem</literal> must contain the following
attributes:
Expand Down
95 changes: 54 additions & 41 deletions xml/storage_filesystems.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2109,12 +2109,12 @@ The file system has the following characteristics:
</entry>
</row>
<row>
<entry>
<para>
<systemitem>ufs</systemitem>
<entry>
<para>
<systemitem>ufs</systemitem>
</para>
</entry>
<entry>
<entry>
<para>
Used by BSD, SunOS and NextStep. Only supported in read-only mode.
</para>
Expand Down Expand Up @@ -2166,36 +2166,7 @@ The file system has the following characteristics:

<screen>mount: /mnt/mx: unknown filesystem type 'minix' (hint: possibly blacklisted, see mount(8)).</screen>

<para>
To enable the mounting of the file system, you need to remove the particular
file system from the blocklist. Each blocked file system has its own
configuration file, for example, for <systemitem>efs</systemitem> it is
<filename>/lib/modules.d/60-blacklist_fs-efs.conf</filename>. However, do
not edit these files, as they are overwritten whenever the package
<literal>suse-module-tools</literal> is updated. To allow automatic mounting
of the blocked file system, you have the following options:
</para>

<itemizedlist>
<listitem>
<para>
Create a symbolic link to <filename>/dev/null</filename>, for example, for
the <emphasis>efs</emphasis> file system:
</para>
<screen>&prompt.sudo;ln -s /dev/null /etc/modules.d/60-blacklist_fs-efs.conf</screen>
</listitem>
<listitem>
<para>
Copy the configuration file to <filename>/etc/modprobe.d</filename>:
</para>
<screen>&prompt.sudo;cp /lib/modules.d/60-blacklist_fs-efs.conf /etc/modprobe.d/60-blacklist_fs-efs.conf</screen>
<para>
And comment the following statement in the configuration file:
</para>
<screen># blacklist omfs</screen>
</listitem>
</itemizedlist>


<para>
Even though a file system cannot be mounted automatically, you can load the
corresponding kernel module for the file system directly using
Expand All @@ -2213,13 +2184,55 @@ The file system has the following characteristics:
<screen>unblacklist: loading cramfs file system module
unblacklist: Do you want to un-blacklist cramfs permanently (&lt;y>es/&lt;n>o/n&lt;e>ver)? y
unblacklist: cramfs un-blacklisted by creating /etc/modprobe.d/60-blacklist_fs-cramfs.conf</screen>

<para>
If you select <emphasis>yes</emphasis>, the <command>modprobe</command>
command calls a script that creates a symbolic link from the configuration
file of the provided file system to <filename>/dev/null</filename>. Thus,
the file system is removed from the blocklist.
</para>
<para>
Here you have the following options:
</para>
<variablelist>
<varlistentry>
<term><keycap>y</keycap>es</term>
<listitem>
<para>
The module will be loaded and removed from the blacklist. Therefore, the module will be
loaded automatically in future without any other prompt.
</para>
<para>
The configuration file <filename>/etc/modprobe.d/60-blacklist_fs-${MODULE}.conf</filename> is
created. Remove the file to undo the changes you performed.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><keycap>n</keycap>o</term>
<listitem>
<para>
The module will be loaded, but it is not removed from the blacklist. Therefore, on a next
module loading
you will see the prompt above again.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><keycap>e</keycap>ver</term>
<listitem>
<para>
The module will be loaded, but autoloading is disabled even for future use, and the prompt
will no longer be displayed.
</para>
<para>
The configuration file <filename>/etc/modprobe.d/60-blacklist_fs-${MODULE}.conf</filename> is
created. Remove the file to undo the changes you performed.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><keycombo><keycap function="control"/><keycap>c</keycap></keycombo></term>
<listitem>
<para>
This option is used to interrupt the module loading.
</para>
</listitem>
</varlistentry>
</variablelist>
</sect1>
<sect1 xml:id="sec-filesystems-lfs">
<title>Large file support in Linux</title>
Expand Down

0 comments on commit af996bc

Please sign in to comment.