summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilly Tarreau <w@1wt.eu>2006-07-16 15:10:00 +0200
committerWilly Tarreau <willy@wtap.(none)>2006-07-26 12:03:49 +0200
commitc753faddc68938ce1e3830a7f73c60244be279a8 (patch)
treedc7777b79f7818f409adf86459a68202cdd95cf5
parent[RELEASE] init-scripts-0.3.27 (diff)
downloadinit-scripts-c753faddc68938ce1e3830a7f73c60244be279a8.tar.gz
[RELEASE] init-scripts-0.3.28v0.3.28
-rw-r--r--.flxfiles1
-rw-r--r--ChangeLog3
-rwxr-xr-xsbin/init.d/functions3
-rwxr-xr-xsbin/init.d/logrotate16
4 files changed, 6 insertions, 17 deletions
diff --git a/.flxfiles b/.flxfiles
index cdaf5f9..3b1ac4d 100644
--- a/.flxfiles
+++ b/.flxfiles
@@ -16,7 +16,6 @@ sbin/init.d/system
sbin/init.d/thttpd
sbin/init.d/pdnsd
sbin/init.d/portmap
-sbin/init.d/logrotate
sbin/init.d/lpd
sbin/init.d/inetd
sbin/init.d/dhcpd
diff --git a/ChangeLog b/ChangeLog
index 321ec58..fb97167 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2003/11/16 : 0.3.28
+- functions : break possible infinite loop in recursive_rmmod
+- removed buggy logrotate script
2003/11/12 : 0.3.27
- network : native use of vlan interfaces. Simply declare an interface with a
name like "eth1.146" to create vlan 146 on eth1
diff --git a/sbin/init.d/functions b/sbin/init.d/functions
index bad32fc..cc4058e 100755
--- a/sbin/init.d/functions
+++ b/sbin/init.d/functions
@@ -223,6 +223,9 @@ function recursive_rmmod {
elif [ -z "${args[3]}" ]; then
# use count >0, but nothing to unload
return 1
+ elif [ "${args[3]}" = "(autoclean)" ]; then
+ # use count >0, but nothing to unload
+ return 1
else
mod=3
while [ $mod -lt ${#args[@]} ]; do
diff --git a/sbin/init.d/logrotate b/sbin/init.d/logrotate
deleted file mode 100755
index d9a9e3a..0000000
--- a/sbin/init.d/logrotate
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-. `dirname $0`/functions
-
-option bin reserved_option /usr/sbin/logrotate
-option cmdline reserved_option '$bin -s $opt_status'
-option statusfile standard_option /var/lib/logrotate.status
-
-function fct_pre_start {
- local t=$( dirname $opt_statusfile )
- if [ ! -d $t ] ; then
- mkdir -p -m 755 $t || return 1
- fi
-}
-
-load_config