Fix to stop (Workstation) from overwriting (Coral)

[ad7d]

Upstream change in F23 added the line in question to replace the defined release_name with "Workstation Edition" when using that edition, resulting in the /etc/os-release file having VERSION="23 (Workstation Edition)" and PRETTY_NAME= Korora 23 (Workstation Edition) also resulting in GRUB naming the boot options with those variables.

Tested that this occurs during upgrade from Korora 22 to 23.

Removal of line will stop that behavior and leave (Coral) in /etc/os-release

[csmart]

@ad7d thanks for taking the time to send us a patch. The reason this is coming up on an upgrade (not a fresh install) is because Fedora is wanting to install that workstation branding package. If you don't have that installed (or you remove it) then you don't get workstation.

Your fix will still provide a korora-release-workstation package, but the package itself won't say "Workstation" in it, which sort of makes it redundant.

So, I'm thinking that perhaps a better way is to have korora-release provide and obsolete korora-release-workstation and the others (cloud and server). That way we won't even need or get the separate workstation rpm.

What do you think?

[ad7d]

@csmart Thanks for the reply. I think I'm still rather new to the internals of Fedora and packaging. :)

Obsoleting korora-release-workstation would be ideal. It looks like korora-release-workstation is doing two things besides changing the /etc/os-release file though.

Less important: It's setting enabled-extensions=['background-logo@fedorahosted.org'] which doesn't seem to actually enable that extension.

More important: It is installing 80-workstation.preset (line 178 in korora-release.spec) in /lib/systemd/system-preset/ which is disabling sshd.service by default (the only thing it does). If korora-release-workstation is obsoleted, it seems like sshd.service would then be enabled by default (90-default.preset does this) which probably wouldn't be good for most users.

In testing, removing korora-release-workstation and the 80-workstation.preset doesn't enable sshd. Just the "vendor preset" changes to enabled:

systemctl status sshd
● sshd.service - OpenSSH server daemon
   Loaded: loaded (/usr/lib/systemd/system/sshd.service; disabled; vendor preset: enabled)
   Active: inactive (dead)
     Docs: man:sshd(8)
           man:sshd_config(5)

I don't know if never having the package at all would result in sshd actually being enabled though and I don't know how to test it. My guess is that it would.

[csmart]

That should be OK, as Korora disables SSH by default anyway :-)

[ad7d]

Ah okay, great. I'll see if I can figure out the proper changes to do that.