Skip to content

ignition-ostree: Split unit for sysroot mounting#210

Merged
jlebon merged 1 commit intocoreos:testing-develfrom
cgwalters:sysroot-always-mount
Oct 31, 2019
Merged

ignition-ostree: Split unit for sysroot mounting#210
jlebon merged 1 commit intocoreos:testing-develfrom
cgwalters:sysroot-always-mount

Conversation

@cgwalters
Copy link
Copy Markdown
Member

The unit to mount sysroot only worked the first boot
because it was integrated with Ignition. We need to have
separate units with different dependencies (but that execute
the same code) for the "Ignition boot" compared with "subsequent"
boots.

Depends coreos/ignition-dracut#131

@cgwalters cgwalters force-pushed the sysroot-always-mount branch from 7e11e0c to c0adff1 Compare October 31, 2019 11:38
cgwalters added a commit to cgwalters/coreos-assembler that referenced this pull request Oct 31, 2019
cgwalters added a commit to cgwalters/coreos-assembler that referenced this pull request Oct 31, 2019
cgwalters added a commit to cgwalters/coreos-assembler that referenced this pull request Oct 31, 2019
ConditionKernelCommandLine=ostree
ConditionPathExists=!/run/ostree-live

# There can be only one, Highlander style
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

😆

Copy link
Copy Markdown
Contributor

@darkmuggle darkmuggle left a comment

Choose a reason for hiding this comment

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

LGTM, Ship it!

"/usr/sbin/ignition-ostree-populate-var"

install_ignition_unit ignition-ostree-mount-sysroot.service
install_ignition_unit ignition-ostree-mount-ign-sysroot.service
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Could also make the complete/subsequent thing another arg of install_ignition_unit, but definitely not a blocker!

@cgwalters cgwalters force-pushed the sysroot-always-mount branch from c0adff1 to add0180 Compare October 31, 2019 18:04
The unit to mount sysroot only worked the *first* boot
because it was integrated with Ignition.  We need to have
separate units with different dependencies (but that execute
the same code) for the "Ignition boot" compared with "subsequent"
boots.

Depends coreos/ignition-dracut#131
@cgwalters cgwalters force-pushed the sysroot-always-mount branch from add0180 to cb21036 Compare October 31, 2019 18:07
Copy link
Copy Markdown
Member

@jlebon jlebon left a comment

Choose a reason for hiding this comment

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

LGTM! Let's merge on green CI.

@jlebon
Copy link
Copy Markdown
Member

jlebon commented Oct 31, 2019

Which speaking of... #214.

@tuan-hoang1
Copy link
Copy Markdown
Contributor

But... if sysroot mount-ing was coupled with firstboot/ignition, how current code still works with subsequent boots ?

@jlebon jlebon merged commit 52dd9db into coreos:testing-devel Oct 31, 2019
@tuan-hoang1
Copy link
Copy Markdown
Contributor

Ah the current code works and it just doesn't distinguish between first and subsequent boots.

@jlebon
Copy link
Copy Markdown
Member

jlebon commented Oct 31, 2019

But... if sysroot mount-ing was coupled with firstboot/ignition, how current code still works with subsequent boots ?

It's currently not active because we still specify the root= flag in coreos-assembler. So systemd has been taking care of it for us. See coreos/coreos-assembler#883.

cgwalters added a commit to cgwalters/coreos-assembler that referenced this pull request Nov 1, 2019
cgwalters added a commit to cgwalters/coreos-assembler that referenced this pull request Nov 1, 2019
jlebon pushed a commit to coreos/coreos-assembler that referenced this pull request Nov 1, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants