Run eos-firstboot a second time on dual-boot systems #408
Conversation
In new dual-boot installs of 6.0.0, eos-firstboot did not correctly grow the filesystem due to the bug fixed in commit 56aea35. We now want to run it a second time, only on dual-boot systems. Ideally we would like to only trigger this on dual-boot systems that were affected by this bug but it's harder to detect that case than to run eos-firstboot again and have resize2fs gracefully do nothing. When booting a non-live image-booted system which has not previously run this unit, remove the flag file (if present) that prevents eos-firstboot.service from running more than once, then touch another flag file to prevent running this unit again. The service is ordered Before=eos-firstboot.service and is Type=oneshot so we are guaranteed that its ExecStart= line has completed before eos-firstboot.service's ConditionPathExists check is evaluated. From systemd.unit(5): > The conditions and asserts are checked at the time the queued start > job is to be executed. The ordering dependencies are still respected, > so other units are still pulled in and ordered as if this unit was > successfully activated, and the conditions and asserts are executed > the precise moment the unit would normally start and thus can validate > system state after the units ordered before completed initialization. On a fresh installation of an image containing this unit, /var/eos-booted does not exist; so this unit has no effect but is harmless. On a system originally installed with 6.0.0, eos-firstboot.service will be retriggered once and will successfully resize the filesystem to fill the partition. On a system originally installed with a release prior to 6.0.0, eos-firstboot.service will be retriggered once and will successfully take no action. https://phabricator.endlessm.com/T35432
wjt
force-pushed
the
T35432-grow-rootfs-on-existing-dual-boot
branch
from
8b58bbb
to
b36a307
Compare
There was a problem hiding this comment.
If we're going to unconditionally re-run eos-firstboot.service, why not just change the stamp file it uses? I.e., s,/var/eos-booted,/var/lib/%N, in eos-firstboot and eos-firstboot.service? You could even have it delete the old /var/eos-booted, which is a bit of an eyesore.
| DefaultDependencies=no | ||
| After=sysinit.target local-fs.target | ||
| Before=basic.target eos-firstboot.service | ||
| ConditionPathExists=!/var/%N |
There was a problem hiding this comment.
I think Rob has previously expressed regret about dropping these files directly in /var. I.e., maybe this should be /var/lib/%N.
There was a problem hiding this comment.
If we're going to unconditionally re-run eos-firstboot.service, why not just change the stamp file it uses?
Because I want to only re-run it on dual-boot systems.
But yes, that would be easier. It's harmless to rerun (except in terms of time wasted). It would also be an excuse to clean up the ugly top-level-of-/var stamp file. Nice idea.
There was a problem hiding this comment.
Ah, I missed the implications of ConditionKernelCommandLine=endless.image.device.
There was a problem hiding this comment.
I implemented that alternative at #410.
|
Converting this to draft, I'll rework it tomorrow as described above. |
|
#410 was merged instead. |
In new dual-boot installs of 6.0.0, eos-firstboot did not correctly grow the filesystem due to the bug fixed in commit
56aea35.
We now want to run it a second time, only on dual-boot systems. Ideally we would like to only trigger this on dual-boot systems that were affected by this bug but it's harder to detect that case than to run eos-firstboot again and have resize2fs gracefully do nothing.
When booting a non-live image-booted system which has not previously run this unit, remove the flag file (if present) that prevents eos-firstboot.service from running more than once, then touch another flag file to prevent running this unit again. The service is ordered Before=eos-firstboot.service and is Type=oneshot so we are guaranteed that its ExecStart= line has completed before eos-firstboot.service's ConditionPathExists check is evaluated. From systemd.unit(5):
On a fresh installation of an image containing this unit, /var/eos-booted does not exist; so this unit has no effect but is harmless.
On a system originally installed with 6.0.0, eos-firstboot.service will be retriggered once and will successfully resize the filesystem to fill the partition.
On a system originally installed with a release prior to 6.0.0, eos-firstboot.service will be retriggered once and will successfully take no action.
https://phabricator.endlessm.com/T35432