Skip to content

Commit

Permalink
packages-openshift: fix duplicate "CoreOS" in motd
Browse files Browse the repository at this point in the history
We were printing e.g. "Red Hat Enterprise Linux CoreOS CoreOS" in the
el-only variants. Fix this. See code comment for more details.
  • Loading branch information
jlebon committed Nov 29, 2024
1 parent e63f9b8 commit bda7d44
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion packages-openshift.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,13 @@ postprocess:
colloquial_name=RHCOS
project_name=OpenShift
fi
# in the el-only variants, we already have CoreOS in the NAME, so don't
# re-add it when building the node image
if [ $name != *CoreOS* ]; then
NAME=$NAME CoreOS
fi
cat > /etc/motd <<EOF
$NAME CoreOS $OSTREE_VERSION
$NAME $OSTREE_VERSION
Part of ${project_name} ${OPENSHIFT_VERSION}, ${colloquial_name} is a Kubernetes-native operating system
managed by the Machine Config Operator (\`clusteroperator/machine-config\`).
Expand Down

0 comments on commit bda7d44

Please sign in to comment.