|
|
|
@ -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;
|
|
|
|
|