From d22cde6eb982397e6bf767a930b8ff4a6f23c053 Mon Sep 17 00:00:00 2001 From: "Cameron (Kamran) Mashayekhi" Date: Wed, 22 Feb 2006 23:59:15 +0000 Subject: [PATCH] scripts were movde to /usr/sbin. force-reload and reload was added to the micasad script. /usr/sbin/rcmicasad was linked to /etc/init.d/micasad. --- CASA.changes | 7 +++++ c_micasad/startup/micasad | 24 +++++++++++++-- shsrc/lshsrc/CASA.spec | 62 +++++++++++++++++++------------------- shsrc/lshsrc/CASA_dbg.spec | 2 ++ 4 files changed, 62 insertions(+), 33 deletions(-) diff --git a/CASA.changes b/CASA.changes index 0b10255a..8950953a 100644 --- a/CASA.changes +++ b/CASA.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Feb 22 16:55:27 MST 2006 - cmashayekhi@novell.com + +- CASA.spec was modified to put the scripts in /usr/sbin. +- A link as rcmicasad was created fro /usr/sbin to /etc/init.d/micasad +- force-reload and reload tags were added to the micasad script. + ------------------------------------------------------------------- Tue Feb 22 14:03:20 MST 2006 - jnorman@novell.com - Bug 151679. Remove reverse links when deleting a secret - fixed diff --git a/c_micasad/startup/micasad b/c_micasad/startup/micasad index 8e52ec46..631d8ca8 100644 --- a/c_micasad/startup/micasad +++ b/c_micasad/startup/micasad @@ -11,7 +11,7 @@ # Short-Description: miCASA daemon # Description: miCASA daemon ### END INIT INFO -MICASAD_BIN=/usr/bin/micasad.sh +MICASAD_BIN=/usr/sbin/micasad.sh test -x $MICASAD_BIN || exit 5 . /etc/rc.status @@ -62,6 +62,26 @@ case "$1" in $0 stop $0 start + # Remember status and be quiet + rc_status + ;; + reload) + ## Stop the service and regardless of whether it was + ## running or not, start it again. + echo "Restarting miCASA daemon" + $0 stop + $0 start + + # Remember status and be quiet + rc_status + ;; + force-reload) + ## Stop the service and regardless of whether it was + ## running or not, start it again. + echo "Restarting miCASA daemon" + $0 stop + $0 start + # Remember status and be quiet rc_status ;; @@ -88,7 +108,7 @@ case "$1" in rc_status -v ;; *) - echo "Usage: $0 {start|stop|restart|try-restart|status}" + echo "Usage: $0 {start|stop|restart|try-restart|reload|force-reload|status}" exit 1 ;; esac diff --git a/shsrc/lshsrc/CASA.spec b/shsrc/lshsrc/CASA.spec index 093176a8..cb074540 100644 --- a/shsrc/lshsrc/CASA.spec +++ b/shsrc/lshsrc/CASA.spec @@ -82,15 +82,18 @@ mk-cai-all %install mkdir -p %{buildroot}%{prefix} -mkdir %{buildroot}%{prefix}/CASA -mkdir %{buildroot}%{bin_prefix}/%{_lib} -mkdir %{buildroot}%{bin_prefix}/bin -mkdir %{buildroot}%{bin_prefix}/include -mkdir %{buildroot}%{prefix}/CASA/images -mkdir %{buildroot}%{prefix}/CASA/help -mkdir %{buildroot}%{prefix}/CASA/help/en -mkdir %{buildroot}%{prefix}/CASA/doc +mkdir -p %{buildroot}%{prefix}/CASA +mkdir -p %{buildroot}%{bin_prefix}/%{_lib} +mkdir -p %{buildroot}%{bin_prefix}/bin +mkdir -p %{buildroot}%{bin_prefix}/sbin +mkdir -p %{buildroot}%{bin_prefix}/include +mkdir -p %{buildroot}%{prefix}/CASA/images +mkdir -p %{buildroot}%{prefix}/CASA/help +mkdir -p %{buildroot}%{prefix}/CASA/help/en +mkdir -p %{buildroot}%{prefix}/CASA/doc mkdir -p %{buildroot}/%{_lib}/security +mkdir -p %{buildroot}/etc/init.d +mkdir -p %{buildroot}/etc/ld.so.conf.d install -m 755 %{_lib}/lux/ndbg/libmicasa.so.%{bldno} %{buildroot}%{bin_prefix}/%{_lib} install -m 755 %{_lib}/lux/ndbg/libad_gk.so.%{bldno} %{buildroot}%{bin_prefix}/%{_lib} @@ -105,25 +108,27 @@ install -m 755 %{_lib}/lux/ndbg/Novell.CASA.DataEngines.KWallet.dll %{buildroot} install -m 755 %{binsource}/lux/ndbg/micasad.exe %{buildroot}%{bin_prefix}/bin install -m 755 %{binsource}/lux/ndbg/CASAManager.exe %{buildroot}%{bin_prefix}/bin -install -m 755 c_gui/CASAManager.sh %{buildroot}%{bin_prefix}/bin +install -m 755 c_gui/CASAManager.sh %{buildroot}%{bin_prefix}/sbin install -m 755 c_gui/CASAManager.exe.config %{buildroot}%{bin_prefix}/bin install -m 755 c_gui/CASAManager.desktop %{buildroot}%{prefix}/CASA/ install -m 755 c_gui/images/* %{buildroot}%{prefix}/CASA/images install -m 755 c_gui/help/en/* %{buildroot}%{prefix}/CASA/help/en -install -m 755 c_micasad/startup/micasad %{buildroot}%{bin_prefix}/bin -install -m 755 c_micasad/startup/micasad.sh %{buildroot}%{bin_prefix}/bin -install -m 755 c_micasad/startup/casacfgpam %{buildroot}%{bin_prefix}/bin -install -m 755 c_micasad/startup/casaucfgpam %{buildroot}%{bin_prefix}/bin +install -m 755 c_micasad/startup/micasad %{buildroot}/etc/init.d +install -m 755 c_micasad/startup/micasad.sh %{buildroot}%{bin_prefix}/sbin +install -m 755 c_micasad/startup/casacfgpam %{buildroot}%{bin_prefix}/sbin +install -m 755 c_micasad/startup/casaucfgpam %{buildroot}%{bin_prefix}/sbin install -m 755 %{_lib}/lux/ndbg/pam_micasa.so %{buildroot}/%{_lib}/security install -d %{buildroot}%{bin_prefix}/%{_lib} install -d %{buildroot}%{bin_prefix}/bin +install -d %{buildroot}%{bin_prefix}/sbin install -d %{buildroot}%{bin_prefix}/include install -d %{buildroot}%{prefix}/CASA/doc install -d %{buildroot}%{prefix}/CASA/images install -d %{buildroot}%{prefix}/CASA/help/en install -d %{buildroot}/%{_lib}/security +install -d %{buildroot}/etc/init.d #install -m 644 %{buildroot}%{prefix}/%{_lib}/miCASA.jar %{buildroot}%{prefix}/CASA/%{_lib} @@ -145,14 +150,14 @@ ln -s libkwallets_rw.so.%{bldno} %{buildroot}%{bin_prefix}/%{_lib}/libkwallets_r ln -s libad_gk.so.%{bldno} %{buildroot}%{bin_prefix}/%{_lib}/libad_gk.so ln -s libad_gk.so.%{bldno} %{buildroot}%{bin_prefix}/%{_lib}/libad_gk.so.1 -mkdir -p %{buildroot}/etc/init.d -mkdir -p %{buildroot}/etc/ld.so.conf.d -cp %{buildroot}%{bin_prefix}/bin/micasad %{buildroot}/etc/init.d +ln -s /etc/init.d/micasad %{buildroot}%{bin_prefix}/sbin/rcmicasad echo "/usr/%{_lib}/" >> %{buildroot}/etc/ld.so.conf.d/CASA.conf %post +echo " " %{fillup_and_insserv -y micasad} +echo " " if [ "x$1" == "x1" ] || [ "x$1" == "x2" ] then casacfgpam @@ -184,9 +189,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -#%dir %{prefix} %dir %{prefix}/CASA -#%dir %{bin_prefix}/%{_lib} %dir %{prefix}/CASA/doc %dir %{bin_prefix}/%{_lib}/libmicasa.so.%{bldno} %dir %{bin_prefix}/%{_lib}/libmicasa.so @@ -197,11 +200,15 @@ rm -rf $RPM_BUILD_ROOT %dir %{bin_prefix}/%{_lib}/Novell.CASA.miCASAWrapper.dll %dir %{bin_prefix}/%{_lib}/Novell.CASA.Common.dll -#%dir %{bin_prefix}/bin -%{bin_prefix}/bin/micasad -%{bin_prefix}/bin/micasad.sh -%{bin_prefix}/bin/casacfgpam -%{bin_prefix}/bin/casaucfgpam +/etc/init.d/micasad +/%{_lib}/security/pam_micasa.so +/etc/ld.so.conf.d/CASA.conf + +%{bin_prefix}/sbin/rcmicasad +%{bin_prefix}/sbin/casacfgpam +%{bin_prefix}/sbin/casaucfgpam +%{bin_prefix}/sbin/micasad.sh + %{bin_prefix}/bin/micasad.exe %{prefix}/CASA/doc/CASA_Reference_Guide.pdf @@ -209,26 +216,19 @@ rm -rf $RPM_BUILD_ROOT %{prefix}/CASA/doc/Readme.txt -/etc/init.d/micasad -/%{_lib}/security/pam_micasa.so -/etc/ld.so.conf.d/CASA.conf - %files devel %defattr(-,root,root) -#%{bin_prefix}/include %{bin_prefix}/include/micasa_mgmd.h %{bin_prefix}/include/micasa_types.h %files gui %defattr(-,root,root) -#%dir %{bin_prefix}/bin/ -%{bin_prefix}/bin/CASAManager.sh +%{bin_prefix}/sbin/CASAManager.sh %{bin_prefix}/bin/CASAManager.exe.config %{bin_prefix}/bin/CASAManager.exe %{prefix}/CASA/CASAManager.desktop -#%dir %{bin_prefix}/%{_lib}/ %{bin_prefix}/%{_lib}/libad_gk.so.%{bldno} %{bin_prefix}/%{_lib}/libad_gk.so diff --git a/shsrc/lshsrc/CASA_dbg.spec b/shsrc/lshsrc/CASA_dbg.spec index 61d25c08..ed9e1537 100644 --- a/shsrc/lshsrc/CASA_dbg.spec +++ b/shsrc/lshsrc/CASA_dbg.spec @@ -152,7 +152,9 @@ echo "/usr/%{_lib}/" >> %{buildroot}/etc/ld.so.conf.d/CASA.conf %post +echo " " %{fillup_and_insserv -y micasad} +echo " " if [ "x$1" == "x1" ] || [ "x$1" == "x2" ] then casacfgpam