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.

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

removed modprobe.d/50-blacklist.conf (boo#1107611) #22

Merged
merged 1 commit into from
Jan 17, 2019

Conversation

mtomaschewski
Copy link
Member

suse-module-tools package will provide it instead

suse-module-tools package will provide it instead
@mwilck
Copy link
Collaborator

mwilck commented Jan 17, 2019

You're certainly aware that you can't merge this and push to OBS before I took the file in suse-module-tools. Please create a PR for https://github.com/openSUSE/suse-module-tools.

@mtomaschewski
Copy link
Member Author

mtomaschewski commented Jan 17, 2019

@mtomaschewski
Copy link
Member Author

ok, going to release & submit it, so you can submit suse-module-tools without to cause a file conflict.

@mtomaschewski mtomaschewski merged commit 7573887 into openSUSE:master Jan 17, 2019
@mwilck
Copy link
Collaborator

mwilck commented Jan 17, 2019

ok, going to release & submit it, so you can submit suse-module-tools without to cause a file conflict.

Please don't!. There will be no file conflict as long as we ship the same file with the same path.
But we can't afford to loose the file temporarily if your submission gets merged before mine.
I have some other similar issues in suse-module-tools, I can't submit immediately.

@mtomaschewski
Copy link
Member Author

I've revoked the request (https://build.opensuse.org/request/show/666683) - to be reopened once
you're ready. See also openSUSE/suse-module-tools#4, file list in spec needs it too.

@mwilck
Copy link
Collaborator

mwilck commented Jan 30, 2019

@mtomaschewski, are you planning to drop this file only in tumbleweed, or also SLE/Leap?

In theory I could start shipping the file in suse-module-tools for SLE12-SP2 and later, as the file hasn't changed since then and thus there'll be no file conflicts. But that would imply that you'd drop the file in later sysconfig releases for those distro's too, because if this file is ever changed (and I think it should, because it lists lots of drivers we aren't shipping any more), file conflicts would arise.

@mwilck
Copy link
Collaborator

mwilck commented Jan 30, 2019

I've decided to add the file in suse-module-tools in factory and SLE15, Leap15 and later. Please speak up if you disagree.

@mtomaschewski
Copy link
Member Author

mtomaschewski commented Jan 31, 2019

I've decided to add the file in suse-module-tools in factory and SLE15, Leap15 and later.

That's fine, I'm going to reopen the request (https://build.opensuse.org/request/show/666683)
so it goes to factory. SLE15 and Leap15 need approval from the maintenance team, but as the
corresponding apparmor changes needed for pull#20 (resolv.conf in /run) are in SLE-15:Update
in the meantime, we may get the ACK to submit sysconfig-0.85.1 there too (not only 15-SP1/15.1).
SLES-12* needs a cherry-pick with the blacklist related changes only.

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.

2 participants