Skip to content
This repository has been archived by the owner on Sep 18, 2020. It is now read-only.

systemd: don't fsck OEM partition in a container or on PXE systems #263

Merged
merged 1 commit into from
Feb 3, 2018
Merged

Conversation

bgilbert
Copy link
Contributor

@bgilbert bgilbert commented Feb 3, 2018

Various units pull in usr-share-oem.mount, including coreos-setup-environment.service. usr-share-oem.mount is skipped when there's no OEM partition, but systemd still pulls in its dependencies in
that case and will fail usr-share-oem.mount if those dependencies fail. 8f6dca0 therefore caused unit failures. Fix them by making the corresponding systemd-fsck@ unit subject to the same conditions as usr-share-oem.mount.

This only works because we already have a dev-disk-by\x2dlabel-OEM.device unit with the same set of conditions. There's no similar device unit for /boot and that doesn't lead to any unit failures, so clearly nothing is pulling in /boot on PXE systems. This PR therefore doesn't conditionalize the systemd-fsck@ unit for /boot.

Addresses coreos/bugs#2342.

Various units pull in usr-share-oem.mount, including
coreos-setup-environment.service. usr-share-oem.mount is skipped when
there's no OEM partition, but systemd still pulls in its dependencies in
that case and will fail usr-share-oem.mount if those dependencies fail.
8f6dca0 therefore caused unit failures. Fix them by making the
corresponding systemd-fsck@ unit subject to the same conditions as
usr-share-oem.mount.
Copy link
Contributor

@dm0- dm0- left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@bgilbert bgilbert merged commit 56032d1 into coreos:master Feb 3, 2018
@bgilbert bgilbert deleted the fsck branch February 3, 2018 20:09
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
2 participants