Skip to content

Commit d88c0a5

Browse files
committed
Merge remote-tracking branch 'origin/main' into tbazant-ai-update-deployment-jsc#SUSEAI-121
2 parents fe1ea16 + c81a6bc commit d88c0a5

5 files changed

+78
-53
lines changed

DC-Micro-zseries-deployment-pxe

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
MAIN="deployment-pxe-boot.asm.xml"
2+
SRC_DIR="articles"
3+
IMG_SRC_DIR="images"
4+
5+
STYLEROOT="/usr/share/xml/docbook/stylesheet/suse2022-ns"
6+
DOCBOOK5_RNG_URI="urn:x-suse:rng:v2:geekodoc-flat"
7+
PROFOS="slmicro"
8+
PROFARCH="zseries"
9+
PROFCONDITION="x86-64;pxe-boot;zseries"
10+

articles/deployment-pxe-boot.asm.xml

+1
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
<structure renderas="article" xml:id="deployment-pxe-boot" xml:lang="en">
8181
<merge>
8282
<title>Deploying &productname; Using Network PXE Boot</title>
83+
<subtitle arch="zseries">on &zseries;</subtitle>
8384

8485
<!-- Create revision history to enable versioning; add most recent entries at the top. -->
8586
<!-- Check https://documentation.suse.com/style/current/single-html/docu_styleguide/#sec-revhistory for detailed instructions-->

references/systemd-securing-techniques.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
<para>
9999
You can use <emphasis>resource limits</emphasis> to apply security limits on services.
100100
Two of them can disable specific operating system features:
101-
<option>RLIMIT_NPROC=1</option> disables precess forking, while
101+
<option>RLIMIT_NPROC=1</option> disables process forking, while
102102
<option>RLIMIT_FSIZE=0</option> disables creating non-empty files on the file system.
103103
</para>
104104
</listitem>

tasks/deployment-network-tftp.xml

+65-51
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,8 @@ SL-Micro.<replaceable>ARCH</replaceable>-<replaceable>VERSION</replaceable>.xz
111111
</step>
112112
<step performance="optional">
113113
<para>
114-
Create directories for the first boot configuration:
114+
Create directories for the first boot configuration:
115115

