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

Revert "hdd_menu: do not handle the rootfs or fs without kernel support"

Browse Source 
This reverts commit 1a4ac8b281.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 342180a28b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-02-10 (Tue, 10 Feb 2015)



------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2015-02-10 15:04:52 +03:00
parent 9d6b3768f2
commit 9423a68853
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/hdd_menu.cpp
View File

@@ -778,11 +778,9 @@ _show_menu:
}
if (!hdd_list.empty()) {
struct stat rec_st, root_st, dev_st;
struct stat rec_st;
memset(&rec_st, 0, sizeof(rec_st));
memset(&root_st, 0, sizeof(root_st));
stat(g_settings.network_nfs_recordingdir.c_str(), &rec_st);
stat("/", &root_st);
sort(hdd_list.begin(), hdd_list.end(), cmp_hdd_by_name());
mount = g_Locale->getText(LOCALE_HDD_MOUNT);
@@ -798,13 +796,6 @@ _show_menu:
}
std::string key = "m" + it->devname;
bool enabled = !rec_icon || !CNeutrinoApp::getInstance()->recordingstatus;
/* do not allow to unmount the rootfs, and skip filesystems without kernel support */
memset(&dev_st, 0, sizeof(dev_st));
if (stat(("/dev/" + it->devname).c_str(), &dev_st) != -1
&& dev_st.st_rdev == root_st.st_dev)
enabled = false;
else if (kernel_fs_list.find(it->fmt) == kernel_fs_list.end())
enabled = false;
it->cmf = new CMenuForwarder(it->desc, enabled, it->mounted ? umount : mount , this,
key.c_str(), CRCInput::convertDigitToKey(shortcut++), NULL, rec_icon);
hddmenu->addItem(it->cmf);