Discard adding prefix "/dev/" for devices values.

master
Mike Hiretsky 13 years ago
parent 3b92cc086b
commit 0de8143d61

@ -69,7 +69,7 @@ bool CalculateConfig::getDefaultConfig()
QStringList devs = m_Config["os_device_dev"].toStringList();
m_Config.remove("os_device_dev");
m_Config["os_device_dev"] = preparePartitions(devs);
m_Config["os_device_dev"] = devs;
if ( !m_Config["os_device_dev"].toStringList().isEmpty() )
m_Config["gui_os_device_dev"] = m_Config["os_device_dev"].toStringList().at(0);
@ -146,7 +146,7 @@ bool CalculateConfig::getNewPartitioning()
QStringList devs = confDisk["os_device_dev"].toStringList();
m_Config.remove("os_device_dev");
m_Config["os_device_dev"] = preparePartitions(devs);
m_Config["os_device_dev"] = devs;
m_Config.remove("os_disk_dev");
m_Config["os_disk_dev"] = confDisk["os_disk_dev"];
@ -225,20 +225,6 @@ bool CalculateConfig::getNewMountpoints()
return true;
}
QStringList CalculateConfig::preparePartitions(const QStringList& parts)
{
QStringList devs(parts);
QStringList::iterator dev = devs.begin();
while ( dev != devs.end() )
{
*dev = "/dev/"+*dev;
++dev;
}
return devs;
}
QStringList CalculateConfig::getPasswordUsers()
{
QStringList result;

@ -39,8 +39,6 @@ private:
CalculateConfig(const CalculateConfig&);
CalculateConfig& operator=(const CalculateConfig&);
QStringList preparePartitions(const QStringList& parts);
void parseVariables(const QDomNode& node, MapConfig& cfg);
void parseVar(const QDomNode& node, MapConfig& cfg);
void parseVarList(const QDomNode& node, MapConfig& cfg);
@ -51,4 +49,4 @@ private:
static CalculateConfig* _instance;
MapConfig m_Config;
};
};

Loading…
Cancel
Save