diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index f3340c7..4198d46 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -725,10 +725,10 @@ void MainWindow::scanDevices() deviceScanner().start(); } -void MainWindow::on_m_DeviceScanner_progress(const QString& device_node, int percent) +void MainWindow::on_m_DeviceScanner_progress(const QString& deviceNode, int percent) { scanProgressDialog().setProgress(percent); - scanProgressDialog().setDeviceName(device_node); + scanProgressDialog().setDeviceName(deviceNode); } void MainWindow::on_m_DeviceScanner_finished() diff --git a/src/gui/volumegroupdialog.cpp b/src/gui/volumegroupdialog.cpp index b5edf84..35e9702 100644 --- a/src/gui/volumegroupdialog.cpp +++ b/src/gui/volumegroupdialog.cpp @@ -75,7 +75,10 @@ VolumeGroupDialog::~VolumeGroupDialog() void VolumeGroupDialog::setupDialog() { - QRegularExpression re(QStringLiteral("[\\w-.+]+")); + /* LVM Volume group name can consists of: letters numbers _ . - + + * It cannot start with underscore _ and must not be equal to . or .. or any entry in /dev/ + * QLineEdit accepts QValidator::Intermediate, so we just disable . at the beginning */ + QRegularExpression re(QStringLiteral(R"(^(?!_|.)[\w\-.+]+)")); QRegularExpressionValidator *validator = new QRegularExpressionValidator(re, this); dialogWidget().vgName().setValidator(validator); dialogWidget().vgName().setText(targetName());