Merge pull request #336 from SUSE/jhalackova_fixing-selinstall

Fixing selfinstall description
SUSE · May 20, 2024 · 72b665c · 72b665c
2 parents e4e269f + 0723428
commit 72b665c
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 27 deletions.
diff --git a/DC-Micro-deployment-raw-images b/DC-Micro-deployment-raw-images
@@ -5,5 +5,6 @@ IMG_SRC_DIR="images"
 STYLEROOT="/usr/share/xml/docbook/stylesheet/suse2022-ns"
 DOCBOOK5_RNG_URI="urn:x-suse:rng:v2:geekodoc-flat"
 PROFOS="slmicro"
-PROFCONDITION="deployment-bare-metal"
+PROFARCH="x86-64"
+PROFCONDITION="raw_image;deployment-bare-metal;x86-64"
 #STRUCTID="alp-dolomite"
diff --git a/DC-Micro-deployment-raw-images-ibmz b/DC-Micro-deployment-raw-images-ibmz
@@ -5,5 +5,5 @@ IMG_SRC_DIR="images"
 STYLEROOT="/usr/share/xml/docbook/stylesheet/suse2022-ns"
 DOCBOOK5_RNG_URI="urn:x-suse:rng:v2:geekodoc-flat"
 PROFOS="slmicro"
-PROFCONDITION="deployment-bare-metal"
+PROFCONDITION="deployment-bare-metal;zseries"
 PROFARCH="zseries"
diff --git a/DC-Micro-deployment-raw-images-virtual-machines b/DC-Micro-deployment-raw-images-virtual-machines
@@ -5,4 +5,5 @@ IMG_SRC_DIR="images"
 STYLEROOT="/usr/share/xml/docbook/stylesheet/suse2022-ns"
 DOCBOOK5_RNG_URI="urn:x-suse:rng:v2:geekodoc-flat"
 PROFOS="slmicro"
-PROFCONDITION="deployment-virtual-machine"
+PROFARCH="x86-64"
+PROFCONDITION="raw_image;deployment-bare-metal;x86-64"
diff --git a/DC-Micro-deployment-selfinstall-images b/DC-Micro-deployment-selfinstall-images
@@ -5,5 +5,6 @@ IMG_SRC_DIR="images"
 STYLEROOT="/usr/share/xml/docbook/stylesheet/suse2022-ns"
 DOCBOOK5_RNG_URI="urn:x-suse:rng:v2:geekodoc-flat"
 PROFOS="slmicro"
-#PROFCONDITION="alp-deployment-all"
+PROFARCH="x86-64"
+PROFCONDITION="x86-64"
 #STRUCTID="deployment-selfinstall-images"
diff --git a/articles/deployment-raw-images-ibm-dasd.asm.xml b/articles/deployment-raw-images-ibm-dasd.asm.xml
@@ -18,18 +18,7 @@
   <!-- resources section references all topic chunks used in the final article
     -->
   <!-- R E S O U R C E S -->
-  <!-- Glue files -->
-  <resources>
-    <resource xml:id="_glue-example" href="../glues/glue.xml">
-      <description>Glue example</description>
-    </resource>
-    <resource xml:id="_glue-more-info" href="../glues/glue-more-info.xml">
-      <description>Glue for more information</description>
-    </resource>
-    <resource xml:id="_glue-whats-next" href="../glues/glue-whats-next.xml">
-      <description>Glue what's next</description>
-    </resource>
-  </resources>
+
   <!-- Concept files -->
   <resources>
     <resource xml:id="_deployment-about-pre-built-images" href="../concepts/deployment-about-pre-built-images.xml">
@@ -68,6 +57,9 @@
     <resource xml:id="_deployment-registering-system" href="../tasks/deployment-registering-system.xml">
       <description>System registration</description>
     </resource>
+    <resource xml:id="_deployment-adding-users" href="../tasks/deployment-adding-users.xml">
+      <description>Adding users</description>
+    </resource>
   </resources>
   <!-- References -->
   <resources>
@@ -290,6 +282,7 @@
           </abstract>
         </merge>
       </module>
+      <module resourceref="_deployment-adding-users" renderas="section"/>
     </module>
     <module resourceref="_legal"/>
     <module resourceref="_gfdl">

