klaute/MMDVMHost-Dashboard
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Removes presumptions on MMDVMHost restart method.

Browse source 
Removes presumptions on MMDVMHost restart method, uses the already defined 'REBOOTMMDVM' instead.
This commit is contained in:
marrold 2017-03-13 13:45:41 +00:00 committed by GitHub
parent d1b9bd7e7d
commit 5052883db2
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
scripts/switchnetwork.php
View file

@ -56,19 +56,12 @@ include "../include/sysinfo.php";
if ($_GET['network'] == "DMRPLUS") { if ($_GET['network'] == "DMRPLUS") {
setDMRNetwork("DMRplus"); setDMRNetwork("DMRplus");
exec( "sudo cp ".MMDVMINIPATH."/DMRPLUS.ini ".MMDVMINIPATH."/".MMDVMINIFILENAME ); exec( "sudo cp ".MMDVMINIPATH."/DMRPLUS.ini ".MMDVMINIPATH."/".MMDVMINIFILENAME );
exec( "sudo killall MMDVMHost"); exec( REBOOTMMDVM );
sleep(1);
exec( "sudo ".MMDVMHOSTPATH."/MMDVMHost ".MMDVMINIPATH."/".MMDVMINIFILENAME." > /dev/null 2>&1 &" );
// exec( "sudo killall MMDVMHost && sudo ".MMDVMHOSTPATH."/MMDVMHost ".MMDVMINIPATH."/".MMDVMINIFILENAME." &");
// exec( "sudo /etc/init.d/start_mmdvm restart ");
} }
if ($_GET['network'] == "BRANDMEISTER") { if ($_GET['network'] == "BRANDMEISTER") {
setDMRNetwork("BrandMeister"); setDMRNetwork("BrandMeister");
exec( "sudo cp ".MMDVMINIPATH."/BRANDMEISTER.ini ".MMDVMINIPATH."/".MMDVMINIFILENAME ); exec( "sudo cp ".MMDVMINIPATH."/BRANDMEISTER.ini ".MMDVMINIPATH."/".MMDVMINIFILENAME );
exec( "sudo killall MMDVMHost"); exec( REBOOTMMDVM );
sleep(1);
exec( "sudo ".MMDVMHOSTPATH."/MMDVMHost ".MMDVMINIPATH."/".MMDVMINIFILENAME." > /dev/null 2>&1 &" );
// exec( "sudo killall MMDVMHost && sudo ".MMDVMHOSTPATH."/MMDVMHost ".MMDVMINIPATH."/".MMDVMINIFILENAME." &" );
} }
?> ?>
<div class="alert alert-info" role="alert">Switching network to <b><?php echo getDMRNetwork2() ?></b><br>Restarting in new selected network in progress</div> <div class="alert alert-info" role="alert">Switching network to <b><?php echo getDMRNetwork2() ?></b><br>Restarting in new selected network in progress</div>