#79 preset: add preset for coreos
Merged 3 months ago by sgallagh. Opened 4 months ago by rfairley.
rpms/ rfairley/fedora-release f30  into  f30

file added
+8

@@ -0,0 +1,8 @@ 

+ #

+ # Fedora CoreOS

+ #

+ enable coreos-growpart.service

+ enable console-login-helper-messages-issuegen.service

+ enable console-login-helper-messages-motdgen.service

+ # This one is from https://github.com/coreos/ignition-dracut

+ enable ignition-firstboot-complete.service

file modified
+9 -1

@@ -14,7 +14,7 @@ 

  Summary:        Fedora release files

  Name:           fedora-release

  Version:        30

- Release:        1

+ Release:        2

  License:        MIT

  URL:            https://fedoraproject.org/

  

@@ -33,6 +33,7 @@ 

  Source19:       distro-template.swidtag

  Source20:       distro-edition-template.swidtag

  Source21:       iot-clevis.conf

+ Source22:       80-coreos.preset

  

  BuildArch:      noarch

  

@@ -494,6 +495,9 @@ 

  install -Dm0644 %{SOURCE12} -t %{buildroot}%{_prefix}/lib/systemd/user-preset/

  install -Dm0644 %{SOURCE13} -t %{buildroot}%{_prefix}/lib/systemd/system-preset/

  

+ # Fedora CoreOS

+ install -Dm0644 %{SOURCE22} -t %{buildroot}%{_prefix}/lib/systemd/system-preset/

+ 

  # Fedora IoT

  install -Dm0644 %{SOURCE18} -t %{buildroot}%{_prefix}/lib/systemd/system-preset/

  mkdir -p %{buildroot}/%{_sysconfdir}/dracut.conf.d

@@ -563,6 +567,7 @@ 

  

  

  %files coreos

+ %{_prefix}/lib/systemd/system-preset/80-coreos.preset

  %{_prefix}/lib/os-release.coreos

  %attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.coreos

  

@@ -619,6 +624,9 @@ 

  

  

  %changelog

+ * Tue Apr 23 2019 Robert Fairley <rfairley@redhat.com> - 30-2

+ - Add presets for CoreOS (rhbz:1702375)

+ 

  * Thu Apr 18 2019 Mohan Boddu <mboddu@bhujji.com> - 30-1

  - Setup for F30 Final

  

Add presets for CoreOS

Signed-off-by: Robert Fairley rfairley@redhat.com


This backports changes made in https://src.fedoraproject.org/rpms/fedora-release/pull-request/74 to F30. Tested installing the built RPM into FCOS using coreos-asssembler.

@rfairley We are in Final Freeze now, so if you want this in, please file a blocker or freeze exception bug and rebase this atop the latest f30 branch HEAD.

It needs a Freeze Exception at least if you want it to be on the install media.

rebased onto 89d2bb3324fe8e9e4d4a422e4715baa90dc50234

4 months ago

Rebased and tested in FCOS!

Thank you @sgallagh for proposing the BZ https://bugzilla.redhat.com/show_bug.cgi?id=1702375 as a freeze exception.

rebased onto a1c31dd

4 months ago

@rfairley This doesn't need to be part of initial f30 release though, right? We're not planning to release Fedora CoreOS at the same time anyway. It should be totally fine to have this as a post-release update! We can keep carrying presets in the FCOS configs for now until it makes it into f30 stable proper.

Pushed to correct changlog entry (rhbz# to rhbz:) to avoid making a comment in the file.

Presets are only meaningful at install-time. After that, systemd doesn't reapply them without manually requesting it (so a change of presets can't alter your running configuration). The only time a preset gets activated is the first time the package carrying the referenced unit file is installed.

Right, strictly talking about install-time here (really, "first boot time" for FCOS). We're still some time away from having an update infra in place and don't need to worry about existing installs yet. :)

For background, this patch is just an effort to drain the FCOS config overlay: https://github.com/coreos/fedora-coreos-config/tree/master/overlay. Unless @rfairley has something else in mind, AFAIK there is no dependency on having this be in the initial release of Fedora 30.

@jlebon Right, yes - my aim in this was just to close this https://github.com/coreos/fedora-coreos-config/issues/33 and start removing the presets from the overlay so it's out of mind for when F31 comes. But functionality-wise - it shouldn't make a difference given we don't need to worry about existing installs (as you mentioned).

I personally think it would be nicer to have it earlier (i.e. F30) in the more permanent location, but it's not critical.

Sorry for the confusion/bikeshedding - it seems regardless of whether we included this in the initial F30 image, or as an update to F30, or in F31 and onwards only, the preset functionality will be satisfied. We should either 1) include this in the initial F30, or 2) just wait until F31 (to avoid having both 42-coreos.preset and 80-coreos.preset present after an F30 update).

If there's no functional difference, I'd much prefer that you just wait until F31, then. Any change to the fedora-release package while we're trying to cut the release candidate is risky.

SGTM to wait until F31. Thanks!

Will close this PR, we can later remove the presets from the FCOS config overlay when F31 comes.

Pull-Request has been closed by rfairley

4 months ago

Pull-Request has been reopened by rfairley

4 months ago

Re-opened and titled WIP - we should hold this until F30 GA. As per discussion in IRC #fedora-coreos, this is fine to ship as an update to fedora-release-coreos.

As per discussion in IRC #fedora-coreos, this is fine to ship as an update to fedora-release-coreos.

agree since the install media is out already and this is just an update.

@sgallagh - can we look at getting this merged?

+1, this is good to merge now from me.

Pull-Request has been merged by sgallagh

3 months ago