From 32c7c8db346cd038761e80e6a1157c11454311cd95155b5bb78238ff8659ba0e Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 2 Jun 2010 15:03:09 +0000 Subject: [PATCH] - prereq does not fix bnc#610628, the real problem is the cycle of sysvinit->sysvinit-tools->mkinitrd <--, which is broken up by simply ignoring one requirement. If this requirement is the one between sysvinit->sysvinit-tools, we get in deep trouble. Way deeper trouble than missing mkinitrd_setup in sysvinit-tools's %post OBS-URL: https://build.opensuse.org/package/show/Base:System/sysvinit?expand=0&rev=57 --- sysvinit.changes | 10 ++++++++++ sysvinit.spec | 9 ++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/sysvinit.changes b/sysvinit.changes index 7c3423c..1de7787 100644 --- a/sysvinit.changes +++ b/sysvinit.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Jun 2 15:01:00 UTC 2010 - coolo@novell.com + +- prereq does not fix bnc#610628, the real problem is the cycle + of sysvinit->sysvinit-tools->mkinitrd <--, which is broken up by + simply ignoring one requirement. If this requirement is the one + between sysvinit->sysvinit-tools, we get in deep trouble. Way + deeper trouble than missing mkinitrd_setup in sysvinit-tools's + %post + ------------------------------------------------------------------- Tue Jun 1 14:56:02 UTC 2010 - coolo@novell.com diff --git a/sysvinit.spec b/sysvinit.spec index ecd6eba..5e00306 100644 --- a/sysvinit.spec +++ b/sysvinit.spec @@ -57,8 +57,7 @@ Patch21: powerd-2.0.2-getaddrinfo.patch Patch30: killproc-2.16.dif Patch40: showconsole-1.10.dif Patch50: startpar-0.54.dif -# see bnc#610628 for the reason we use prereq not requires -PreReq: sysvinit-tools +Requires: sysvinit-tools Provides: sbin_init %description @@ -76,10 +75,10 @@ License: GPLv2+ Summary: Tools for basic booting Group: System/Base %if 0%{suse_version} > 1120 -Requires(preun): coreutils mkinitrd %insserv_prereq -Requires(postun): coreutils mkinitrd %insserv_prereq +Requires(preun): coreutils %insserv_prereq +Requires(postun): coreutils %insserv_prereq %else -PreReq: coreutils mkinitrd %insserv_prereq +PreReq: coreutils %insserv_prereq %endif %description tools