diff options
author | Marcus Schäfer <marcus.schaefer@gmail.com> | 2022-11-16 00:17:19 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-15 23:17:19 +0000 |
commit | 883e7cbfc0dba6c81338e7924419b5cbb0cba0b2 (patch) | |
tree | 62215d876263396fc493f521dbd834425c418896 /src/kernel-install | |
parent | 847dd8927ba0653ae774981ee087503fd7e85d35 (diff) | |
download | systemd-883e7cbfc0dba6c81338e7924419b5cbb0cba0b2.tar.gz |
Fix reading /etc/machine-id in kernel-install (#25388)
* Fix reading /etc/machine-id in kernel-install
The kernel-install script has code to read the contents of
/etc/machine-id into the MACHINE_ID variable. Depending
on the variable content kernel-install either logs the
value or creates a new machine id via 'systemd-id128 new'.
In that logic there is one issue. If the file /etc/machine-id
exists but is empty, the script tries to call read on an
empty file which return with an exit code != 0. As the
script code also uses 'set -e', kernel-install will exit at
this point which is unexpected.
The condition of an empty /etc/machine-id file exists for
example when building OS images, which should initialize the
system id on first boot but not staticly inside of the image.
afaik an empty /etc/machine-id is also a common approach
to make systemd indicate that it should create a new system
id. Because of this, the commit makes sure the reading of
/etc/machine-id does not fail in any case such that the
handling of the MACHINE_ID variable takes place.
Diffstat (limited to 'src/kernel-install')
-rwxr-xr-x | src/kernel-install/kernel-install.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/kernel-install/kernel-install.in b/src/kernel-install/kernel-install.in index 22eb4d2be1..bba22f8a20 100755 --- a/src/kernel-install/kernel-install.in +++ b/src/kernel-install/kernel-install.in @@ -158,7 +158,7 @@ if [ -z "$MACHINE_ID" ] && [ -f /etc/machine-info ]; then [ -n "$MACHINE_ID" ] && \ log_verbose "machine-id $MACHINE_ID acquired from /etc/machine-info" fi -if [ -z "$MACHINE_ID" ] && [ -f /etc/machine-id ]; then +if [ -z "$MACHINE_ID" ] && [ -s /etc/machine-id ]; then read -r MACHINE_ID </etc/machine-id [ -n "$MACHINE_ID" ] && \ log_verbose "machine-id $MACHINE_ID acquired from /etc/machine-id" |