diff options
| author | Colin Guthrie <colin@mageia.org> | 2014-10-28 13:31:53 +0000 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2014-10-28 13:31:53 +0000 |
| commit | 698196044dfee2b84fcc8c92cc92d89d0ddd5e45 (patch) | |
| tree | a35114073a4bb65f66d46dc44897191d95b086c0 /del-service | |
| parent | 832de704cf6546a1b38bd7aa68d8a1505eda4a49 (diff) | |
| download | rpm-helper-698196044dfee2b84fcc8c92cc92d89d0ddd5e45.tar rpm-helper-698196044dfee2b84fcc8c92cc92d89d0ddd5e45.tar.gz rpm-helper-698196044dfee2b84fcc8c92cc92d89d0ddd5e45.tar.bz2 rpm-helper-698196044dfee2b84fcc8c92cc92d89d0ddd5e45.tar.xz rpm-helper-698196044dfee2b84fcc8c92cc92d89d0ddd5e45.zip | |
Deal with xinetd.d services properly (e.g. sane mga#14397)
Diffstat (limited to 'del-service')
| -rwxr-xr-x | del-service | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/del-service b/del-service index 388add9..55c26bf 100755 --- a/del-service +++ b/del-service @@ -87,15 +87,17 @@ if [ $num = 0 ]; then if [ -z "$DURING_INSTALL" ]; then if [ x$init = xsystemd ]; then - /bin/systemctl stop $units + /bin/systemctl stop $units >/dev/null 2>&1 elif [ -n "srv" ]; then /sbin/service $srv stop > /dev/null || : fi fi /bin/systemctl --no-reload --quiet disable $units >/dev/null 2>&1 - if [ -n "$srv" -a -f /etc/rc.d/init.d/$srv ]; then - /sbin/chkconfig --del $srv + if [ -n "$srv" ]; then + if [ -f /etc/rc.d/init.d/$srv -o -f /etc/xinetd.d/$srv ]; then + /sbin/chkconfig --del $srv + fi fi fi |