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.

Sign up for GitHub

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

Jump to bottom

Filter sysctl *.conf files #1173

Merged
merged 9 commits into from
Jun 8, 2021
Merged

Filter sysctl *.conf files #1173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
689c966
Use linuxrc option reboot_timeout to configure the timeout before reboot
dzedro Apr 27, 2021
6a28935
Ensure closing the opened SCR instance and do some more test mocking
dzedro Apr 29, 2021
793a453
Merge pull request #1159 from dzedro/reboot_timeout
teclator Apr 29, 2021
4423ad8
Merge branch 'SLE-15-SP1' into merge_SLE-15-SP1
teclator Apr 30, 2021
81b9258
Merge pull request #1160 from yast/merge_SLE-15-SP1
teclator Apr 30, 2021
9490cc7
Ignore no *.conf files in sysctl directories
imobachgs Jun 8, 2021
114a597
Bump version and update changes file
imobachgs Jun 8, 2021
3f4f2dc
Merge pull request #1172 from yast/filter-sysctl-files-sp2
imobachgs Jun 8, 2021
6899a20
Merge branch 'SLE-15-SP2' into filter-sysctl-files-sp3
imobachgs Jun 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion library/general/src/lib/cfa/sysctl_config.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,9 @@ def file_paths_in(path)
if Yast::FileUtils.IsFile(path)
[path]
elsif Yast::FileUtils.IsDirectory(path)
Yast::SCR.Read(Yast::Path.new(".target.dir"), path).map { |file| File.join(path, file) }
Yast::SCR.Read(Yast::Path.new(".target.dir"), path)
.select { |f| f.end_with?(".conf") } # according to 'sysctl.conf' manpage, only .conf files are considered
.map { |f| File.join(path, f) }
else
log.debug("Ignoring not valid path: #{path}")

Expand Down
Empty file added library/general/test/data/sysctl-full/usr/lib/sysctl.d/README
View file
Open in desktop
Empty file.
8 changes: 8 additions & 0 deletions package/yast2.changes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Jun 8 08:26:13 UTC 2021 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>

- Ignore sysctl configuration files that do not have the .conf
extension. The only exception are kernel files
(/boot/sysctl.conf-*) (bsc#1187018).
- 4.3.63

-------------------------------------------------------------------
Thu Jun 3 09:04:29 UTC 2021 - Josef Reidinger <jreidinger@suse.com>

Expand Down
3 changes: 2 additions & 1 deletion package/yast2.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@


Name: yast2
Version: 4.3.62
Version: 4.3.63

Release: 0
Summary: YaST2 Main Package
License: GPL-2.0-only
Expand Down