Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

overlay: Tweak coreos-boot-mount-generator to deal with older RHCOS #219

Merged
merged 1 commit into from
Nov 7, 2019
Merged

overlay: Tweak coreos-boot-mount-generator to deal with older RHCOS #219

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions overlay.d/05core/usr/lib/systemd/system-generators/coreos-boot-mount-generator
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,14 @@ add_wants() {
ln -sf "../${name}" "${wants_dir}/${name}"
}

# If there's no aleph version from https://github.com/coreos/coreos-assembler/pull/768
# then this is a non-FCOS system, likely RHCOS pre-4.3. In
# that case, we don't want to overwrite what the systemd-fstab-generator
# will do.
if ! [ -f /sysroot/.coreos-aleph-version.json ]; then
exit 0
fi

# Don't create mount units for /boot or /boot/efi on live systems.
# ConditionPathExists won't work here because conditions don't affect
# the dependency on the underlying device unit.
Expand Down