Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Conflicts:
	src/system/helpers.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: c1803eacac
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-29 (Sun, 29 Jan 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-01-29 21:32:04 +01:00
16 changed files with 135 additions and 53 deletions

View File

@@ -3898,6 +3898,7 @@ void CNeutrinoApp::ExitRun(const bool /*write_si*/, int retcode)
my_system("/etc/init.d/rcK");
sync();
CFSMounter::umount(); // unreachable NFS server
//NI my_system(2,"/bin/umount", "-a");
//NI sleep(1);