diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-10-06 14:13:32 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-10-06 14:13:32 -0500 |
| commit | a3e63055fb437000c05c3cc996c5c44a4c21991d (patch) | |
| tree | d8a14080123c2a5e70b0f40fc3917a82eb86e7fb | |
| parent | 9cb7d7318211f13d690fea92d13aca60b0ae7c5a (diff) | |
| download | tdelibs-a3e63055.tar.gz tdelibs-a3e63055.zip | |
Allow suspend/hibernate/freeze/etc. when $HOME is an NFS share
This resolves Bug 1623
| -rw-r--r-- | tdecore/tdehw/tderootsystemdevice.cpp | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/tdecore/tdehw/tderootsystemdevice.cpp b/tdecore/tdehw/tderootsystemdevice.cpp index 3ece22106..92c95fcc2 100644 --- a/tdecore/tdehw/tderootsystemdevice.cpp +++ b/tdecore/tdehw/tderootsystemdevice.cpp @@ -40,16 +40,6 @@ #include <tqdbusconnection.h> #endif // defined(WITH_TDEHWLIB_DAEMONS) || defined(WITH_UPOWER) || defined(WITH_DEVKITPOWER) || defined(WITH_HAL) || defined(WITH_CONSOLEKIT) -bool isNetworkFileSystem(TQString fileSystemType) { - if ((fileSystemType.startsWith("nfs")) - || (fileSystemType == "cifs") - ) { - return TRUE; - } - - return FALSE; -} - TDERootSystemDevice::TDERootSystemDevice(TDEGenericDeviceType::TDEGenericDeviceType dt, TQString dn) : TDEGenericDevice(dt, dn) { m_hibernationSpace = -1; } @@ -126,12 +116,6 @@ bool TDERootSystemDevice::canSetHibernationMethod() { } bool TDERootSystemDevice::canStandby() { - // Network file systems mounted on $HOME typically cause nasty suspend/resume failures - // See Bug 1615 for details - if (isNetworkFileSystem(TDEStorageDevice::determineFileSystemType(TDEGlobal::dirs()->localtdedir()))) { - return FALSE; - } - TQString statenode = "/sys/power/state"; int rval = access (statenode.ascii(), W_OK); if (rval == 0) { @@ -165,12 +149,6 @@ bool TDERootSystemDevice::canStandby() { } bool TDERootSystemDevice::canFreeze() { - // Network file systems mounted on $HOME typically cause nasty suspend/resume failures - // See Bug 1615 for details - if (isNetworkFileSystem(TDEStorageDevice::determineFileSystemType(TDEGlobal::dirs()->localtdedir()))) { - return FALSE; - } - TQString statenode = "/sys/power/state"; int rval = access (statenode.ascii(), W_OK); if (rval == 0) { @@ -204,12 +182,6 @@ bool TDERootSystemDevice::canFreeze() { } bool TDERootSystemDevice::canSuspend() { - // Network file systems mounted on $HOME typically cause nasty suspend/resume failures - // See Bug 1615 for details - if (isNetworkFileSystem(TDEStorageDevice::determineFileSystemType(TDEGlobal::dirs()->localtdedir()))) { - return FALSE; - } - TQString statenode = "/sys/power/state"; int rval = access (statenode.ascii(), W_OK); if (rval == 0) { @@ -323,12 +295,6 @@ bool TDERootSystemDevice::canSuspend() { } bool TDERootSystemDevice::canHibernate() { - // Network file systems mounted on $HOME typically cause nasty suspend/resume failures - // See Bug 1615 for details - if (isNetworkFileSystem(TDEStorageDevice::determineFileSystemType(TDEGlobal::dirs()->localtdedir()))) { - return FALSE; - } - TQString statenode = "/sys/power/state"; int rval = access (statenode.ascii(), W_OK); if (rval == 0) { |