Author: buchan
Date: Fri Feb 16 14:48:35 2007
New Revision: 121717
Modified:
packages/cooker/hobbit/current/SPECS/hobbit.spec
Log:
- Fix hobbitlaunch.d usage in clientlaunch.cfg
- Add hobbit user to adm group in pre to allow hobbit to read logs
Modified: packages/cooker/hobbit/current/SPECS/hobbit.spec
==============================================================================
--- packages/cooker/hobbit/current/SPECS/hobbit.spec (original)
+++ packages/cooker/hobbit/current/SPECS/hobbit.spec Fri Feb 16 14:48:35 2007
@@ -1,5 +1,5 @@
#define beta %{nil}
-%define release %mkrel 3
+%define release %mkrel 4
%define _localstatedir %{_var}/lib
%{?!_logdir:%global _logdir /var/log}
%{?!mkrel:%define mkrel(c:) %{-c:0.%{-c*}.}%{!?_with_unstable:%(perl -e
'$_="%{1}";m/(.\*\\D\+)?(\\d+)$/;$rel=${2}-1;re;print
"$1$rel";').%{?subrel:%subrel}%{!?subrel:1}.%{?distversion:%distversion}%{?!distversion:%(echo
$[%{mdkversion}/10])}}%{?_with_unstable:%{1}}%{?distsuffix:%distsuffix}%{?!distsuffix:mdk}}
@@ -116,7 +116,6 @@
echo "directory %{_sysconfdir}/%{name}/hobbitlaunch.d" >>
%{buildroot}/%{_sysconfdir}/%{name}/hobbitlaunch.cfg
echo "directory %{_sysconfdir}/%{name}/hobbitgraph.d" >>
%{buildroot}/%{_sysconfdir}/%{name}/hobbitgraph.cfg
-echo "directory %{_sysconfdir}/%{name}/hobbitlaunch.d" >>
%{buildroot}/%{_sysconfdir}/%{name}/clientlaunch.cfg
mkdir -p
%{buildroot}/%{_sysconfdir}/%{name}/{hobbitlaunch,hobbitgraph,clientlaunch}.d
# server-only stuff
@@ -146,6 +145,7 @@
mv %{buildroot}/%{_libdir}/%{name}/client/etc/*.cfg
%{buildroot}/%{_sysconfdir}/%{name}/
rmdir %{buildroot}/%{_libdir}/%{name}/client/etc
ln -sf %{_sysconfdir}/%{name} %{buildroot}/%{_libdir}/%{name}/client/etc
+echo "directory %{_sysconfdir}/%{name}/hobbitlaunch.d" >>
%{buildroot}/%{_sysconfdir}/%{name}/clientlaunch.cfg
perl -pi -e 's,\$HOBBITCLIENTHOME,\$HOME/client,g'
%{buildroot}/%{_sysconfdir}/%{name}/hobbitclient.cfg
perl -pi -e 's,/etc/default/,%{_sysconfdir}/sysconfig/,g;s,su (-c .+) (-
hobbit),su $2 $1,g;s,/usr/lib,%{_libdir},g' %{buildroot}/%{_initrddir}/hobbit*
@@ -162,6 +162,7 @@
else
%_pre_useradd %{name} %{_libdir}/%{name} /bin/sh
fi
+gpasswd -a hobbit adm
%post
%_post_service %{name}
