Skip to content

Commit a6150cb

Browse files
bgilbertdustymabe
authored andcommitted
coreos-liveiso-autologin-generator: drop support for Ignition < 2.3.0
RHCOS has moved to 2.x.
1 parent b4961ab commit a6150cb

File tree

1 file changed

+4
-16
lines changed

1 file changed

+4
-16
lines changed

overlay.d/05core/usr/lib/systemd/system-generators/coreos-liveiso-autologin-generator

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -101,22 +101,10 @@ fi
101101
# If the user supplied an Ignition config, they have the ability to enable
102102
# autologin themselves. Don't automatically render them insecure, since
103103
# they might be running in production and booting via e.g. IPMI.
104-
105-
# This is a hack for RHCOS Ignition which doesn't have
106-
# https://github.com/coreos/ignition/pull/958. This works because right now both
107-
# RHCOS and FCOS unconditionally bake in a base config. Once RHCOS moves to
108-
# Ignition v2, we can drop this and just leave the else block.
109-
ign_basecfg_msg=$(journalctl -q MESSAGE_ID=57124006b5c94805b77ce473e92a8aeb IGNITION_CONFIG_TYPE=base)
110-
if [ -z "${ign_basecfg_msg}" ]; then
111-
if [ -e /run/ignition.json ]; then
112-
exit 0
113-
fi
114-
else
115-
# See https://github.com/coreos/ignition/pull/958 for the MESSAGE_ID source.
116-
ign_usercfg_msg=$(journalctl -q MESSAGE_ID=57124006b5c94805b77ce473e92a8aeb IGNITION_CONFIG_TYPE=user)
117-
if [ -n "${ign_usercfg_msg}" ]; then
118-
exit 0
119-
fi
104+
# See https://github.com/coreos/ignition/pull/958 for the MESSAGE_ID source.
105+
ign_usercfg_msg=$(journalctl -q MESSAGE_ID=57124006b5c94805b77ce473e92a8aeb IGNITION_CONFIG_TYPE=user)
106+
if [ -n "${ign_usercfg_msg}" ]; then
107+
exit 0
120108
fi
121109

122110
write_dropin "getty@.service" "--noclear"

0 commit comments

Comments
 (0)