From 8fd0b2a2af906e8281771068f3735bd4b38ae06e Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Wed, 14 Apr 2004 09:10:13 +0000 Subject: [PATCH] Rene Rene: the next .init files cleanup round - some major bugs have been fixed (killing some .init's itself from underneath, one .init was not even a ROCK meta .init file ...), some have only be touched for unification reasons - and some D_prefix have been left - since they do not present a bug ... [2004041014345427930] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2743 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/nfs-utils/nfsd.init | 7 +------ package/clifford/mysql/mysql.init | 4 ++-- package/misc/snort/snort.init | 6 +++--- package/powerpc/pmud/pmud.init | 4 ++-- package/rene/cups/cups.init | 4 ++-- package/rene/pdnsd/pdnsd.init | 2 +- package/rene/wwwoffle/wwwoffled.init | 4 ++-- package/sirkull/clamav/clamd.init | 2 +- package/tibit/pcsc-lite/pcscd.init | 29 +++++++++++----------------- 9 files changed, 25 insertions(+), 37 deletions(-) diff --git a/package/base/nfs-utils/nfsd.init b/package/base/nfs-utils/nfsd.init index 673c9c0e4..98b00dde7 100644 --- a/package/base/nfs-utils/nfsd.init +++ b/package/base/nfs-utils/nfsd.init @@ -38,7 +38,7 @@ main_begin block_begin(stop, `Stopping kernel nfsd.') check(`killall -15 D_prefix/sbin/rpc.mountd') - check(`killall -9 nfsd') + check(`killall -9 D_prefix/sbin/nfsd') check(`killall -9 D_prefix/sbin/rpc.rquotad') check(`D_prefix/sbin/exportfs -u -a') block_end @@ -47,9 +47,4 @@ main_begin check(`D_prefix/sbin/exportfs -r') block_end - block_begin(restart, `Restarting kernel nfsd.') - check(`/sbin/rc knfsd stop') - check(`/sbin/rc knfsd start') - block_end - main_end diff --git a/package/clifford/mysql/mysql.init b/package/clifford/mysql/mysql.init index 4d15ffd62..ac4f189b6 100644 --- a/package/clifford/mysql/mysql.init +++ b/package/clifford/mysql/mysql.init @@ -33,11 +33,11 @@ main_begin block_end block_begin(stop, `Stopping MySQL Server.') - check(`killall mysqld') + check(`killall D_prefix/bin/mysqld') block_end block_begin(restart, `Restarting MySQL Server.') - check(`killall -1 mysqld') + check(`killall -1 D_prefix/bin/mysqld') block_end main_end diff --git a/package/misc/snort/snort.init b/package/misc/snort/snort.init index d6df08e8a..02c623cbb 100644 --- a/package/misc/snort/snort.init +++ b/package/misc/snort/snort.init @@ -28,15 +28,15 @@ main_begin block_begin(start, `Starting snort (daemon mode).') - check(`/opt/snort/bin/snort -D -c /opt/snort/etc/snort.conf') + check(``D_prefix/bin/snort -D -c `D_prefix/etc/snort.conf') block_end block_begin(stop, `Stopping snort (daemon mode).') - check(`killall -15 snort') + check(`killall -15 `D_prefix/bin/snort') block_end block_begin(stop, `Restarting snort (daemon mode).') - check(`killall -1 snort') + check(`killall -1 `D_prefix/bin/snort') block_end main_end diff --git a/package/powerpc/pmud/pmud.init b/package/powerpc/pmud/pmud.init index 8b1258cf6..53db46e90 100644 --- a/package/powerpc/pmud/pmud.init +++ b/package/powerpc/pmud/pmud.init @@ -34,11 +34,11 @@ PMUD_ARGS="" main_begin block_begin(start, `Starting pmud.') - check(`/sbin/pmud $PMUD_ARGS') + check(`D_prefix/sbin/pmud $PMUD_ARGS') block_end block_begin(stop, `Stopping pmud.') - check(`killall -15 pmud') + check(`killall -15 D_prefix/sbin/pmud') block_end main_end diff --git a/package/rene/cups/cups.init b/package/rene/cups/cups.init index 9376085bf..9a86d3a5b 100644 --- a/package/rene/cups/cups.init +++ b/package/rene/cups/cups.init @@ -35,11 +35,11 @@ main_begin block_end block_begin(stop, `Stopping cupsd.') - check(`killall -15 cupsd') + check(`killall -15 D_prefix/sbin/cupsd') block_end block_begin(restart, `Restarting cupsd.') - check(`killall -1 cupsd') + check(`killall -1 D_prefix/sbin/cupsd') block_end main_end diff --git a/package/rene/pdnsd/pdnsd.init b/package/rene/pdnsd/pdnsd.init index afc70ab86..d20737010 100755 --- a/package/rene/pdnsd/pdnsd.init +++ b/package/rene/pdnsd/pdnsd.init @@ -35,7 +35,7 @@ main_begin block_end block_begin(stop, `Stopping DNS-cache (pdnsd).') - check(`killall pdnsd') + check(`killall D_prefix/sbin/pdnsd') block_end main_end diff --git a/package/rene/wwwoffle/wwwoffled.init b/package/rene/wwwoffle/wwwoffled.init index 1273d7fb3..33833e3a5 100644 --- a/package/rene/wwwoffle/wwwoffled.init +++ b/package/rene/wwwoffle/wwwoffled.init @@ -35,11 +35,11 @@ main_begin block_end block_begin(stop, `Stopping WWW-cache (wwwoffled).') - check(`killall wwwoffled') + check(`killall D_prefix/sbin/wwwoffled') block_end block_begin(reload, `Reloading WWW-cache (wwwoffled).') - check(`killall -HUP wwwoffled') + check(`killall -HUP D_prefix/sbin/wwwoffled') block_end main_end diff --git a/package/sirkull/clamav/clamd.init b/package/sirkull/clamav/clamd.init index b079f44b8..b257b288b 100644 --- a/package/sirkull/clamav/clamd.init +++ b/package/sirkull/clamav/clamd.init @@ -33,7 +33,7 @@ main_begin block_end block_begin(stop, `Stopping clamd.') - check(`killall clamd') + check(`killall D_prefix/sbin/clamd') block_end main_end diff --git a/package/tibit/pcsc-lite/pcscd.init b/package/tibit/pcsc-lite/pcscd.init index 25c9f2657..5de08a5b8 100644 --- a/package/tibit/pcsc-lite/pcscd.init +++ b/package/tibit/pcsc-lite/pcscd.init @@ -26,26 +26,19 @@ # Runlevel: 25 rcX # -case "$1" in +main_begin - start) - echo "Starting pcscd." - /usr/sbin/pcscd - ;; + block_begin(start, `Starting pcscd.') + check(`D_prefix/sbin/pcscd') + block_end - stop) - echo "Stopping pcscd." - killall -15 /usr/sbin/pcscd - ;; + block_begin(stop, `Stopping pcscd.') + check(`killall -15 `D_prefix/sbin/pcscd') + block_end - restart) - echo "Restarting pcscd." - killall -1 /usr/sbin/pcscd - ;; + block_begin(stop, `Restarting pcscd.') + check(`killall -1 `D_prefix/sbin/pcscd') + block_end - *) - echo "Usage: $0 { start | stop | restart }" - exit 1 ;; - -esac +main_end