From 9cafa472a336f66d149a20c12f4251703d96f04d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= Date: Sat, 10 Oct 2015 20:57:07 +0200 Subject: [PATCH] Autodetect systemctl in SAIO and use it on systemd distros Change-Id: I84a9b27baac89327749d8774032860f8ad5166f2 --- doc/saio/bin/resetswift | 10 +++++++--- doc/source/development_saio.rst | 5 ----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/doc/saio/bin/resetswift b/doc/saio/bin/resetswift index c7c9d9eae9..a9845674cd 100755 --- a/doc/saio/bin/resetswift +++ b/doc/saio/bin/resetswift @@ -15,6 +15,10 @@ mkdir -p /srv/1/node/sdb1 /srv/1/node/sdb5 \ /srv/4/node/sdb4 /srv/4/node/sdb8 sudo rm -f /var/log/debug /var/log/messages /var/log/rsyncd.log /var/log/syslog find /var/cache/swift* -type f -name *.recon -exec rm -f {} \; -# On Fedora use "systemctl restart " -sudo service rsyslog restart -sudo service memcached restart +if [ "`type -t systemctl`" == "file" ]; then + sudo systemctl restart rsyslog + sudo systemctl restart memcached +else + sudo service rsyslog restart + sudo service memcached restart +fi diff --git a/doc/source/development_saio.rst b/doc/source/development_saio.rst index 0f391266ce..d4b9016b88 100644 --- a/doc/source/development_saio.rst +++ b/doc/source/development_saio.rst @@ -451,11 +451,6 @@ Setting up scripts for running Swift sed -i "/find \/var\/log\/swift/d" $HOME/bin/resetswift - On Fedora, replace ``service restart`` with ``systemctl restart - .service``:: - - sed -i "s/service \(.*\) restart/systemctl restart \1.service/" $HOME/bin/resetswift - #. Install the sample configuration file for running tests::