napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[zfs] Add datasets to global storage for other modules

Browse Source
This commit is contained in:
dalto 2021-11-06 13:27:03 -05:00
parent 7108d4a509
commit 51a5c4de0f
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/modules/zfs/ZfsJob.cpp
View File

@ -89,13 +89,14 @@ ZfsJob::exec()
} }
// Create the datasets // Create the datasets
QVariantList datasetList;
for ( const auto& dataset : qAsConst( m_datasets ) ) for ( const auto& dataset : qAsConst( m_datasets ) )
{ {
QVariantMap dsMap = dataset.toMap(); QVariantMap datasetMap = dataset.toMap();
// Make sure all values are valid // Make sure all values are valid
if ( dsMap[ "dsName" ].toString().isEmpty() || dsMap[ "mountpoint" ].toString().isEmpty() if ( datasetMap[ "dsName" ].toString().isEmpty() || datasetMap[ "mountpoint" ].toString().isEmpty()
|| dsMap[ "canMount" ].toString().isEmpty() ) || datasetMap[ "canMount" ].toString().isEmpty() )
{ {
cWarning() << "Bad dataset entry"; cWarning() << "Bad dataset entry";
continue; continue;
@ -106,13 +107,23 @@ ZfsJob::exec()
r = system->runCommand( { "sh", r = system->runCommand( { "sh",
"-c", "-c",
"zfs create " + m_datasetOptions "zfs create " + m_datasetOptions
+ " -o canmount=off -o mountpoint=" + dsMap[ "mountpoint" ].toString() + " " + " -o canmount=off -o mountpoint=" + datasetMap[ "mountpoint" ].toString()
+ m_poolName + "/" + dsMap[ "dsName" ].toString() }, + " " + m_poolName + "/" + datasetMap[ "dsName" ].toString() },
std::chrono::seconds( 10 ) ); std::chrono::seconds( 10 ) );
if ( r.getExitCode() != 0 ) if ( r.getExitCode() != 0 )
{ {
cWarning() << "Failed to create dataset" << dsMap[ "dsName" ].toString(); cWarning() << "Failed to create dataset" << datasetMap[ "dsName" ].toString();
} }
// Add the dataset to the list for global storage
datasetMap[ "zpool" ] = m_poolName;
datasetList.append( datasetMap );
}
// If the list isn't empty, add it to global storage
if ( !datasetList.isEmpty() )
{
Calamares::JobQueue::instance()->globalStorage()->insert( "zfs", datasetList );
} }
} }