[libcalamares] Make oem-setup independent of dont-chroot
- At least for testing purposes it makes sense to decouple dont-chroot from the OEM-setup wording, so introduce a separate setting for it.
This commit is contained in:
parent
3a0bd254c0
commit
3248aba899
@ -35,7 +35,7 @@ hasValue( const YAML::Node& v )
|
|||||||
return v.IsDefined() && !v.IsNull();
|
return v.IsDefined() && !v.IsNull();
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Helper function to grab a QString out of the config, and to warn if not present. */
|
/** @brief Helper function to grab a QString out of the config, and to warn if not present. */
|
||||||
static QString
|
static QString
|
||||||
requireString( const YAML::Node& config, const char* key )
|
requireString( const YAML::Node& config, const char* key )
|
||||||
{
|
{
|
||||||
@ -49,7 +49,7 @@ requireString( const YAML::Node& config, const char* key )
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Helper function to grab a bool out of the config, and to warn if not present. */
|
/** @brief Helper function to grab a bool out of the config, and to warn if not present. */
|
||||||
static bool
|
static bool
|
||||||
requireBool( const YAML::Node& config, const char* key, bool d )
|
requireBool( const YAML::Node& config, const char* key, bool d )
|
||||||
{
|
{
|
||||||
@ -207,6 +207,7 @@ Settings::Settings( const QString& settingsFilePath,
|
|||||||
m_brandingComponentName = requireString( config, "branding" );
|
m_brandingComponentName = requireString( config, "branding" );
|
||||||
m_promptInstall = requireBool( config, "prompt-install", false );
|
m_promptInstall = requireBool( config, "prompt-install", false );
|
||||||
m_doChroot = !requireBool( config, "dont-chroot", false );
|
m_doChroot = !requireBool( config, "dont-chroot", false );
|
||||||
|
m_isSetupMode = requireBool( config, "oem-setup", !m_doChroot );
|
||||||
m_disableCancel = requireBool( config, "disable-cancel", false );
|
m_disableCancel = requireBool( config, "disable-cancel", false );
|
||||||
}
|
}
|
||||||
catch ( YAML::Exception& e )
|
catch ( YAML::Exception& e )
|
||||||
|
@ -65,7 +65,7 @@ public:
|
|||||||
* NOTE: it's a synonym for !doChroot() for now, but may become
|
* NOTE: it's a synonym for !doChroot() for now, but may become
|
||||||
* an independent setting.
|
* an independent setting.
|
||||||
*/
|
*/
|
||||||
bool isSetupMode() const { return !doChroot(); }
|
bool isSetupMode() const { return m_isSetupMode; }
|
||||||
|
|
||||||
bool disableCancel() const;
|
bool disableCancel() const;
|
||||||
|
|
||||||
@ -81,6 +81,7 @@ private:
|
|||||||
|
|
||||||
bool m_debug;
|
bool m_debug;
|
||||||
bool m_doChroot;
|
bool m_doChroot;
|
||||||
|
bool m_isSetupMode;
|
||||||
bool m_promptInstall;
|
bool m_promptInstall;
|
||||||
bool m_disableCancel;
|
bool m_disableCancel;
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user