mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-31 01:11:06 +02:00
Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4c3002cb26
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-15 (Thu, 15 Jun 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -2190,6 +2190,10 @@ void wake_up(bool &wakeup)
|
||||
|
||||
int CNeutrinoApp::run(int argc, char **argv)
|
||||
{
|
||||
puts("[neutrino] executing " NEUTRINO_APP_START_SCRIPT ".");
|
||||
if (my_system(NEUTRINO_APP_START_SCRIPT) != 0)
|
||||
perror(NEUTRINO_APP_START_SCRIPT " failed");
|
||||
|
||||
CmdParser(argc, argv);
|
||||
|
||||
TIMER_START();
|
||||
|
Reference in New Issue
Block a user