mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 18:31:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	src/gui/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6488fbf13a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-07 (Thu, 07 Sep 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-09-07 16:41:06 +02:00
parent bffe012707 7c1d2e38fe
commit c5d81a62c4
68 changed files with 1776 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/hdd_menu.cpp
View File

@@ -66,11 +66,7 @@
#define EJECT_BIN "/bin/eject"
//NI
#ifdef BOXMODEL_CS_HD2
#define MDEV_MOUNT "/lib/mdev/fs/mount"
#else
#define MDEV_MOUNT "/etc/mdev/mdev-mount.sh"
#endif
#define MDEV_MOUNT "/lib/mdev/fs/mdev-mount"
#define MOUNT_BASE "/media/"
#define HDD_NOISE_OPTION_COUNT 4