瀏覽代碼

fix rc script

Michael van Elst 22 年之前
父節點
當前提交
e497516a7b
共有 4 個文件被更改,包括 17 次插入4 次删除
  1. 3 2
      openssh/openssh.spec
  2. 1 1
      openssh/rc.openssh
  3. 12 0
      petidomo/petidomo.spec
  4. 1 1
      petidomo/rc.petidomo

+ 3 - 2
openssh/openssh.spec

@@ -196,9 +196,10 @@ AutoReqProv:  no
 
     #   install run-command script
     %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
-    %{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};g' \
+    %{l_shtool} install -c -m 755 \
+        -e 's;@l_prefix@;%{l_prefix};g' \
         -e 's;@l_susr@;%{l_susr};g' \
-        -e 's;@l_musr@;%{l_musr};g' -e 's;@l_mgrp@;%{l_mgrp};g' \
+        -e 's;@l_sgrp@;%{l_sgrp};g' \
         %{SOURCE rc.openssh} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
 
     #   install reasonable ssh server and client configuration files

+ 1 - 1
openssh/rc.openssh

@@ -49,7 +49,7 @@
     #   rotate logfile
     shtool rotate -f \
         -n${openssh_log_numfiles} -s${openssh_log_minsize} -d \
-        -z${openssh_log_complevel} -o@l_rusr@ -g@l_rgrp@ -m644 \
+        -z${openssh_log_complevel} -o@l_susr@ -g@l_sgrp@ -m644 \
         -P "${openssh_log_prolog}" \
         -E "${openssh_log_epilog}" \
         @l_prefix@/var/openssh/log/sshd.log

+ 12 - 0
petidomo/petidomo.spec

@@ -42,6 +42,7 @@ Release:      20030624
 Source0:      ftp://ftp.ossp.org/pkg/tool/petidomo/petidomo-%{version}.tar.gz
 Source1:      etc.petidomo.tar
 Source2:      fsl.petidomo
+Source3:      rc.petidomo
 
 #   build information
 Prefix:       %{l_prefix}
@@ -100,6 +101,16 @@ AutoReqProv:  no
           * $RPM_BUILD_ROOT%{l_prefix}/etc/petidomo/
     )
 
+    #   rc script
+    %{l_shtool} mkdir -f -p -m 755 \
+        $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
+      %{l_shtool} install -c -m - \
+          -e 's;@l_prefix@;%{l_prefix};g' \
+          -e 's;@l_rusr@;%{l_rusr};g' \
+          -e 's;@l_rgrp@;%{l_rgrp};g' \
+          %{SOURCE rc.petidomo} \
+          $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+
     #   OSSP fake syslog library
     %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
     %{l_shtool} install -c -m 644 \
@@ -112,6 +123,7 @@ AutoReqProv:  no
         '%not %dir %{l_prefix}/etc/fsl' \
         '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
         '%config %{l_prefix}/etc/petidomo/*' \
+        '%attr(775,%{l_musr},%{l_rgrp}) %{l_prefix}/var/petidomo/*' \
         '%attr(6755,%{l_musr},%{l_mgrp}) %{l_prefix}/bin/petidomo'
 
 %files -f files

+ 1 - 1
petidomo/rc.petidomo

@@ -10,7 +10,7 @@
     petidomo_log_minsize="1M"
     petidomo_log_complevel="9"
 
-%daily -u @l_susr@
+%daily -u @l_rusr@
     opServiceEnabled petidomo || exit 0
 
     #   rotate logfile