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

[dracutlukscfg] Job-internal constant data doesn't need to be a member

Browse Source
This commit is contained in:
Adriaan de Groot 2020-11-30 14:35:21 +01:00
parent d2c7c42aec
commit 1f0aec5f87
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/modules/dracutlukscfg/DracutLuksCfgJob.cpp
View File

@ -23,21 +23,18 @@
// static
const QLatin1String DracutLuksCfgJob::CONFIG_FILE( "/etc/dracut.conf.d/calamares-luks.conf" );
// static
const char* DracutLuksCfgJob::CONFIG_FILE_HEADER
static const char CONFIG_FILE_HEADER[]
= "# Configuration file automatically written by the Calamares system installer\n"
"# (This file is written once at install time and should be safe to edit.)\n"
"# Enables support for LUKS full disk encryption with single sign on from GRUB.\n"
"\n";
// static
const char* DracutLuksCfgJob::CONFIG_FILE_CRYPTTAB_KEYFILE_LINE
static const char CONFIG_FILE_CRYPTTAB_KEYFILE_LINE[]
= "# force installing /etc/crypttab even if hostonly=\"no\", install the keyfile\n"
"install_items+=\" /etc/crypttab /crypto_keyfile.bin \"\n";
// static
const char* DracutLuksCfgJob::CONFIG_FILE_CRYPTTAB_LINE = "# force installing /etc/crypttab even if hostonly=\"no\"\n"
"install_items+=\" /etc/crypttab \"\n";
static const char CONFIG_FILE_CRYPTTAB_LINE[] = "# force installing /etc/crypttab even if hostonly=\"no\"\n"
"install_items+=\" /etc/crypttab \"\n";
// static
const QLatin1String DracutLuksCfgJob::CONFIG_FILE_SWAPLINE(

3
src/modules/dracutlukscfg/DracutLuksCfgJob.h
View File

@ -34,9 +34,6 @@ public:
private:
static const QLatin1String CONFIG_FILE;
static const char* CONFIG_FILE_HEADER;
static const char* CONFIG_FILE_CRYPTTAB_KEYFILE_LINE;
static const char* CONFIG_FILE_CRYPTTAB_LINE;
static const QLatin1String CONFIG_FILE_SWAPLINE;
};