Commit 61b3e037 authored by Arnaud Ferraris's avatar Arnaud Ferraris

u-boot-update: import additional cmdline parameters

`/etc/kernel/cmdline` can be used to store additional kernel
command-line parameters that might be required for a specific target.
However, this file is ignored by `u-boot-update`, which only sources
`/etc/default/u-boot`.

This would require different processes for u-boot targets and other
ones. Therefore, having both kinds of targets using the contents of
`/etc/kernel/cmdline` would improve portability.

This commit imports the `cmdline` file and appends its contents to the
parameters found in `/etc/default/u-boot`.
Signed-off-by: Arnaud Ferraris's avatarArnaud Ferraris <arnaud.ferraris@collabora.com>
parent 24825c8c
Pipeline #107896 failed with stages
in 52 seconds
......@@ -94,6 +94,13 @@ U_BOOT_MENU_LABEL="Apertis kernel"
U_BOOT_PARAMETERS="${U_BOOT_PARAMETERS:-ro quiet}"
U_BOOT_FDT_DIR="${U_BOOT_FDT_DIR:-${_BOOT_DIRECTORY}/dtbs/}"
# Import additional kernel command-line parameters
CMDLINE_OPTS=`cat /etc/kernel/cmdline`
if [ "${CMDLINE_OPTS}" ]
then
U_BOOT_PARAMETERS="${U_BOOT_PARAMETERS} ${CMDLINE_OPTS}"
fi
# Find parameter for root from fstab
if [ -z "${U_BOOT_ROOT}" ]
then
......@@ -214,4 +221,3 @@ done
_NUMBER=""
Update "${_U_BOOT_DIRECTORY}/extlinux.conf" "${_CONFIG}"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment