Change using of --filter option of cl-install.

--filter cl-install now using regular expression without *.
master
Mike Hiretsky 13 years ago
parent 2cdc701f0c
commit 079cad030c

@ -31,10 +31,10 @@ bool CalculateConfig::getDefaultConfig()
// start cl-install -v and parse out
QProcess cl_install;
qDebug() << "Start cl-install -v --xml --filter \"os_install*|os_locale_lang|*os_disk*|*os_device*|cl_migrate_user\"";
qDebug() << "Start cl-install -v --xml --filter \"os_install|os_locale_lang$|os_disk|os_device|^cl_migrate_user$\"";
cl_install.start(
"cl-install -v --xml --filter \"os_install*|os_locale_lang|*os_disk*|*os_device*|cl_migrate_user\""
"cl-install -v --xml --filter \"os_install|os_locale_lang|os_disk|os_device|^cl_migrate_user$\""
);
if ( !cl_install.waitForStarted() )
@ -116,8 +116,8 @@ bool CalculateConfig::getNewPartitioning()
MapConfig confDisk;
QProcess cl_install;
qDebug() << "Start cl-install -v --xml --filter (os_disk*|os_device*|os_install_disk*)";
cl_install.start( "cl-install -v --xml --filter \"(os_disk*|os_device*|os_install_disk*)\" " );
qDebug() << "Start cl-install -v --xml --filter (os_disk|os_device|os_install_disk)";
cl_install.start( "cl-install -v --xml --filter \"(os_disk|os_device|os_install_disk)\" " );
if ( !cl_install.waitForStarted() )
return false;
@ -180,8 +180,8 @@ bool CalculateConfig::getNewMountpoints()
QStringList newMpParam = getDisksParameters();
qDebug() << "Start cl-install " + newMpParam.join(" ") + " -v --xml --filter os_install_disk_*";
cl_install.start("cl-install " + newMpParam.join(" ") + " --color never -v --xml --filter os_install_disk_*" );
qDebug() << "Start cl-install " + newMpParam.join(" ") + " -v --xml --filter os_install_disk_";
cl_install.start("cl-install " + newMpParam.join(" ") + " --color never -v --xml --filter os_install_disk_" );
if ( !cl_install.waitForStarted() )
return false;
@ -240,8 +240,8 @@ QStringList CalculateConfig::getPasswordUsers()
usersParam += " --user " + user;
}
qDebug() << "Start cl-install" + usersParam + " -v --xml --filter *migrate*";
cl_install.start("cl-install" + usersParam + " -v --xml --filter *migrate*" );
qDebug() << "Start cl-install" + usersParam + " -v --xml --filter migrate";
cl_install.start("cl-install" + usersParam + " -v --xml --filter migrate" );
if ( !cl_install.waitForStarted() )
{

Loading…
Cancel
Save