Changeset 2882861 for chapter10


Ignore:
Timestamp:
08/08/2023 03:16:54 AM (13 months ago)
Author:
Xi Ruoyao <xry111@…>
Branches:
xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1
Children:
8a243b5e
Parents:
428ca6c (diff), 9cca53d (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/loongarch

Location:
chapter10
Files:
15 added
3 edited

Legend:

Unmodified
Added
Removed

  • chapter10/fstab.xml

    r428ca6c r2882861  
    2323<literal># Begin /etc/fstab
    2424
    25 # file system  mount-point  type     options             dump  fsck
    26 #                                                              order
     25# file system  mount-point    type     options             dump  fsck
     26#                                                                order
    2727
    28 /dev/<replaceable>&lt;xxx&gt;</replaceable>     /            <replaceable>&lt;fff&gt;</replaceable>    defaults            1     1
    29 /dev/<replaceable>&lt;yyy&gt;</replaceable>     swap         swap     pri=1               0     0
    30 proc           /proc        proc     nosuid,noexec,nodev 0     0
    31 sysfs          /sys         sysfs    nosuid,noexec,nodev 0     0
    32 devpts         /dev/pts     devpts   gid=5,mode=620      0     0
    33 tmpfs          /run         tmpfs    defaults            0     0
    34 devtmpfs       /dev         devtmpfs mode=0755,nosuid    0     0
    35 tmpfs          /dev/shm     tmpfs    nosuid,nodev        0     0
     28/dev/<replaceable>&lt;xxx&gt;</replaceable>     /              <replaceable>&lt;fff&gt;</replaceable>    defaults            1     1
     29/dev/<replaceable>&lt;yyy&gt;</replaceable>     swap           swap     pri=1               0     0
     30proc           /proc          proc     nosuid,noexec,nodev 0     0
     31sysfs          /sys           sysfs    nosuid,noexec,nodev 0     0
     32devpts         /dev/pts       devpts   gid=5,mode=620      0     0
     33tmpfs          /run           tmpfs    defaults            0     0
     34devtmpfs       /dev           devtmpfs mode=0755,nosuid    0     0
     35tmpfs          /dev/shm       tmpfs    nosuid,nodev        0     0
     36cgroup2        /sys/fs/cgroup cgroup2  nosuid,noexec,nodev 0     0
    3637
    3738# End /etc/fstab</literal>

  • chapter10/grub.xml

    r428ca6c r2882861  
    211211set timeout=5
    212212
     213insmod part_gpt
    213214insmod ext2
    214215set root=(hd0,2)

  • chapter10/kernel.xml

    r428ca6c r2882861  
    131131      not work correctly or boot at all:</para>
    132132
    133       <screen role="nodump" revision="sysv">Processor type and features ---&gt;
    134    [*] Build a relocatable kernel [CONFIG_RELOCATABLE]
    135    [*]   Randomize the address of the kernel image (KASLR) [CONFIG_RANDOMIZE_BASE]
    136 General setup ---&gt;
    137    [ ] Compile the kernel with warnings as errors [CONFIG_WERROR]
    138    &lt; &gt; Enable kernel headers through /sys/kernel/kheaders.tar.xz [CONFIG_IKHEADERS]
    139    [ ] Configure standard kernel features (expert users) [CONFIG_EXPERT]
    140 General architecture-dependent options  ---&gt;
    141    [*] Stack Protector buffer overflow detection [CONFIG_STACKPROTECTOR]
    142    [*]   Strong Stack Protector [CONFIG_STACKPROTECTOR_STRONG]
    143 Device Drivers  ---&gt;
    144   Firmware Drivers   ---&gt;
    145    EFI (Extensible Firmware Interface) Support  ---&gt;
    146      [*] Enable the generic EFI decompressor [CONFIG_EFI_ZBOOT]
    147   Graphics support ---&gt;
    148    Frame buffer Devices ---&gt;
    149       &lt;*&gt; Support for frame buffer devices ---&gt;
    150    Console display driver support ---&gt;
    151       [*] Framebuffer Console support [CONFIG_FRAMEBUFFER_CONSOLE]
    152   Generic Driver Options  ---&gt;
    153    [ ] Support for uevent helper [CONFIG_UEVENT_HELPER]
    154    [*] Maintain a devtmpfs filesystem to mount at /dev [CONFIG_DEVTMPFS]
    155    [*]   Automount devtmpfs at /dev, after the kernel mounted the rootfs [CONFIG_DEVTMPFS_MOUNT]</screen>
    156 
    157       <screen role="nodump" revision="systemd">Processor type and features ---&gt;
    158    [*] Build a relocatable kernel [CONFIG_RELOCATABLE]
    159    [*]   Randomize the address of the kernel image (KASLR) [CONFIG_RANDOMIZE_BASE]
    160 General setup ---&gt;
    161    [ ] Compile the kernel with warnings as errors [CONFIG_WERROR]
    162    [ ] Auditing Support [CONFIG_AUDIT]
    163    CPU/Task time and stats accounting ---&gt;
    164       [*] Pressure stall information tracking [CONFIG_PSI]
    165       [ ]   Require boot parameter to enable pressure stall information tracking [CONFIG_PSI_DEFAULT_DISABLED]
    166    &lt; &gt; Enable kernel headers through /sys/kernel/kheaders.tar.xz [CONFIG_IKHEADERS]
    167    [*] Control Group support [CONFIG_CGROUPS]   ---&gt;
    168       [*] Memory controller [CONFIG_MEMCG]
    169    [ ] Configure standard kernel features (expert users) [CONFIG_EXPERT]
    170 General architecture-dependent options  ---&gt;
    171    [*] Enable seccomp to safely compute untrusted bytecode [CONFIG_SECCOMP]
    172    [*] Stack Protector buffer overflow detection [CONFIG_STACKPROTECTOR]
    173    [*]   Strong Stack Protector [CONFIG_STACKPROTECTOR_STRONG]
    174 [*] Networking support  ---&gt;   [CONFIG_NET]
    175    Networking options  ---&gt;
    176       [*] TCP/IP networking [CONFIG_INET]
    177       &lt;*&gt;   The IPv6 protocol [CONFIG_IPV6]
    178 Device Drivers  ---&gt;
    179    Generic Driver Options  ---&gt;
    180       [ ] Support for uevent helper [CONFIG_UEVENT_HELPER]
    181       [*] Maintain a devtmpfs filesystem to mount at /dev [CONFIG_DEVTMPFS]
    182       [*]   Automount devtmpfs at /dev, after the kernel mounted the rootfs [CONFIG_DEVTMPFS_MOUNT]
    183       Firmware Loader ---&gt;
    184          [ ] Enable the firmware sysfs fallback mechanism [CONFIG_FW_LOADER_USER_HELPER]
    185    Firmware Drivers   ---&gt;
    186       [*] Export DMI identification via sysfs to userspace [CONFIG_DMIID]
    187       EFI (Extensible Firmware Interface) Support  ---&gt;
    188          [*] Enable the generic EFI decompressor [CONFIG_EFI_ZBOOT]
    189    Graphics support ---&gt;
    190       Frame buffer Devices ---&gt;
    191          &lt;*&gt; Support for frame buffer devices ---&gt;
    192       Console display driver support ---&gt;
    193          [*] Framebuffer Console support [CONFIG_FRAMEBUFFER_CONSOLE]
    194 File systems  ---&gt;
    195    [*] Inotify support for userspace [CONFIG_INOTIFY_USER]
    196        Pseudo filesystems  ---&gt;
    197         [*] Tmpfs POSIX Access Control Lists [CONFIG_TMPFS_POSIX_ACL]</screen>
     133      <!-- To editors: for updating kernel configuration, edit
     134           kernel/*.toml and regenerate kernel/*.xml with
     135           "make -C kernel KERNEL_TREE=</usr/src/linux-&linux-version> -->
     136
     137      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     138        href="kernel/sysv.xml"/>
     139
     140      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     141        href="kernel/systemd.xml"/>
    198142
    199143      <para>If the partition for the LFS system is in a NVME SSD (i. e. the
    … …  
    202146      the LFS system won't boot:</para>
    203147
    204       <screen role="nodump">Device Drivers ---&gt;
    205   NVME Support ---&gt;
    206     &lt;*&gt; NVM Express block device [CONFIG_BLK_DEV_NVME]</screen>
     148      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     149        href="kernel/nvme.xml"/>
    207150    </note>
    208151
Note: See TracChangeset for help on using the changeset viewer.