Changeset e4b4c5a0 for chapter10

Timestamp:

07/01/2024 06:59:19 AM (3 months ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

xry111/clfs-ng

Children:

2b63974

Parents:

fe48a03 (diff), 201aa93 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'origin/trunk' into xry111/clfs-ng

Location:

chapter10

Files:

• kernel.xml (modified) (2 diffs)
• kernel/kernel.version (modified) (1 diff)
• kernel/systemd.toml (modified) (2 diffs)
• kernel/systemd.xml (modified) (2 diffs)

chapter10/kernel.xml

@@ -56 +56 @@
         the procedures below fairly closely.  The objective is to get an
         initial system to a point where you can log in at the command line when
-        you reboot later in <xref linkend="ch-finish-reboot"/>.  At this point
-        optimization and customization is not a goal.
+        you reboot later in <xref linkend="ch-finish-reboot" role='.'/>
+        At this point optimization and customization is not a goal.
       </para>
 
@@ -88 +88 @@
 
     <para>There are several ways to configure the kernel options. Usually,
-    This is done through a menu-driven interface, for example:</para>
+    this is done through a menu-driven interface, for example:</para>
 
 <screen role="nodump"><userinput>make menuconfig</userinput></screen>

chapter10/kernel/kernel.version

@@ -1 @@
-6.7.1
+6.8.9

chapter10/kernel/systemd.toml

@@ -15 +15 @@
 DEVTMPFS_MOUNT='*'
 DRM=' *M'
-AUDIT=' '
 NET='*'
 INET='*'
@@ -25 +24 @@
 TMPFS='*'
 TMPFS_POSIX_ACL='*'
+CGROUP_SCHED='* '
+
+[RT_GROUP_SCHED]
+value = ' '
+comment = 'This may cause some systemd features malfunction'
 
 revision='systemd'

chapter10/kernel/systemd.xml

@@ -4 +4 @@
 <!-- Automatically generated by kernel-config.py
      DO NOT EDIT! -->
-<screen role="nodump" revision="systemd"><emphasis role='blue'>G</emphasis>eneral setup ---&gt;
+<screen role="nodump"><emphasis role='blue'>G</emphasis>eneral setup ---&gt;
   [ ] <emphasis role='blue'>C</emphasis>ompile the kernel with warnings as errors                        [WERROR]
-  [ ] <emphasis role='blue'>A</emphasis>uditing support                                                   [AUDIT]
   <emphasis role='blue'>C</emphasis>PU/Task time and stats accounting ---&gt;
     [*] <emphasis role='blue'>P</emphasis>ressure stall information tracking                                [PSI]
@@ -13 +12 @@
   &lt; &gt; <emphasis role='blue'>E</emphasis>nable kernel headers through /sys/kernel/kheaders.tar.xz      [IKHEADERS]
   [*] <emphasis role='blue'>C</emphasis>ontrol Group support ---&gt;                                       [CGROUPS]
-    [*] M<emphasis role='blue'>e</emphasis>mory controller                                                [MEMCG]
+    [*]   M<emphasis role='blue'>e</emphasis>mory controller                                              [MEMCG]
+    [ /*] <emphasis role='blue'>C</emphasis>PU controller ---&gt;                                     [CGROUP_SCHED]
+      # This may cause some systemd features malfunction:
+      [ ] <emphasis role='blue'>G</emphasis>roup scheduling for SCHED_RR/FIFO                    [RT_GROUP_SCHED]
   [ ] <emphasis role='blue'>C</emphasis>onfigure standard kernel features (expert users) ---&gt;            [EXPERT]