From 595fd662d4c64f78af10a288d16097a8e7499a75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= Date: Tue, 16 Mar 2021 17:39:56 +0100 Subject: [PATCH 1/3] kernel-install: note that 90-loaderentry will also use /usr/lib/k/cmdline --- man/kernel-install.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/man/kernel-install.xml b/man/kernel-install.xml index 37eefe256e..e60e4ace82 100644 --- a/man/kernel-install.xml +++ b/man/kernel-install.xml @@ -184,13 +184,15 @@ + /usr/lib/kernel/cmdline /etc/kernel/cmdline /proc/cmdline Read by 90-loaderentry.install. The content of the file /etc/kernel/cmdline specifies the kernel command line to use. If that file does not - exist, /proc/cmdline is used. + exist, /usr/lib/kernel/cmdline is used. If that also does not exist, + /proc/cmdline is used. From 22a81fe49b1c42f530eb3de7e6d5c027cf7e8199 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= Date: Tue, 16 Mar 2021 17:46:33 +0100 Subject: [PATCH 2/3] kernel-install: note the default $PRETTY_NAME if os-release wasn't found and that only 90-loaderentry uses it --- man/kernel-install.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/man/kernel-install.xml b/man/kernel-install.xml index e60e4ace82..aade1c3eea 100644 --- a/man/kernel-install.xml +++ b/man/kernel-install.xml @@ -224,7 +224,9 @@ /usr/lib/os-release - The content of the file specifies the operating system title PRETTY_NAME. + Read by 90-loaderentry.install. + If available, PRETTY_NAME is read from these files and used as the title of the boot menu entry. + Otherwise, Linux KERNEL-VERSION will be used. From 2a0ad726110539f8ed2522f91f73127d0a0181ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= Date: Sun, 5 Dec 2021 16:55:47 +0100 Subject: [PATCH 3/3] kernel-install: fix MACHINE_ID extraction behaviour description --- man/kernel-install.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/man/kernel-install.xml b/man/kernel-install.xml index aade1c3eea..88208250e8 100644 --- a/man/kernel-install.xml +++ b/man/kernel-install.xml @@ -214,8 +214,9 @@ The content of this file specifies the machine identification - MACHINE-ID. If it cannot read /etc/machine-id, - kernel-install will use "Linux" as the machine ID instead. + MACHINE-ID. If $BOOT/Default exists, + or /etc/machine-id doesn't, kernel-install + will use the literal Default as the machine ID instead.