From a711f70755f5b53434c3c3346e38d5cff3b1e1855f982ed8bf2f6aa3cdf3d4b1 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 1 Mar 2011 09:31:24 +0000 Subject: [PATCH] - avoid unnecessary services. bnc#675841 also the start should be mediated by YaST or kiwi depending on presence of a virtualization environment, not by the package itself. OBS-URL: https://build.opensuse.org/package/show/security/haveged?expand=0&rev=37 --- haveged.changes | 6 ++++-- haveged.spec | 15 ++------------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/haveged.changes b/haveged.changes index e3cfe46..31f5ed5 100644 --- a/haveged.changes +++ b/haveged.changes @@ -1,8 +1,10 @@ ------------------------------------------------------------------- Tue Mar 1 10:03:17 CET 2011 - meissner@suse.de -- also use the SLES code for openSUSE, to avoid unnecessary - services. bnc#675841 +- avoid unnecessary services. bnc#675841 + also the start should be mediated by YaST or kiwi depending + on presence of a virtualization environment, not by the package + itself. ------------------------------------------------------------------- Tue Jan 4 23:14:52 UTC 2011 - cristian.rodriguez@opensuse.org diff --git a/haveged.spec b/haveged.spec index c5e12c2..4c0e0cd 100644 --- a/haveged.spec +++ b/haveged.spec @@ -66,19 +66,8 @@ make %{?_smp_mflags} check rm -rf %{buildroot} %post -## brace for impact... -if [ -x /usr/bin/lscpu ]; then - if /usr/bin/lscpu | grep -q "Virtualization type" ; then - ## Is a VM - %{fillup_and_insserv -fy %{name}} - else - ## it isnt. - %{fillup_and_insserv -f %{name}} - fi -else -##there is no lscpu! shouldnt happend... - %{fillup_and_insserv -f %{name}} -fi +# do not enable on condition here, let YAST, kiwi or the user do it. +%{fillup_and_insserv -f %{name}} %postun %restart_on_update %{name}