Skip to content

Commit

Permalink
don't force mysql to be started with PacketFence
Browse files Browse the repository at this point in the history
  • Loading branch information
julsemaan committed Apr 9, 2015
1 parent cbdb082 commit a40d722
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 16 deletions.
1 change: 1 addition & 0 deletions NEWS.asciidoc
Expand Up @@ -21,6 +21,7 @@ New Features
Enhancements
++++++++++++
* New admin role action USERS_CREATE_MULTIPLE for more fine grain control of the admin GUI
* PacketFence will no longer start MySQL when starting.


Bug Fixes
Expand Down
16 changes: 0 additions & 16 deletions packetfence.init
Expand Up @@ -13,14 +13,6 @@ source /etc/rc.d/init.d/functions
[ -x /usr/local/pf/bin/pfcmd ] || exit 1

start() {
#Check if MySQL is started
if [ ! -f /var/run/mysqld/mysqld.pid ] && [ ! -f /var/lib/mysql/`hostname`.pid ]; then
if [ -f /etc/init.d/mysqld ]; then
[ -d /var/lib/mysql/pf ] && /etc/init.d/mysqld start
else
[ -d /var/lib/mysql/pf ] && /etc/init.d/mysql start
fi
fi
pfconfig
echo -n $"Starting PacketFence..."
IPSET=`command -v ipset`
Expand All @@ -46,14 +38,6 @@ stop() {
}

restart() {
#Check if MySQL is started
if [ ! -f /var/run/mysqld/mysqld.pid ] && [ ! -f /var/lib/mysql/`hostname`.pid ]; then
if [ -f /etc/init.d/mysqld ]; then
[ -d /var/lib/mysql/pf ] && /etc/init.d/mysqld start
else
[ -d /var/lib/mysql/pf ] && /etc/init.d/mysql start
fi
fi
pfconfig
echo -n $"Restarting PacketFence..."
/usr/local/pf/bin/pfcmd service pf restart
Expand Down

0 comments on commit a40d722

Please sign in to comment.