diff options
| author | Hiago De Franco <hiago.franco@toradex.com> | 2024-04-22 09:52:03 -0300 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2024-04-24 09:40:57 +0200 |
| commit | 563233bb3047429d4fb4561036a40e4a40e47d97 (patch) | |
| tree | 6e0e785f34bc5e0bb675a5fd34fd1e6db4e601bf | |
| parent | f97cd2d388e2b56aa9546d4c747a1944e3d60524 (diff) | |
The sethostname script has issues when the root filesystem is mounted
as read-only, making not possible to create or modify the /etc/hostname
file.
Therefore, this change updates the sethostname script and adds the
@@HOSTNAMECTL_OPT@@ that can further be replaced with the "--transient"
flag for hostnamectl if the system uses a read-only root FS. This flag
will change the hostname without creating the /etc/hostname file.
With this change, update recipe version from 1.0 to 1.1.
Related-to: ELB-5713
Signed-off-by: Hiago De Franco <hiago.franco@toradex.com>
(cherry picked from commit 9d2e8422f17a52e4dd7d2170c685cad2acba5550)
| -rw-r--r-- | recipes-core/set-hostname/files/sethostname | 2 | ||||
| -rw-r--r-- | recipes-core/set-hostname/set-hostname_1.1.bb (renamed from recipes-core/set-hostname/set-hostname_1.0.bb) | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/recipes-core/set-hostname/files/sethostname b/recipes-core/set-hostname/files/sethostname index 87e6320..aacb7ab 100644 --- a/recipes-core/set-hostname/files/sethostname +++ b/recipes-core/set-hostname/files/sethostname @@ -13,7 +13,7 @@ fi hostname=@@MACHINE@@"-"${serial} if [ -f /usr/bin/hostnamectl ]; then - /usr/bin/hostnamectl set-hostname ${hostname} + /usr/bin/hostnamectl set-hostname @@HOSTNAMECTL_OPT@@ ${hostname} else hostname ${hostname} fi diff --git a/recipes-core/set-hostname/set-hostname_1.0.bb b/recipes-core/set-hostname/set-hostname_1.1.bb index b39abdb..e9c3878 100644 --- a/recipes-core/set-hostname/set-hostname_1.0.bb +++ b/recipes-core/set-hostname/set-hostname_1.1.bb @@ -23,6 +23,8 @@ do_install () { install -d ${D}${bindir} install -m 0755 ${WORKDIR}/sethostname ${D}${bindir} sed -i "s/@@MACHINE@@/${MACHINE}/g" ${D}${bindir}/sethostname + sed -i "s/@@HOSTNAMECTL_OPT@@/${@bb.utils.contains('IMAGE_FEATURES','read-only-rootfs','--transient','',d)}/g" \ + ${D}${bindir}/sethostname if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}${systemd_system_unitdir} install -m 0644 ${WORKDIR}/set-hostname.service ${D}${systemd_system_unitdir} |