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

do not stop haveged process (bsc#1140171) #818

Merged
merged 3 commits into from Sep 25, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions package/yast2-installation.changes
@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Sep 25 08:29:19 UTC 2019 - Steffen Winterfeldt <snwint@suse.com>

- do not stop haveged process (bsc#1140171)
- 4.2.15

-------------------------------------------------------------------
Fri Sep 20 13:39:18 UTC 2019 - Ladislav Slezák <lslezak@suse.cz>

Expand Down
2 changes: 1 addition & 1 deletion package/yast2-installation.spec
Expand Up @@ -16,7 +16,7 @@
#

Name: yast2-installation
Version: 4.2.14
Version: 4.2.15
Release: 0
Group: System/YaST
License: GPL-2.0-only
Expand Down
5 changes: 0 additions & 5 deletions src/lib/installation/clients/pre_umount_finish.rb
Expand Up @@ -97,7 +97,6 @@ def read_poolsize
poolsize
end

SERVICE_BIN = "/usr/sbin/haveged".freeze
RANDOM_PATH = "/dev/urandom".freeze
# Preserves the current randomness state, BNC #692799
def preserve_randomness_state
Expand All @@ -118,10 +117,6 @@ def preserve_randomness_state
else
log.info "Cannot store #{RANDOM_PATH} state to #{store_to}"
end

# stop the random number generator service
log.info "Stopping #{SERVICE_BIN} service"
local_command("/sbin/killproc -TERM '#{String.Quote(SERVICE_BIN)}'")
end
end
end
2 changes: 0 additions & 2 deletions test/lib/clients/pre_umount_finish_test.rb
Expand Up @@ -41,7 +41,6 @@

it "does not preserve randomness state" do
expect(Yast::WFM).not_to receive(:Execute).with(anything, /dd/)
expect(Yast::WFM).not_to receive(:Execute).with(anything, /killproc -TERM/)

subject.write
end
Expand All @@ -54,7 +53,6 @@

it "does preserve randomness state" do
expect(Yast::WFM).to receive(:Execute).with(anything, /dd/)
expect(Yast::WFM).to receive(:Execute).with(anything, /killproc -TERM/)

subject.write
end
Expand Down