Hello all, Presently we end up with a directory with the init script inside it: $ rpm -ql tsdb /etc/rc.d/init.d/tsdb_local_queue /etc/rc.d/init.d/tsdb_local_queue/init_script ...
Patch attached. Thanks, Joshua Roys
>From 697b49ef1622cc14ea9f2a15a979852309c8a42b Mon Sep 17 00:00:00 2001 From: Joshua Roys <[email protected]> Date: Mon, 5 Oct 2009 09:21:30 -0400 Subject: [PATCH] Fix tsdb to install the init script properly Presently we end up with a directory with the init script inside it: $ rpm -ql tsdb /etc/rc.d/init.d/tsdb_local_queue /etc/rc.d/init.d/tsdb_local_queue/init_script ... --- monitoring/tsdb/tsdb.spec | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/monitoring/tsdb/tsdb.spec b/monitoring/tsdb/tsdb.spec index c22c5c8..0652277 100644 --- a/monitoring/tsdb/tsdb.spec +++ b/monitoring/tsdb/tsdb.spec @@ -1,4 +1,8 @@ -%define init_script %{_sysconfdir}/rc.d/init.d/tsdb_local_queue +%if 0%{!?_initddir:1} +%define _initddir %{_sysconfdir}/rc.d/init.d +%endif + +%define init_script %{_initddir}/tsdb_local_queue %define lqdir %{_var}/log/nocpulse/TSDBLocalQueue %define bdbdir %{_var}/lib/nocpulse/tsdb/bdb %define npbin %{_bindir} @@ -40,6 +44,7 @@ mkdir -p $RPM_BUILD_ROOT%lqdir/archive mkdir -p $RPM_BUILD_ROOT%lqdir/failed #mkdir -p $RPM_BUILD_ROOT%npbin/tsdb_test mkdir -p $RPM_BUILD_ROOT%{_bindir} +mkdir -p $RPM_BUILD_ROOT%{_initddir} # Code install -m 644 TSDB.pm $RPM_BUILD_ROOT/%{perl_vendorlib}/NOCpulse @@ -54,7 +59,6 @@ install -m 755 LocalQueue/drainer $RPM_BUILD_ROOT%{_bindir} install -m 755 LocalQueue/rebalance_cron $RPM_BUILD_ROOT%{_bindir} # Local queue init script (temporary, will be superseded by sysv stuff) -install -d $RPM_BUILD_ROOT%{init_script} install -m 755 LocalQueue/init_script $RPM_BUILD_ROOT%{init_script} %post -- 1.6.4
_______________________________________________ Spacewalk-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/spacewalk-devel