diff --git a/articles/deployment-selfinstall-images-bare-metal.asm.xml b/articles/deployment-selfinstall-images-bare-metal.asm.xml
@@ -80,7 +80,7 @@
   <!-- S T R U C T U R E -->
   <structure renderas="article" xml:id="deployment-selfinstall-images" xml:lang="en">
     <merge>
-      <title>Deploying &productnameshort; Using an ISO image on Bare Metal</title>
+      <title>Deploying &productnameshort; Using an ISO Image</title>
       <!-- Create changelog to enable versioning; add most recent entries at the top. -->
       <revhistory xml:id="rh-deployment-raw-images">
         <revision><revnumber>1</revnumber><date>2024-01-20</date>
@@ -228,9 +228,8 @@
     <module resourceref="_deployment-preparing-configuration-device" renderas="section">
 
       <module resourceref="_configure-ignition" renderas="section">
-        <module resourceref="_ignition-configuration" renderas="section">
-          <module resourceref="_convert-yaml-to-json" renderas="section"/>
-        </module>
+        <module resourceref="_ignition-configuration" renderas="section"/>          
+
       </module>
       <module resourceref="_configure-combustion" renderas="section">
         <module resourceref="_combustion-configuration" renderas="section"/>

diff --git a/references/combustion-configuration.xml b/references/combustion-configuration.xml
@@ -167,6 +167,11 @@ echo "$(blkid -o export ${partition} | grep ^UUID=) /home btrfs defaults 0 0" >>
     </section>
     <section xml:id="combustion-adding-users">
       <title>Creating new users</title>
+      <para>
+        As some services, such as &cockpit;, require login using a non-root user, define at
+        least one unprivileged user here. Alternatively, you can create such a user from a running
+        system as described in <xref linkend="deployment-postinstall-adding-users"/>.
+      </para>
       <para>
         To add a new user account, first create a hash string that represents
         the user's password. Use the <command>openssl passwd -6</command>
@@ -329,7 +334,7 @@ cat id_rsa_new.pub >> /root/.ssh/authorized_keys
     ## Mount /var and /home so user can be created smoothly
     if [ "$CREATE_NORMAL_USER" ]
     then
-      mount /var &ap;&amp; mount /home
+      mount /var &amp;&amp; mount /home
     fi
     ## User creation
     if [ "$CREATE_NORMAL_USER" ]

diff --git a/references/ignition-configuration.xml b/references/ignition-configuration.xml
@@ -336,10 +336,13 @@
     <section xml:id="sec-ignition-users">
       <title>Users administration</title>
       <para>
-        The <literal>passwd</literal> attribute is used to add users. If you
-        intend to log in to your system, create &rootuser; and set the
-        &rootuser;'s password and/or add the SSH key to the &ignition;
-        configuration. You need to hash the &rootuser; password, for example, by
+        The <literal>passwd</literal> attribute is used to add users. As some services, such as &cockpit;, require login using a non-root user, define at
+        least one unprivileged user here. Alternatively, you can create such a user from a running
+        system as described in <xref linkend="deployment-postinstall-adding-users"/>.
+      </para>
+      <para>
+        To log in to your system, create &rootuser; and a regular user and set their
+        passwords. You need to hash the passwords, for example, by
         using the <command>openssl</command> command:
       </para>
 <screen>

diff --git a/tasks/deployment-adding-users.xml b/tasks/deployment-adding-users.xml
@@ -28,7 +28,11 @@ in the assembly -->
       </para>
     </abstract>
   </info>
-  <para>
+  <para condition="zseries">
+    This step is optional if you have defined an unprivileged user in the
+    &combustion;.
+  </para>
+  <para condition="x86-64">
     This step is optional if you have defined an unprivileged user in the &ignition; or
     &combustion;. If you deployed your system using &jeosfirstboot;, then you set up only the
     &rootuser; password and you need to create the unprivileged account manually, as described below:

diff --git a/tasks/deployment-jeos-firstboot.xml b/tasks/deployment-jeos-firstboot.xml
@@ -70,7 +70,7 @@
         </mediaobject>
       </figure>
     </step>
-    <step>
+    <step condition="raw_image">
       <para>
         For encrypted deployments, &jeosfirstboot; does the following:
       </para>