Skip to content

Commit 0a13c5e

Browse files
committed
flatcar-postinst: Remove old locksmithd workaround
The old workaround to restart locksmithd isn't needed since a long time. Remove the old locksmithd workaround.
1 parent 3883984 commit 0a13c5e

File tree

1 file changed

+0
-19
lines changed

1 file changed

+0
-19
lines changed

flatcar-postinst

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -100,25 +100,6 @@ if [[ -x "${OEM_MNT}/bin/oem-postinst" ]]; then
100100
"${OEM_MNT}/bin/oem-postinst" "${SLOT}" "${INSTALL_MNT}"
101101
fi
102102

103-
# locksmith 0.1.5 is broken, restart it lots to work around the issue
104-
if systemctl is-active --quiet locksmithd.service && \
105-
locksmithctl help | grep -A1 '^VERSION:' | grep -q '0.1.5$';
106-
then
107-
echo "Broken locksmith 0.1.5 detected, installing workaround timer."
108-
# In one minute start restarting locksmithd every 5 minutes.
109-
cat >/run/systemd/system/locksmithd-kicker.timer <<EOF
110-
[Timer]
111-
OnActiveSec=1min
112-
OnUnitActiveSec=5min
113-
EOF
114-
cat >/run/systemd/system/locksmithd-kicker.service <<EOF
115-
[Service]
116-
Type=oneshot
117-
ExecStart=/usr/bin/systemctl try-restart --no-block locksmithd.service
118-
EOF
119-
systemctl start --no-block locksmithd-kicker.timer
120-
fi
121-
122103
# Gather metadata about upcoming OS image.
123104
# shellcheck source=/dev/null
124105
source "${INSTALL_MNT}/lib/os-release"

0 commit comments

Comments
 (0)