OSDN Git Service
(root)
/
alterlinux
/
alterlinux-calamares.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d81d585
)
[calamares] Bail out on invalid settings
author
Adriaan de Groot
<groot@kde.org>
Tue, 11 Aug 2020 14:16:43 +0000
(16:16 +0200)
committer
Adriaan de Groot
<groot@kde.org>
Tue, 11 Aug 2020 14:32:44 +0000
(16:32 +0200)
src/calamares/main.cpp
patch
|
blob
|
history
diff --git
a/src/calamares/main.cpp
b/src/calamares/main.cpp
index
030ccc2
..
4ca0891
100644
(file)
--- a/
src/calamares/main.cpp
+++ b/
src/calamares/main.cpp
@@
-166,6
+166,11
@@
main( int argc, char* argv[] )
#endif
Calamares::Settings::init( is_debug );
+ if ( !Calamares::Settings::instance() || !Calamares::Settings::instance()->isValid() )
+ {
+ qCritical() << "Calamares has invalid settings, shutting down.";
+ return 78; // EX_CONFIG on FreeBSD
+ }
a.init();
return a.exec();
}