Merge "Autodetect systemctl in SAIO and use it on systemd distros"

This commit is contained in:
Jenkins 2015-10-13 03:59:19 +00:00 committed by Gerrit Code Review
commit e6a1ed5fb1
2 changed files with 7 additions and 8 deletions

View File

@ -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 <service>"
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

View File

@ -451,11 +451,6 @@ Setting up scripts for running Swift
sed -i "/find \/var\/log\/swift/d" $HOME/bin/resetswift
On Fedora, replace ``service <name> restart`` with ``systemctl restart
<name>.service``::
sed -i "s/service \(.*\) restart/systemctl restart \1.service/" $HOME/bin/resetswift
#. Install the sample configuration file for running tests::