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

Merge pull request #2181 from AsahiLinux/hello-im-a-mac

Browse Source 
[users] Handle Device Tree platforms (e.g. Apple Silicon) for guessing the product name
This commit is contained in:
dalto8 2023-08-20 17:02:17 +00:00 committed by GitHub
commit 0eb431dd2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/modules/users/Config.cpp
View File

@ -321,7 +321,7 @@ Config::hostnameStatus() const
static QString static QString
cleanupForHostname( const QString& s ) cleanupForHostname( const QString& s )
{ {
QRegExp dmirx( "[^a-zA-Z0-9]", Qt::CaseInsensitive ); QRegExp dmirx( "(^Apple|\\(.*\\)|[^a-zA-Z0-9])", Qt::CaseInsensitive );
return s.toLower().replace( dmirx, " " ).remove( ' ' ); return s.toLower().replace( dmirx, " " ).remove( ' ' );
} }
@ -339,15 +339,30 @@ guessProductName()
if ( !tried ) if ( !tried )
{ {
QFile dmiFile( QStringLiteral( "/sys/devices/virtual/dmi/id/product_name" ) ); QFile dmiFile( QStringLiteral( "/sys/devices/virtual/dmi/id/product_name" ) );
QFile modelFile( QStringLiteral( "/proc/device-tree/model" ) );
if ( dmiFile.exists() && dmiFile.open( QIODevice::ReadOnly ) ) if ( dmiFile.exists() && dmiFile.open( QIODevice::ReadOnly ) )
{ {
dmiProduct = cleanupForHostname( QString::fromLocal8Bit( dmiFile.readAll().simplified().data() ) ); dmiProduct = cleanupForHostname( QString::fromLocal8Bit( dmiFile.readAll().simplified().data() ) );
} if ( !dmiProduct.isEmpty() )
if ( dmiProduct.isEmpty() )
{ {
dmiProduct = QStringLiteral( "pc" ); tried = true;
return dmiProduct;
} }
}
if ( modelFile.exists() && modelFile.open( QIODevice::ReadOnly ) )
{
dmiProduct
= cleanupForHostname( QString::fromLocal8Bit( modelFile.readAll().chopped( 1 ).simplified().data() ) );
if ( !dmiProduct.isEmpty() )
{
tried = true;
return dmiProduct;
}
}
dmiProduct = QStringLiteral( "pc" );
tried = true; tried = true;
} }
return dmiProduct; return dmiProduct;