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

[users] Try to guess suggested hostname from dmi

Browse Source 
- nothing compicated for now, just try to get something
  from /sys/devices/virtual/dmi/id/product_name and fallback
  to -pc thingy if we can't
This commit is contained in:
Gabriel Craciunescu 2017-11-02 16:35:53 +01:00 committed by Adriaan de Groot
parent 6d10c41aeb
commit 7c323bdcdc
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/modules/users/UsersPage.cpp
View File

@ -3,6 +3,7 @@
* Copyright 2014-2017, Teo Mrnjavac <teo@kde.org> * Copyright 2014-2017, Teo Mrnjavac <teo@kde.org>
* Copyright 2017-2018, Adriaan de Groot <groot@kde.org> * Copyright 2017-2018, Adriaan de Groot <groot@kde.org>
* Copyright 2019, Collabora Ltd <arnaud.ferraris@collabora.com> * Copyright 2019, Collabora Ltd <arnaud.ferraris@collabora.com>
* Copyright 2020, Gabriel Craciunescu <crazy@frugalware.org>
* *
* Portions from the Manjaro Installation Framework * Portions from the Manjaro Installation Framework
* by Roland Singer <roland@manjaro.org> * by Roland Singer <roland@manjaro.org>
@ -40,6 +41,7 @@
#include "utils/String.h" #include "utils/String.h"
#include <QBoxLayout> #include <QBoxLayout>
#include <QFile>
#include <QLabel> #include <QLabel>
#include <QLineEdit> #include <QLineEdit>
#include <QRegExp> #include <QRegExp>
@ -303,7 +305,27 @@ UsersPage::fillSuggestions()
{ {
if ( !cleanParts.isEmpty() && !cleanParts.first().isEmpty() ) if ( !cleanParts.isEmpty() && !cleanParts.first().isEmpty() )
{ {
QString hostnameSuggestion = QString( "%1-pc" ).arg( cleanParts.first() );
QString dmiProductName;
QString hostnameSuggestion;
// yes validateHostnameText() but these files can be a mess
QRegExp dmirx( "[^a-zA-Z0-9]", Qt::CaseInsensitive );
QFile dmiFile( QStringLiteral( "/sys/devices/virtual/dmi/id/product_name" ) );
if ( dmiFile.exists() &&
dmiFile.open(QIODevice::ReadOnly))
{
dmiProductName = QString::fromLocal8Bit( dmiFile.readAll().simplified().data() )
.toLower().replace(dmirx, " ").remove(' ');
}
if ( !dmiProductName.isEmpty() )
{
hostnameSuggestion = QString( "%1-%2" ).arg( cleanParts.first() ).arg( dmiProductName );
}
else
{
hostnameSuggestion = QString( "%1-pc" ).arg( cleanParts.first() );
}
if ( HOSTNAME_RX.indexIn( hostnameSuggestion ) != -1 ) if ( HOSTNAME_RX.indexIn( hostnameSuggestion ) != -1 )
{ {
ui->textBoxHostname->setText( hostnameSuggestion ); ui->textBoxHostname->setText( hostnameSuggestion );