Also, do other initramfs-related edits, while we are here Signed-off-by: Askar Safin <safinaskar@xxxxxxxxx> --- .../admin-guide/kernel-parameters.rst | 4 ++-- .../admin-guide/kernel-parameters.txt | 20 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.rst b/Documentation/admin-guide/kernel-parameters.rst index 39d0e7ff0965..22af6bbffc35 100644 --- a/Documentation/admin-guide/kernel-parameters.rst +++ b/Documentation/admin-guide/kernel-parameters.rst @@ -123,7 +123,7 @@ is applicable:: CMA Contiguous Memory Area support is enabled. DRM Direct Rendering Management support is enabled. DYNAMIC_DEBUG Build in debug messages and enable them at runtime - EARLY Parameter processed too early to be embedded in initrd. + EARLY Parameter processed too early to be embedded in initramfs. EDD BIOS Enhanced Disk Drive Services (EDD) is enabled EFI EFI Partitioning (GPT) is enabled EVM Extended Verification Module @@ -134,6 +134,7 @@ is applicable:: HW Appropriate hardware is enabled. HYPER_V HYPERV support is enabled. IMA Integrity measurement architecture is enabled. + INITRAMFS Initramfs support is enabled. IP_PNP IP DHCP, BOOTP, or RARP is enabled. IPV6 IPv6 support is enabled. ISAPNP ISA PnP code is enabled. @@ -167,7 +168,6 @@ is applicable:: PPT Parallel port support is enabled. PS2 Appropriate PS/2 support is enabled. PV_OPS A paravirtualized kernel is enabled. - RAM RAM disk support is enabled. RDT Intel Resource Director Technology. RISCV RISCV architecture is enabled. S390 S390 architecture is enabled. diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 0805d3ebc75a..8e10abac4cc7 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -565,7 +565,7 @@ Format: integer bootconfig [KNL,EARLY] - Extended command line options can be added to an initrd + Extended command line options can be added to an initramfs and this will cause the kernel to look for it. See Documentation/admin-guide/bootconfig.rst @@ -1005,7 +1005,7 @@ may be missing from the dump. A standard crashkernel reservation, as described above, - is still needed to hold the crash kernel and initrd. + is still needed to hold the crash kernel and initramfs. This option increases the risk of a kdump failure: DMA transfers configured by the first kernel may end up @@ -2298,7 +2298,7 @@ initcall functions. Useful for debugging built-in modules and initcalls. - initramfs_async= [KNL] + initramfs_async= [INITRAMFS,KNL] Format: <bool> Default: 1 This parameter controls whether the initramfs @@ -2310,10 +2310,10 @@ unpacking being completed before device_ and late_ initcalls. - initrd= [BOOT,EARLY] Specify the location of the initial ramdisk + initrd= [BOOT,EARLY,INITRAMFS,KNL] Same as initrdmem= - initrdmem= [KNL,EARLY] Specify a physical address and size from which to - load the initrd. If an initrd is compiled in or + initrdmem= [BOOT,EARLY,INITRAMFS,KNL] Specify a physical address and size from which to + load initramfs. If initramfs is compiled in or specified in the bootparams, it takes priority over this setting. Format: ss[KMG],nn[KMG] @@ -2749,7 +2749,7 @@ between unregistering the boot console and initializing the real console. - keepinitrd [HW,ARM] See retain_initrd. + keepinitrd [HW,ARM,INITRAMFS] See retain_initrd. kernelcore= [KNL,X86,PPC,EARLY] Format: nn[KMGTPE] | nn% | "mirror" @@ -6129,8 +6129,8 @@ rdinit= [KNL] Format: <full_path> - Run specified binary instead of /init from the ramdisk, - used for early userspace startup. See initrd. + Run specified binary instead of /init from initramfs, + used for early userspace startup. rdrand= [X86,EARLY] force - Override the decision by the kernel to hide the @@ -6324,7 +6324,7 @@ Useful for devices that are detected asynchronously (e.g. USB and MMC devices). - retain_initrd [RAM] Keep initrd memory after extraction. After boot, it will + retain_initrd [INITRAMFS] Keep initramfs memory after extraction. After boot, it will be accessible via /sys/firmware/initrd. retbleed= [X86] Control mitigation of RETBleed (Arbitrary -- 2.47.2
