diff --git a/docs/en/server/administration/administrator/basic_configuration.md b/docs/en/server/administration/administrator/basic_configuration.md index 37ce10de6508363bf8a5506b9bbd306ce11d4d33..ba16c73de06a9088cc4aab9930b8519f88cd7a54 100644 --- a/docs/en/server/administration/administrator/basic_configuration.md +++ b/docs/en/server/administration/administrator/basic_configuration.md @@ -12,7 +12,7 @@ To display the current locale status, run the following command: localectl status ``` -Example command output: +For example, to display the current system settings, the command and output are as follows: ```shell $ localectl status @@ -29,7 +29,7 @@ To display available locales, run the following command: localectl list-locales ``` -You can check that by listing all Chinese locales with the following command: +For example, to display all available Chinese environments in the current system, the command and output are as follows: ```shell $ localectl list-locales | grep zh @@ -51,7 +51,7 @@ localectl set-locale LANG=zh_CN.UTF-8 ``` > [!NOTE]NOTE -> After the modification, log in again or run the command `source /etc/locale.conf` as the user **root** to update the configuration file for the modification to take effect: +> After the modification, log in again or run the command `source /etc/locale.conf` as the user **root** to update the configuration file for the modification to take effect. ## Setting the Keyboard Layout @@ -65,7 +65,7 @@ To display the current keyboard layout settings, run the following command: localectl status ``` -Example command output: +For example, to display the current system settings, the command and output are as follows: ```shell $ localectl status @@ -122,7 +122,7 @@ To display the current date and time, run the following command: timedatectl ``` -Example command output: +For example, to display the current system settings, the command and output are as follows: ```shell $ timedatectl @@ -347,7 +347,7 @@ To display the current RTC date and time, run the following command as the user hwclock ``` -Example command output: +For example, to display the current system settings, the command and output are as follows: ```shell $ hwclock diff --git a/docs/en/server/development/gcc/kernel_fdo_user_guide.md b/docs/en/server/development/gcc/kernel_fdo_user_guide.md index 02c9ec2b151b0e06e05168bd6de78374be9acfd8..d957f61392966ea02d46ec9ad5517d42833e4922 100644 --- a/docs/en/server/development/gcc/kernel_fdo_user_guide.md +++ b/docs/en/server/development/gcc/kernel_fdo_user_guide.md @@ -8,7 +8,7 @@ The feedback-directed optimization (FDO) of the kernel allows users to build opt ### Software Requirements -* OS: openEuler 23.09 +* OS: openEuler 24.03 LTS SP1 ### Hardware Requirements diff --git a/docs/en/server/installation_upgrade/installation/installation_guide.md b/docs/en/server/installation_upgrade/installation/installation_guide.md index cf490be6c2d968925c26d4c99d9d025cc3fcabad..0cd83efea92de0e0bd3effda477d47632e8e43af 100644 --- a/docs/en/server/installation_upgrade/installation/installation_guide.md +++ b/docs/en/server/installation_upgrade/installation/installation_guide.md @@ -79,7 +79,7 @@ If you want to exit the installation, click **Exit**. The message **Are you sure After the installation program starts, the installation page is displayed, as shown in the following figure. On the page, you can configure the time, language, installation source, network, and storage device. -Some configuration items are matched with safety symbols. A safety symbol will disappear after the item is configured. Start the installation only when all the safety symbols disappear from the page. +Some configuration items are matched with alarm symbols. A safety symbol will disappear after the item is configured. Start the installation only when all the alarm symbols disappear from the page. If you want to exit the installation, click **Exit**. The message **Are you sure you want to exit the installation program?** is displayed. Click **Yes** in the dialog box to go back to the installation wizard page. @@ -111,7 +111,7 @@ On the **INSTALLATION SUMMARY** page, click **LANGUAGE SUPPORT** to set the sys After the setting is complete, click **Done** in the upper left corner to go back to the **INSTALLATION SUMMARY** page. -## Setting Date and Time +## Setting Time and Date On the **INSTALLATION SUMMARY** page, click **TIME & DATE**. On the **TIME & DATE** page, set the system time zone, date, and time. @@ -132,7 +132,7 @@ After the setting is complete, click **Done** in the upper left corner to go bac ## Setting the Installation Source -On the **INSTALLATION SUMMARY** page, click **INSTALLATION SOURCE** to locate the installation source. +Select **INSTALLATION SOURCE** on the **INSTALLATION SUMMARY** screen to specify the location of the installation source. - When you use a complete CD/DVD-ROM for installation, the installation program automatically detects and displays the installation source information. You can use the default settings, as shown in the following figure. @@ -233,7 +233,7 @@ If you need to manually partition the disk, click **Custom** and click **Done** On the **MANUAL PARTITIONING** page, you can partition the disk in either of the following ways. After the partitioning is completed, the window shown in the following figure is displayed. -- Automatic creation: Click **Click here to create them automatically**. The system automatically assigns four mount points according to the available storage space: **/boot**, **/**, **/home**, **/boot/efi**, and **swap**. +- Automatic creation: Click **Click here to create them automatically**. The system automatically assigns five mount points according to the available storage space: **/boot**, **/**, **/home**, **/boot/efi**, and **swap**. - Manual creation: Click ![](./figures/zh-cn_image_0229291243.png) to add a mount point. It is recommended that the expected capacity of each mount point not exceed the available space.It is recommended that the expected capacity of each mount point not exceed the available space. diff --git a/docs/en/server/installation_upgrade/installation/installation_preparations.md b/docs/en/server/installation_upgrade/installation/installation_preparations.md index bdf886b5662004278f4330591f18aae4c7a14c9b..d7f84ab5359797a14b95859fe6f13b9cd361bd43 100644 --- a/docs/en/server/installation_upgrade/installation/installation_preparations.md +++ b/docs/en/server/installation_upgrade/installation/installation_preparations.md @@ -98,7 +98,7 @@ You need to take hardware compatibility into account during openEuler installati ## Installation Requirements for VMs -To install the openEuler OS on a VM, the PM must meet the following requirements. +To install the openEuler OS on a VM, the VM must meet the following requirements. ### Virtualization Platform Compatibility diff --git a/docs/en/server/installation_upgrade/installation/using_kickstart_for_automatic_installation.md b/docs/en/server/installation_upgrade/installation/using_kickstart_for_automatic_installation.md index e727d21bc3156d85d8831d08e32d6e1c30a6754f..524005b2c0d378f3773f4c05eef06a9ae5df5fc5 100644 --- a/docs/en/server/installation_upgrade/installation/using_kickstart_for_automatic_installation.md +++ b/docs/en/server/installation_upgrade/installation/using_kickstart_for_automatic_installation.md @@ -9,11 +9,11 @@ You can use the kickstart tool to automatically install the openEuler OS in eith - Semi-automatic installation: You only need to specify the location of the kickstart file. Kickstart automatically configures OS attributes such as keyboard, language, and partitions. - Automatic installation: The OS is automatically installed. -### Advantages and Disadvantages +### Comparison of advantages and disadvantages [Table 1](#table1388812373315) lists the advantages and disadvantages of semi-automatic installation and full-automatic installation using kickstart. You can select an installation mode as required. -**Table 1** Advantages and disadvantages +**Table 1** Comparison of advantages and disadvantages

Installation Mode

diff --git a/docs/en/server/maintenance/kernel_live_upgrade/installation_and_deployment.md b/docs/en/server/maintenance/kernel_live_upgrade/installation_and_deployment.md index c00c6fdfa89afd997555772c782a7bb584934462..5137056534096e6a5f3aa4bfc03ce56bca6bc545 100644 --- a/docs/en/server/maintenance/kernel_live_upgrade/installation_and_deployment.md +++ b/docs/en/server/maintenance/kernel_live_upgrade/installation_and_deployment.md @@ -161,6 +161,6 @@ After the installation is successful, you can run the systemd commands to operat - View the NVWA logs. - service nvwa status + systemctl status nvwa - For more usage, see the usage of systemd. diff --git a/docs/zh/cloud/container_engine/docker_engine/installation_and_configuration_3.md b/docs/zh/cloud/container_engine/docker_engine/installation_and_configuration_3.md index 0274ee3f4b59236dfa66ce7280346c256f1cc547..ef7014f547d67d5b95d8d82003d66f06d7fb5b63 100644 --- a/docs/zh/cloud/container_engine/docker_engine/installation_and_configuration_3.md +++ b/docs/zh/cloud/container_engine/docker_engine/installation_and_configuration_3.md @@ -292,7 +292,7 @@ docker rm: Error response from daemon: driver "overlay2" failed to remove root f #### 注意事项 -- 使用devicemapper必须使用devicemapper+direct-lvm的方式 +- 使用devicemapper必须使用devicemapper+direct-lvm的方式。 - 配置devicemapper时，如果系统上没有足够的空间给thinpool做自动扩容，请禁止自动扩容功能。 - 禁止把/etc/lvm/profile/docker-thinpool.profile中如下两个值都改成100。 diff --git a/docs/zh/server/administration/administrator/user_and_user_group_management.md b/docs/zh/server/administration/administrator/user_and_user_group_management.md index 14c45939e940610614034f5a65891b699f720a1d..9220e4159f964ed256498d830ca92fd5bf09ac56 100644 --- a/docs/zh/server/administration/administrator/user_and_user_group_management.md +++ b/docs/zh/server/administration/administrator/user_and_user_group_management.md @@ -42,7 +42,7 @@ useradd [options] username ```shell # id userexample -uid=502(userexample) gid=502(userexample) groups=502(userexample) +uid=1001(userexample) gid=1001(userexample) groups=1001(userexample) ``` 修改用户userexample的密码： @@ -88,7 +88,7 @@ passwd: all authentication tokens updated successfully. ``` >![](./public_sys-resources/icon-note.gif) **说明：** ->若打印信息中出现“BAD PASSWORD: The password fails the dictionary check - it is too simplistic/sytematic”，表示设置的密码过于简单，建议设置复杂度较高的密码。 +>若打印信息中出现“BAD PASSWORD: The password fails the dictionary check - it is too simplistic/systematic”，表示设置的密码过于简单，建议设置复杂度较高的密码。 ### 修改用户帐号 diff --git a/docs/zh/server/development/gcc/kernel_fdo_user_guide.md b/docs/zh/server/development/gcc/kernel_fdo_user_guide.md index 439dfc86813a151ede9f637cc6d66e26d6e7e937..847e7c21d396fd249f60d08361a4e1cb0c5e064a 100644 --- a/docs/zh/server/development/gcc/kernel_fdo_user_guide.md +++ b/docs/zh/server/development/gcc/kernel_fdo_user_guide.md @@ -8,7 +8,7 @@ ### 软件要求 -* 操作系统：openEuler 23.09 +* 操作系统：openEuler 24.03 LTS SP1 ### 硬件要求 diff --git a/docs/zh/server/installation_upgrade/installation/using_kickstart_for_automatic_installation.md b/docs/zh/server/installation_upgrade/installation/using_kickstart_for_automatic_installation.md index 0c3bf3072c65066e1719a23d137508968156a156..8542c1fd10307d22558aef7ce13822e94fcd0c30 100644 --- a/docs/zh/server/installation_upgrade/installation/using_kickstart_for_automatic_installation.md +++ b/docs/zh/server/installation_upgrade/installation/using_kickstart_for_automatic_installation.md @@ -82,7 +82,7 @@ TFTP（Trivial File Transfer Protocol，简单文件传输协议），该协议 1. httpd的安装与服务启动。 - ``` + ```shell # dnf install httpd -y # systemctl start httpd # systemctl enable httpd @@ -90,7 +90,7 @@ TFTP（Trivial File Transfer Protocol，简单文件传输协议），该协议 2. kickstart文件的准备。 - ``` + ```shell # mkdir /var/www/html/ks # vim /var/www/html/ks/openEuler-ks.cfg ===>根据已安装openEuler系统自动生成的anaconda-ks.cfg修改得到 ==================================== @@ -145,7 +145,7 @@ TFTP（Trivial File Transfer Protocol，简单文件传输协议），该协议 >![](./public_sys-resources/icon-note.gif) **说明：** >密码密文生成方式： > - >``` + >```shell ># python3 >Python 3.7.0 (default, Apr 1 2019, 00:00:00) >[GCC 7.3.0] on linux @@ -163,7 +163,7 @@ TFTP（Trivial File Transfer Protocol，简单文件传输协议），该协议 **安装系统** 1. 启动系统进入安装选择界面。 - 1. 在“[启动安装](./安装指导.html#启动安装)”中的“安装引导界面”中选择“Install openEuler {version}”，并按下“e”键。 + 1. 在“[启动安装](./installation_guide.md#启动安装)”中的“安装引导界面”中选择“Install openEuler {version}”，并按下“e”键。 2. 启动参数中追加“inst.ks= ip/ks/openEuler-ks.cfg”。 ![](./figures/startparam.png) @@ -203,7 +203,7 @@ TFTP（Trivial File Transfer Protocol，简单文件传输协议），该协议 1. httpd的安装与服务启动。 - ``` + ```shell # dnf install httpd -y # systemctl start httpd # systemctl enable httpd @@ -211,7 +211,7 @@ TFTP（Trivial File Transfer Protocol，简单文件传输协议），该协议 2. tftp的安装与配置。 - ``` + ```shell # dnf install tftp-server -y # vim /etc/xinetd.d/tftp service tftp @@ -236,14 +236,14 @@ TFTP（Trivial File Transfer Protocol，简单文件传输协议），该协议 3. 安装源的制作。 - ``` + ```shell # mount openEuler-{version}-aarch64-dvd.iso /mnt # cp -r /mnt/* /var/www/html/openEuler/ ``` 4. 设置和修改kickstart配置文件 openEuler-ks.cfg，参考[3](#zh-cn_topic_0151920754_l1692f6b9284e493683ffa2ef804bc7ca)安装源的目录，此处选择http安装源。 - ``` + ```shell #vim /var/www/html/ks/openEuler-ks.cfg ==================================== ***以下内容根据实际需求进行修改*** @@ -269,7 +269,7 @@ TFTP（Trivial File Transfer Protocol，简单文件传输协议），该协议 5. 修改pxe配置文件grub.cfg， 可参考如下内容(注意：openEuler当前不支持bls格式的cfg文件)。 - ``` + ```shell # cp -r /mnt/images/pxeboot/* /var/lib/tftpboot/ # cp /mnt/EFI/BOOT/grubaa64.efi /var/lib/tftpboot/ # cp /mnt/EFI/BOOT/grub.cfg /var/lib/tftpboot/ @@ -311,7 +311,7 @@ TFTP（Trivial File Transfer Protocol，简单文件传输协议），该协议 6. DHCP的配置（可以使用dnsmasq代替 ）。 - ``` + ```shell # dnf install dhcp -y # # DHCP Server Configuration file. diff --git a/docs/zh/server/maintenance/kernel_live_upgrade/installation_and_deployment.md b/docs/zh/server/maintenance/kernel_live_upgrade/installation_and_deployment.md index 26a955630831414e1c414f219cb8ff2a77ffe351..89af9f46b34051862e744857e619b80b986e1d04 100644 --- a/docs/zh/server/maintenance/kernel_live_upgrade/installation_and_deployment.md +++ b/docs/zh/server/maintenance/kernel_live_upgrade/installation_and_deployment.md @@ -77,23 +77,23 @@ 该配置文件用于指导内核热升级工具在内核热升级过程中如何保存和恢复现场，具体配置如下: - + pids + - pids pids用于指明nvwa热升级过程中需要保留和恢复的进程，此处的进程通过进程号(pid)进行标识，需要注意的是，nvwa管理的进程在nvwa服务启动后，会被自动恢复。 - + services + - services services用于指明nvwa热升级过程中需要保留和恢复的服务。与pids的区别在于，内核热升级工具可以直接保存和恢复进程的状态，对于服务，内核热升级工具则需要依赖systemd进行相关操作。此处的服务名称，应该使用systemd中使用的服务名称。需要注意的是，对于nvwa管理的服务，是否要在nvwa启动时自动恢复，取决于systemd中有没有使能该服务，且当前支持的服务类型只有notify和oneshot。 - + restore_net + - restore_net restore_net用于指明是否需要内核热升级工具保存和恢复网络配置，如果网络配置有误，有可能导致恢复后网络不可用，默认关闭。 - + enable_quick_kexec + - enable_quick_kexec enable_quick_kexec用于指明是否需要使能quick kexec特性，quick kexec是nvwa社区推出的，加速内核重启过程的一个特性。使用该特性，需要在cmdline中，加入"quickkexec=128M"。128指分配给quick kexec特性的内存大小，该内存将用于在升级过程中加载kernel和initramfs，因此大小需要大于升级过程中涉及到的kernel，initramfs大小之和。该特性默认关闭。 - + enable_pin_memory + - enable_pin_memory enable_pin_memory用于指明是否需要使能pin memory特性，pin memory是nvwa社区推出的，加速进程保存恢复过程的一个特性。pin_memory特性暂不支持多进程应用备份恢复，使用该特性，需要在cmdline中，加入"max_pin_pid_num=10 redirect_space_size=2M pinmemory=200M@0x640000000"。 @@ -115,23 +115,23 @@ enable_pin_memory: true 该文件包含了内核热升级工具运行过程中，需要使用到的配置信息，具体如下： - + criu_dir + - criu_dir 用于指明内核热升级工具在保存现场过程中，存储产生的信息文件夹路径。需要注意的是，这些信息可能会占用较大的磁盘空间。 - + criu_exe + - criu_exe 用于指明内核热升级工具使用的criu可执行文件路径，除非是对criu进行调测，一般不建议修改。 - + kexec_exe + - kexec_exe 用于指明内核热升级工具使用的kexec可执行文件路径，除非是对kexec进行调测，一般不建议修改。 - + systemd_etc + - systemd_etc 用于指明覆盖systemd配置过程中，使用到的文件夹路径。该路径由systemd决定，一般不需要修改。 - + log_dir + - log_dir 存放内核热升级工具产生的log信息，log模块当前未启用。内核热升级工具日志信息的查看，参考其他章节\<使用方法> @@ -151,16 +151,16 @@ log_dir: /etc/nvwa/log/ 安装成功后，可以通过systemd的相关命令来操作内核热升级工具 -+ 使能nvwa +- 使能nvwa systemctl enable nvwa -+ 启动nvwa +- 启动nvwa systemctl start nvwa -+ 查看nvwa日志 +- 查看nvwa日志 - service nvwa status + systemctl status nvwa -+ 更多用法参考systemd用法 +- 更多用法参考systemd用法