116-
for &combustion; and/or &ignition; configuration:
117116
</para>
118117
<substeps>
119118
<step>
@@ -138,15 +137,29 @@ SL-Micro.<replaceable>ARCH</replaceable>-<replaceable>VERSION</replaceable>.xz
138137
<para>
139138
Place the &combustion; and/or &ignition; configuration to corresponding directories.
140139
</para>
141-
</step>
140+
</step>
142141
<step>
143142
<para>
144-
Adjust/add the following parameters in the <filename>SL-Micro.<replaceable>ARCH</replaceable>-&productnumber;.append</filename> file:
143+
Adjust the <filename>/srv/tftpboot/grub2/grub.cfg
144+
</filename> file to include &productname;:
145145
</para>
146-
<itemizedlist>
147-
<listitem>
148-
<para>
149-
<literal>rd.kiwi.install.image</literal> &ndash; provide the path to the
146+
<screen>
147+
menuentry 'Install SUSE Linux Micro' {
148+
linux sl-micro/linux <replaceable>PARAMETERS_TO_PASS_TO_KERNEL</replaceable>
149+
initrd sl-micro/initrd
150+
}
151+
</screen>
152+
<para>
153+
The <replaceable>PARAMETERS_TO_PASS_TO_KERNEL</replaceable> are listed in the file
154+
<filename>SL-Micro.<replaceable>ARCH</replaceable>-&productnumber;.append</filename>.
155+
Their explanations follow:
156+
</para>
157+
<variablelist>
158+
<varlistentry>
159+
<term><literal>rd.kiwi.install.image</literal></term>
160+
<listitem>
161+
<para>
162+
Provide the path to the
150163
installation image
151164
<literal>SL-Micro.<replaceable>ARCH</replaceable>&productnumber;.xz</literal>. The
152165
path must include the protocol, IP address and the relative path to the installation
@@ -160,51 +173,52 @@ SL-Micro.<replaceable>ARCH</replaceable>-<replaceable>VERSION</replaceable>.xz
160173
in a service unit file attribute that defines the binary to run using the
161174
<literal>-s</literal> option.
162175
</para>
163-
164-
</listitem>
165-
<listitem>
166-
<para>
167-
<literal>rd.kiwi.oem.installdevice</literal> &ndash; enables you to perform
168-
unattended installation.
169-
</para>
170-
</listitem>
171-
<listitem>
172-
<para>
173-
<literal>rd.kiwi.install.pass.bootparam</literal> &ndash; after the image is copied
174-
to the target disk, kiwi performs a kexec. This parameter instructs kiwi that it must
175-
pass additional parameters to the kernel. For example, the below described ones.
176-
</para>
177-
</listitem>
178-
<listitem>
179-
<para>
180-
<literal>combustion.url</literal> &ndash; if needed, provide a full URL to the
181-
&combustion; script that is passed to the kernel CLI.
182-
</para>
183-
</listitem>
184-
<listitem>
176+
</listitem>
177+
</varlistentry>
178+
<varlistentry>
179+
<term><literal>rd.kiwi.oem.installdevice</literal></term>
180+
<listitem>
181+
<para>
182+
Passing this parameter enables you to perform unattended installation.
183+
</para>
184+
</listitem>
185+
</varlistentry>
186+
<varlistentry>
187+
<term><literal>rd.kiwi.install.pass.bootparam</literal></term>
188+
<listitem>
185189
<para>
186-
<literal>ignition.config.url</literal> &ndash; if needed, provide a full URL to the
187-
&ignition; configuration file that is passed to the kernel CLI. Can be used along with &combustion;.
190+
After the image is copied to the target disk, kiwi performs a kexec. This parameter instructs kiwi that it must
191+
pass additional parameters to the kernel. For example, the ones described below.
188192
</para>
189-
</listitem>
190-
<listitem arch="zseries">
191-
<para>
192-
<literal>rd.zdev=qeth,<replaceable>READ_CHANNEL</replaceable><replaceable>WRITE_CHANNEL</replaceable>:<replaceable>DATA_CHANNEL</replaceable></literal>
193-
&ndash; the attribute specifies booting from network over a network device.</para>
194-
</listitem>
195-
</itemizedlist>
196-
</step>
197-
<step>
198-
<para>
199-
Adjust the <filename>/srv/tftpboot/grub2/grub.cfg
200-
</filename> file to include &productname;:
201-
</para>
202-
<screen>
203-
menuentry 'Install SUSE Linux Micro' {
204-
linux sl-micro/linux root=/dev/ram0 <replaceable>PARAMETERS_TO_PASS_TO_KERNEL</replaceable>
205-
initrd sl-micro/initrd
206-
}
207-
</screen>
193+
</listitem>
194+
</varlistentry>
195+
<varlistentry>
196+
<term><literal>combustion.url</literal></term>
197+
<listitem>
198+
<para>
199+
If needed, provide a full URL to the
200+
&combustion; script that is passed to the kernel CLI.
201+
</para>
202+
</listitem>
203+
</varlistentry>
204+
<varlistentry>
205+
<term><literal>ignition.config.url</literal></term>
206+
<listitem>
207+
<para>
208+
If needed, provide a full URL to the
209+
&ignition; configuration file that is passed to the kernel CLI. Can be used along with &combustion;.
210+
</para>
211+
</listitem>
212+
</varlistentry>
213+
<varlistentry arch="zseries">
214+
<term><literal>rd.zdev=qeth</literal></term>
215+
<listitem>
216+
<para>
217+
The attribute specifies booting from a network over a network device. Define it as follows:</para>
218+
<screen>rd.zdev=qeth,<replaceable>READ_CHANNEL</replaceable><replaceable>WRITE_CHANNEL</replaceable>:<replaceable>DATA_CHANNEL</replaceable></screen>
219+
</listitem>
220+
</varlistentry>
221+
</variablelist>
208222
</step>
209223
</procedure>
210224
</topic>

tasks/pam-config-tool.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<procedure>
4646
<step>
4747
<formalpara>
48-
<title>Auto-generate a fresh unix-style PAM configuration.</title>
48+
<title>Auto-generate a fresh Unix-style PAM configuration.</title>
4949
<para>
5050
Let <command>pam-config</command> create the simplest possible setup
5151
which you can extend later on. The <command>pam-config

0 commit comments

Comments
 (0)