Skip to content

Commit

Permalink
Remove 20-ignition.preset sorting hack
Browse files Browse the repository at this point in the history
Ignition would order the same content in 20-ignition.preset differently,
so it had to be sorted manually, but that was fixed in
coreos/ignition#1389
  • Loading branch information
mkenigs committed Jun 12, 2022
1 parent 08317ef commit 3c73a25
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions pkg/controller/build/build_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,14 +81,10 @@ const (
# clean up. We want to be particularly strict so that live apply works
RUN rm /etc/machine-config-ignition.json
# TODO remove these hacks once we have
# TODO remove this hack once we have
# https://github.com/coreos/rpm-ostree/pull/3544
# and
# https://github.com/coreos/ignition/issues/1339 is fixed
# don't fail if wildcard has no matches
RUN bash -c "rm /usr/share/rpm/__db.*"; true
# to keep live apply working
RUN bash -c "if [[ -e /etc/systemd/system-preset/20-ignition.preset ]]; then sort /etc/systemd/system-preset/20-ignition.preset -o /etc/systemd/system-preset/20-ignition.preset; fi"
# This is so we can get the machineconfig injected
ARG machineconfig=unknown
Expand Down

0 comments on commit 3c73a25

Please sign in to comment.